From 34de2c03c4319d93b28d5550ca77d1755c9fe075 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 17 May 2010 07:01:46 +0000
Subject: [PATCH] - removed potential undefined variable in admin_index.php -
 show also outstanding APS-tasks in admin-overview, fixes #231

---
 admin_index.php                               |  2 +-
 .../froxlor/function.CronjobFunctions.php     | 53 +++++++++++++++++++
 lng/english.lng.php                           |  6 +++
 lng/german.lng.php                            |  6 +++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/admin_index.php b/admin_index.php
index 9fe969d3..c115c366 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -100,7 +100,7 @@ if($page == 'overview')
 				&& count($latestversion) >= 1)
 				{
 					$_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');
 
 					$lookfornewversion_lable = $_version;
diff --git a/lib/functions/froxlor/function.CronjobFunctions.php b/lib/functions/froxlor/function.CronjobFunctions.php
index c3cda0ea..4d3973d2 100644
--- a/lib/functions/froxlor/function.CronjobFunctions.php
+++ b/lib/functions/froxlor/function.CronjobFunctions.php
@@ -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) == '') {
 		$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
 	} else {
diff --git a/lng/english.lng.php b/lng/english.lng.php
index b05b11ea..c77015a5 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1403,5 +1403,11 @@ $lng['serversettings']['customredirect_default']['description'] = 'Set the defau
 
 // 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['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';
 
 ?>
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 6942c048..b38ca1b5 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1399,5 +1399,11 @@ $lng['serversettings']['customredirect_default']['description'] = 'Dieser Redire
 
 // ADDED IN FROXLOR 0.9.7-svn2
 $lng['error']['pathmaynotcontaincolon'] = 'Der eingegebene Pfad sollte keinen Doppelpunkt (":") enthalten. Bitte geben Sie einen korrekten Wert f&uuml;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';
 
 ?>