maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Added preconfig hint for 0.9.31-dev4

Browse Source
This commit is contained in:
BNoiZe
2013-12-01 11:06:33 +01:00
parent e5e0ae7527
commit f74ed8ed93
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@@ -363,7 +363,7 @@ if ($action == 'forgotpwd') {
Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
$result = $result_stmt->fetch(PDO::FETCH_ASSOC); $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr)); $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr));
$_mailerror = false; $_mailerror = false;
try { try {
$mail->Subject = $mail_subject; $mail->Subject = $mail_subject;

5
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2455,7 +2455,8 @@ if (isFroxlorVersion('0.9.31-dev2')) {
if (isFroxlorVersion('0.9.31-dev3')) { if (isFroxlorVersion('0.9.31-dev3')) {
showUpdateStep("Updating from 0.9.31-dev3 to 0.9.31-dev4", true); showUpdateStep("Updating from 0.9.31-dev3 to 0.9.31-dev4", true);
lastStepStatus(0);
showUpdateStep("Adding new panel_activation table"); showUpdateStep("Adding new panel_activation table");
Database::query("DROP TABLE IF EXISTS `panel_activation`;"); Database::query("DROP TABLE IF EXISTS `panel_activation`;");
$sql = "CREATE TABLE `" . TABLE_PANEL_ACTIVATION . "` ( $sql = "CREATE TABLE `" . TABLE_PANEL_ACTIVATION . "` (
@@ -2467,7 +2468,7 @@ if (isFroxlorVersion('0.9.31-dev3')) {
PRIMARY KEY (id) PRIMARY KEY (id)
) ENGINE=MyISAM;"; ) ENGINE=MyISAM;";
Database::query($sql); Database::query($sql);
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.31-dev4'); updateToVersion('0.9.31-dev4');
} }

7
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -584,4 +584,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); 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!<br />';
$question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
} }