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

- improved last-guid sanity check on update to 0.9.1, fixes #34

Browse Source 
- replacing deprecated functions in PHP-5.3 (no external libraries for now like phpmailer), refs #35
This commit is contained in:
Michael Kaufmann (d00p)
2010-02-25 07:05:23 +00:00
parent 1d2193d0e2
commit b289a6746a
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/functions/froxlor/function.updateFunctions.php
View File

@@ -138,22 +138,22 @@ function showUpdateStep($task = null, $needs_status = true)
*
* @return string formatted output and log-entry
*/
function lastStepStatus($status = -1)
function lastStepStatus($status = -1, $message = '')
{
global $updatelog;
switch($status)
{
case 0:
$status_sign = '[OK]';
$status_sign = ($message != '') ? '['.$message.']' : '[OK]';
$status_color = '1dcd00';
break;
case 1:
$status_sign = '[??]';
$status_sign = ($message != '') ? '['.$message.']' : '[??]';
$status_color = 'db7100';
break;
case 2:
$status_sign = '[!!]';
$status_sign = ($message != '') ? '['.$message.']' : '[!!]';
$status_color = 'ff0000';
break;
default:

3
lib/functions/system/function.checklastguid.php
View File

@@ -64,7 +64,7 @@ function checkLastGuid($froxlor_guid = 0)
continue;
}
$guid = (int)$group[2];
$guid = isset($group[2]) ? (int)$group[2] : 0;
if($guid > $froxlor_guid)
{
@@ -76,6 +76,7 @@ function checkLastGuid($froxlor_guid = 0)
{
$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Updating froxlor last guid to '.$update_to_guid);
saveSetting('system', 'lastguid', $update_to_guid);
$settings['system']['lastguid'] = $update_to_guid;
}
}
else