mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Added message after core updates to suggest running File Inspector.

Browse Source
This commit is contained in:
Cameron
2020-06-12 13:29:40 -07:00
parent 07c4cb7a5d
commit 6200d0ce69
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/update_routines.php
View File

@@ -186,10 +186,7 @@ class e107Update
$tp = e107::getParser(); $tp = e107::getParser();
$sql = e107::getDb(); $sql = e107::getDb();
if(function_exists('update_'.$func)) // Legacy Method.
// foreach($this->core as $func => $data)
// {
if(function_exists('update_'.$func)) // Legacy Method.
{ {
$installed = call_user_func("update_".$func); $installed = call_user_func("update_".$func);
//?! (LAN_UPDATE == $_POST[$func]) //?! (LAN_UPDATE == $_POST[$func])
@@ -210,6 +207,10 @@ class e107Update
{ {
$mes->add($message, E_MESSAGE_SUCCESS); $mes->add($message, E_MESSAGE_SUCCESS);
e107::getCache()->clear_sys('Update_core'); e107::getCache()->clear_sys('Update_core');
$search = ['[',']'];
$replace = ["<a class='alert-link' href='".e_ADMIN."fileinspector.php'>", "</a>"];
$fileInspectorMessage = LAN_UPDATE_58; // running file-inspector is recommended..
$mes->addInfo(str_replace($search,$replace, $fileInspectorMessage));
} }
} }
} }
@@ -219,7 +220,7 @@ class e107Update
$mes->addDebug("could not run 'update_".$func); $mes->addDebug("could not run 'update_".$func);
} }
//}
} }
@@ -1411,7 +1412,7 @@ function update_706_to_800($type='')
'mail_body' => $row['gen_chardata'], 'mail_body' => $row['gen_chardata'],
'mail_content_status' => MAIL_STATUS_SAVED 'mail_content_status' => MAIL_STATUS_SAVED
); );
$mailHandler->mailtoDb($mailRecord, TRUE); $mailHandler->mailToDb($mailRecord, TRUE);
$mailHandler->saveEmail($mailRecord, TRUE); $mailHandler->saveEmail($mailRecord, TRUE);
$sql2->delete('generic', 'gen_id='.intval($row['gen_id'])); // Delete as we go in case operation fails part way through $sql2->delete('generic', 'gen_id='.intval($row['gen_id'])); // Delete as we go in case operation fails part way through
$i++; $i++;
@@ -1437,8 +1438,8 @@ function update_706_to_800($type='')
e107::getConfig()->save(false,true,false); e107::getConfig()->save(false,true,false);
$ep = e107::getPlugin(); $ep = e107::getPlugin();
$ep->update_plugins_table($mode); // scan for e_xxx changes and save to plugin table. $ep->update_plugins_table(); // scan for e_xxx changes and save to plugin table.
$ep->save_addon_prefs($mode); // generate global e_xxx_list prefs from plugin table. $ep->save_addon_prefs(); // generate global e_xxx_list prefs from plugin table.
} }
@@ -1935,7 +1936,7 @@ function update_70x_to_706($type='')
{ {
$mesg = LAN_UPDATE_12." : <a href='".e_ADMIN."db.php?plugin'>".ADLAN_145."</a>."; $mesg = LAN_UPDATE_12." : <a href='".e_ADMIN."db.php?plugin'>".ADLAN_145."</a>.";
//$ns -> tablerender(LAN_ERROR,$mes); //$ns -> tablerender(LAN_ERROR,$mes);
$emessage->add($mesg, E_MESSAGE_ERROR); e107::getMessage()->add($mesg, E_MESSAGE_ERROR);
catch_error($sql); catch_error($sql);
} }
} }
@@ -2084,7 +2085,7 @@ function addIndexToTable($target, $indexSpec, $just_check, &$updateMessages, $op
/** Check for database access errors /** Check for database access errors
* @param reference $target - pointer to db object * @param reference $target - pointer to db object
* @return none * @return null
*/ */
function catch_error(&$target) function catch_error(&$target)
{ {
@@ -2094,7 +2095,7 @@ function catch_error(&$target)
$tmp = $target->getLastErrorText(); $tmp = $target->getLastErrorText();
echo $tmp." [ ".basename(__FILE__)." on line ".$tmp2[0]['line']."] <br />"; echo $tmp." [ ".basename(__FILE__)." on line ".$tmp2[0]['line']."] <br />";
} }
return; return null;
} }

3
e107_languages/English/admin/lan_e107_update.php
View File

@@ -59,6 +59,8 @@ define("LAN_UPDATE_57", "Before continuing, please manually delete the following
define("LAN_UPDATE_CAPTION_PLUGIN", "Plugin Updates"); // Unused define("LAN_UPDATE_CAPTION_PLUGIN", "Plugin Updates"); // Unused
define("LAN_UPDATE_CAPTION_CORE", "Core Updates"); // Unused define("LAN_UPDATE_CAPTION_CORE", "Core Updates"); // Unused
define("LAN_UPDATE_58", "It is highly recommended that you run [File Inspector] after you have completed all the updates, in order to detect any outdated files that need to be removed.");
// define("LAN_UPDATE_5", "Update available"); // define("LAN_UPDATE_5", "Update available");
// define("LAN_UPDATE_8", "Update from"); // define("LAN_UPDATE_8", "Update from");
// define("LAN_UPDATE_9", "to"); // define("LAN_UPDATE_9", "to");
@@ -66,4 +68,3 @@ define("LAN_UPDATE_CAPTION_CORE", "Core Updates"); // Unused
//define("LAN_UPDATE_11", ".617 to .7 Update Continued"); //define("LAN_UPDATE_11", ".617 to .7 Update Continued");
?>