- removed potential undefined variable in admin_index.php
- show also outstanding APS-tasks in admin-overview, fixes #231
This commit is contained in:
@@ -100,7 +100,7 @@ if($page == 'overview')
|
|||||||
&& count($latestversion) >= 1)
|
&& count($latestversion) >= 1)
|
||||||
{
|
{
|
||||||
$_version = $latestversion[0];
|
$_version = $latestversion[0];
|
||||||
$_message = $latestversion[1];
|
$_message = isset($latestversion[1]) ? $latestversion[1] : '';
|
||||||
$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
|
$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
|
||||||
|
|
||||||
$lookfornewversion_lable = $_version;
|
$lookfornewversion_lable = $_version;
|
||||||
|
|||||||
@@ -229,6 +229,59 @@ function getOutstandingTasks()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$query2 = "SELECT DISTINCT `Task` FROM `".TABLE_APS_TASKS."` ORDER BY `Task` ASC";
|
||||||
|
$result2 = $db->query($query2);
|
||||||
|
|
||||||
|
while($row2 = $db->fetch_array($result2))
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* install
|
||||||
|
*/
|
||||||
|
if($row2['Task'] == '1')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_install'];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* remove
|
||||||
|
*/
|
||||||
|
elseif($row2['Task'] == '2')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_remove'];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* reconfigure
|
||||||
|
*/
|
||||||
|
elseif($row2['Task'] == '3')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_reconfigure'];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* upgrade
|
||||||
|
*/
|
||||||
|
elseif($row2['Task'] == '4')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_upgrade'];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* system update
|
||||||
|
*/
|
||||||
|
elseif($row2['Task'] == '5')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_sysupdate'];
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* system download
|
||||||
|
*/
|
||||||
|
elseif($row2['Task'] == '6')
|
||||||
|
{
|
||||||
|
$task_desc = $lng['tasks']['aps_task_sysdownload'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if($task_desc != '') {
|
||||||
|
$tasks .= '<li>'.$task_desc.'</li>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(trim($tasks) == '') {
|
if(trim($tasks) == '') {
|
||||||
$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
|
$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1403,5 +1403,11 @@ $lng['serversettings']['customredirect_default']['description'] = 'Set the defau
|
|||||||
|
|
||||||
// ADDED IN FROXLOR 0.9.7-svn2
|
// ADDED IN FROXLOR 0.9.7-svn2
|
||||||
$lng['error']['pathmaynotcontaincolon'] = 'The path you have entered should not contain a colon (":"). Please enter a correct path value.';
|
$lng['error']['pathmaynotcontaincolon'] = 'The path you have entered should not contain a colon (":"). Please enter a correct path value.';
|
||||||
|
$lng['tasks']['aps_task_install'] = 'Installing one or more APS packages';
|
||||||
|
$lng['tasks']['aps_task_remove'] = 'Removing one or more APS packages';
|
||||||
|
$lng['tasks']['aps_task_reconfigure'] = 'Reconfigurating one or more APS packages';
|
||||||
|
$lng['tasks']['aps_task_upgrade'] = 'Upgrading one or more APS packages';
|
||||||
|
$lng['tasks']['aps_task_sysupdate'] = 'Updating all APS packages';
|
||||||
|
$lng['tasks']['aps_task_sysdownload'] = 'Downloading new APS packages';
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -1399,5 +1399,11 @@ $lng['serversettings']['customredirect_default']['description'] = 'Dieser Redire
|
|||||||
|
|
||||||
// ADDED IN FROXLOR 0.9.7-svn2
|
// ADDED IN FROXLOR 0.9.7-svn2
|
||||||
$lng['error']['pathmaynotcontaincolon'] = 'Der eingegebene Pfad sollte keinen Doppelpunkt (":") enthalten. Bitte geben Sie einen korrekten Wert für den Pfad ein.';
|
$lng['error']['pathmaynotcontaincolon'] = 'Der eingegebene Pfad sollte keinen Doppelpunkt (":") enthalten. Bitte geben Sie einen korrekten Wert für den Pfad ein.';
|
||||||
|
$lng['tasks']['aps_task_install'] = 'Installation eines oder mehrerer APS Pakete';
|
||||||
|
$lng['tasks']['aps_task_remove'] = 'Deinstallation eines oder mehrerer APS Pakete';
|
||||||
|
$lng['tasks']['aps_task_reconfigure'] = 'Rekonfiguration eines oder mehrerer APS Pakete';
|
||||||
|
$lng['tasks']['aps_task_upgrade'] = 'Upgrade eines oder mehrerer APS Pakete';
|
||||||
|
$lng['tasks']['aps_task_sysupdate'] = 'Aktualisiere alle APS Pakete';
|
||||||
|
$lng['tasks']['aps_task_sysdownload'] = 'Herunterladen neuer APS Pakete';
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|||||||
Reference in New Issue
Block a user