From f74ed8ed9335265a0479e430f807b6407da7be77 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Sun, 1 Dec 2013 11:06:33 +0100 Subject: [PATCH] Added preconfig hint for 0.9.31-dev4 --- index.php | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 5 +++-- install/updates/preconfig/0.9/preconfig_0.9.inc.php | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index dc5be51e..22ea81fe 100644 --- a/index.php +++ b/index.php @@ -363,7 +363,7 @@ if ($action == 'forgotpwd') { Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr)); - + $_mailerror = false; try { $mail->Subject = $mail_subject; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 77f8eb0a..3723b37c 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2455,7 +2455,8 @@ if (isFroxlorVersion('0.9.31-dev2')) { if (isFroxlorVersion('0.9.31-dev3')) { showUpdateStep("Updating from 0.9.31-dev3 to 0.9.31-dev4", true); - + lastStepStatus(0); + showUpdateStep("Adding new panel_activation table"); Database::query("DROP TABLE IF EXISTS `panel_activation`;"); $sql = "CREATE TABLE `" . TABLE_PANEL_ACTIVATION . "` ( @@ -2467,7 +2468,7 @@ if (isFroxlorVersion('0.9.31-dev3')) { PRIMARY KEY (id) ) ENGINE=MyISAM;"; Database::query($sql); - lastStepStatus(0); + updateToVersion('0.9.31-dev4'); } diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 8240a872..af3a8752 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -584,4 +584,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } } + + if (versionInUpdate($current_version, '0.9.31-dev4')) { + $has_preconfig = true; + $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates!
'; + $question = ''; + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } }