- fixing old syscp-bug #1148 (Show info for inactive modifications)

TODO

@@ -1,14 +1,10 @@
-			9999999		Write a complete statement about what froxlor is and why we do this (atari)	
 FIXED	 	 	0001282 		Homedirs von Dovecot identisch
- 	 	 	0001274 		Option to mark a Domain as Subdomain possible or not
 FIXED	 	 	0001283 		SysCP creating broken lighttpd config files
 FIXED	 	 	0001213 		APS class_apsinstaller.php on line 510 - error installing different apps
 FIXED	 	 	0001272 		Default Config for libnss incomplete (debian/lenny)
 FIXED	 	 	0001281 		Wrong open_basedir directive
- 	 	 	0001280 		deb packet 1.4.2.1-2 fu*ked
 FIXED	 	 	0001279 		incorrect usage of escapeshellcmd
 FIXED	 	 	0001269 		AWStats RewriteRule is wrong
-WONFIX	 	 	0001278 		Customer and domain directories are not created
 FIXED	 	 	0001277 		Apache Redirect => permanent 301
 FIXED	 	 	0001276 		Bind Zones Not Updated on Nameserver Change
 FIXED	 	 	0001275 		Setting up Traffic limit is limited to 999 GB
@@ -16,90 +12,99 @@ FIXED	 	 	0001273 		APS-Installer
 FIXED	 	 	0001271 		cant install the package magento
 FIXED	 	 	0001270 		xinet reltime update mistake
 FIXED	 	 	0001268 		SysCP Funktion: aktualisierung in Real-Time
- 	 	 	0001041 		Customer should have access to his webserver logs.
 FIXED	 	 	0001267 		Domain-Aliases also create a HOST-entry
 FIXED	 	 	0001266 		Lighttpd has a internal limit of regex-hits which limits max amount of domain-aliases
 FIXED	 	 	0001263 		Cosmettic Change
-WONTFIX 	 	0001056 	 	Need extra payment methods
-WONTFIX 	 	0001262 		Currency type modification.
-WONTFIX 	 	0001257 		Fee is recalculated with current contract data although interval is over
 FIXED	 	 	0001255 		Wrong path to usage statistics under domain settings
- 	 	 	0001261 		No e-mail on 90% traffic
-WONTFIX 	 	0001260 		2x F5 causes bigger fonts
-WONTFIX  	 	0001259 		contract-changes optional with cron to the end of the interval
-WONTFIX  	 	0001258 		Make invoices immediately
- 	 	 	0001120 		Missing function to calculate the mail traffic
 FIXED	 	 	0001236 		the cron doesnt delete user directories
- 	 	 	0001244 		customer view too wide for 1024x768 resolutions
- 	 	 	0001229 		subdomains and Own vHost-Settings
 FIXED	 	 	0001254 		Installation no next button
 FIXED	 	 	0001253 		admin_customers.php line 803 / 804 contain the same
-WONTFIX 	 	0001252 		Backup Cronjob for Customers
 FIXED	 	 	0001250 		Apache redirect to Umlautdomains does not work
- 	 	 	0001251 		possibility to manage WebDAV config in SysCP
 FIXED	 	 	0001249 		SysCP SVN(!) settings loader doesn't load some settings
-WONTFIX 	 	0001248 		blog.syscp.org
- 	 	 	0001042 		Webalizer dir should not be deletable
 FIXED 	 	 	0001247 		tab order problems at email forward mask
 FIXED	 	 	0001246 		wrong variable assigned in /templates/admin/customers/customers_add.tpl
- 	 	 	0001245 		Password Protect /awstats/ when using awstats and fcgid
- 	 	 	0001156 		Repairing use of awstats and awstats-icons with fcgi
-WONTFIX  	 	0001243 		Wrong uid and gid for php-fcgi-starter
- 	 	 	0001242 		When email qouta is enabled, you cannot add more resources to a client.
-WONTIFX 	 	0001241 		Patch for facilate customizing syscp
- 	 	 	0001240 		Wrong php.ini for subdomains with fastCGI
 FIXED	 	 	0001239 		awstats configs get cluttered up after domain deletion
 FIXED	 	 	0001228 		Domain deletion fails
 FIXED 	 	 	0001233 		Display errors when amount of FTP or Mail Traffic is larger than HTTP traffic
-WONTFIX 	 	0001227 		Error on fixing invoices with credit notes
 FIXED	 	 	0001122 		Field members of table ftp_groups not updated correctly when customer deletes ftp user
 FIXED	 	 	0001215 		php.ini: open_basedir error
- 	 	 	0001224 		APS installer not installing the aps applications properly, such as WordPress and WebCalender
 FIXED	 	 	0001223 		Postfix proposed SQL-query in mysql-virtual_alias_maps.cf: use TRIM()
 FIXED	 	 	0001221 		syscp xinet.d - no need to edit /etc/services
 FIXED	 	 	0001217 		SysCP Realtime Support
 FIXED	 	 	0001209 	 	APS crashs when installing magento
- 	 	 	0001017 		Proftpd - Quota should be added
- 	 	 	0001016 		Pureftpd - quota should be added
- 	 	 	0001206 		crontabs not terminating
 FIXED	 	 	0001210 		Add start- and endtime to autoresponder
- 	 	 	0001212 		retain form input
 FIXED	 	 	0001185 		Autoreponder - send mails via sendmail to set correct Return-Path header
- 	 	 	0001211 		Generated MySQL username too long
- 	 	 	0001208 		HTML Tags in Support Tickets
- 	 	 	0001207 		FTP Passw<73>rter mit Umlauten
 FIXED	 	 	0001201 		Virtualusers conflict with local users when using libnss-mysql
- 	 	 	0001204 		php5-suhosin
 FIXED	 	 	0001203 		Add check for PHP version and required PHP modules in install script
- 	 	 	0001198 		More online help wanted
-WONTFIX 	 	0001039 		Additional text field for infos in customers "Contact Data"
-WONTFIX 	 	0001187 		additional Invoices
-WONTFIX 	 	0001059 		Billing - Create contract - Filename should contain customername
 FIXED	 	 	0001013 		lighttpd - every customer should have his own php.ini
- 	 	 	0001189 		Autoresponder: support for multiline "From:" headers
 FIXED	 	 	0001113 		realtime functionality broken
- 	 	 	0001186 		subdomains and php configuration
-WONTFIX 	 	0001112 		customers should be able to create custom cronjobs
- 	 	 	0001079 		Protected dir only works only after a force-reload on lighttpd
 FIXED	 	 	0001080 		host of third level gets overridden by second-level when wwwserveralias is not set on lighttpd
 FIXED	 	 	0001159 		serveral errors for lighttpd
 FIXED	 	 	0001181 		lighttpd cronjob config for subdomains is empty
- 	 	 	0001034 		Cron-Tasks: apache-logfiles directory
-WONTFIX 	 	0001136 		Configuration of "dead" mail adresses
 FIXED	 	 	0001176 		libnss-mysql and conflicting usernames/groups
 FIXED	 	 	0001154 		Wrong configuration set with AWstats an fcgi
+FIXED	 	 	0001149 		Create a Configuration-Option for SPF Records in Zonefiles
+FIXED	 	 	0001095 		lighttpd - redirection - "/" slash is added to end of url
+FIXED	 	 	0001148 		Show info for inactive modifications
+--------------------------------------------------------------------------------------------------------------
+WONFIX	 	 	0001278 		Customer and domain directories are not created
+WONTFIX 	 	0001056 	 	Need extra payment methods
+WONTFIX 	 	0001262 		Currency type modification.
+WONTFIX 	 	0001257 		Fee is recalculated with current contract data although interval is over
+WONTFIX 	 	0001260 		2x F5 causes bigger fonts
+WONTFIX  	 	0001259 		contract-changes optional with cron to the end of the interval
+WONTFIX  	 	0001258 		Make invoices immediately
+WONTFIX 	 	0001252 		Backup Cronjob for Customers
+WONTFIX 	 	0001248 		blog.syscp.org
+WONTFIX  	 	0001243 		Wrong uid and gid for php-fcgi-starter
+WONTIFX 	 	0001241 		Patch for facilate customizing syscp
+WONTFIX 	 	0001227 		Error on fixing invoices with credit notes
+WONTFIX 	 	0001039 		Additional text field for infos in customers "Contact Data"
+WONTFIX 	 	0001187 		additional Invoices
+WONTFIX 	 	0001059 		Billing - Create contract - Filename should contain customername
+WONTFIX 	 	0001112 		customers should be able to create custom cronjobs
+WONTFIX 	 	0001136 		Configuration of "dead" mail adresses
+WONTFIX 	 	0001134 		Allow selection of a default apache page / provide access to syscp
+WONTFIX 	 	0001104 		Listen Configuration should contain a warning for debian
+WONTFIX 	 	0001098 		Possibillity to dissable "Catchall" for mails
+WONTFIX 	 	0001033 		Cron-Tasks: creating of php.ini
+--------------------------------------------------------------------------------------------------------------
+ 	 	 	0001274 		Option to mark a Domain as Subdomain possible or not
+ 	 	 	0001280 		deb packet 1.4.2.1-2 fu*ked
+ 	 	 	0001041 		Customer should have access to his webserver logs.
+ 	 	 	0001261 		No e-mail on 90% traffic
+ 	 	 	0001120 		Missing function to calculate the mail traffic
+ 	 	 	0001244 		customer view too wide for 1024x768 resolutions
+ 	 	 	0001229 		subdomains and Own vHost-Settings
+ 	 	 	0001251 		possibility to manage WebDAV config in SysCP
+ 	 	 	0001042 		Webalizer dir should not be deletable
+ 	 	 	0001245 		Password Protect /awstats/ when using awstats and fcgid
+ 	 	 	0001156 		Repairing use of awstats and awstats-icons with fcgi
+ 	 	 	0001242 		When email qouta is enabled, you cannot add more resources to a client.
+ 	 	 	0001240 		Wrong php.ini for subdomains with fastCGI
+ 	 	 	0001224 		APS installer not installing the aps applications properly, such as WordPress and WebCalender
+ 	 	 	0001017 		Proftpd - Quota should be added
+ 	 	 	0001016 		Pureftpd - quota should be added
+ 	 	 	0001206 		crontabs not terminating
+ 	 	 	0001212 		retain form input
+ 	 	 	0001211 		Generated MySQL username too long
+ 	 	 	0001208 		HTML Tags in Support Tickets
+ 	 	 	0001207 		FTP Passw<73>rter mit Umlauten
+ 	 	 	0001204 		php5-suhosin
+ 	 	 	0001198 		More online help wanted
+ 	 	 	0001189 		Autoresponder: support for multiline "From:" headers
+ 	 	 	0001186 		subdomains and php configuration
+ 	 	 	0001079 		Protected dir only works only after a force-reload on lighttpd
+ 	 	 	0001034 		Cron-Tasks: apache-logfiles directory
  	 	 	0001150 		Wrong configuration of awstats
  	 	 	0001083 		awstats.model.conf.syscp should include awstats.conf
  	 	 	0001152 		apache certificate is not generated
  	 	 	0001151 		When cronjob generates new dkim files a mail is sent to root
-FIXED	 	 	0001149 		Create a Configuration-Option for SPF Records in Zonefiles
- 	 	 	0001148 		Show info for inactive modifications
  	 	 	0001005 		Force user to add POP3 Account before he can add e-mail adresses
  	 	 	0001142 		Default index.html should be placed in a sub-directory of a domain.
  	 	 	0001140 		Replace variables in defaut_vhost config
  	 	 	0001138 		old db-data is lost when mysqldump is not within open_basedir
  	 	 	0001135 		dkim refers to non-existing domainkey entry in DNS zone file.
-WONTFIX 	 	0001134 		Allow selection of a default apache page / provide access to syscp
  	 	 	0001133 		Default Configuration doesn't allow Exim4 to forward Mails to the outside world
  	 	 	0001128 		More targets for "Write a message" tool
  	 	 	0001131 		Add FreeBSD configuration files to the base tarball.
@@ -110,15 +115,12 @@ WONTFIX 	 	0001134 		Allow selection of a default apache page / provide access t
  	 	 	0001114 		Password query for Awstats statistics
  	 	 	0001111 		add login for e-mail and ftp users to let them change their own settings
  	 	 	0001109 		no mail traffic is shown and calculated without third party module
-WONTFIX 	 	0001104 		Listen Configuration should contain a warning for debian
  	 	 	0001101 		Default mail qouta - possibillity to set new accounts to amount of webspace
-WONTFIX 	 	0001098 		Possibillity to dissable "Catchall" for mails
-FIXED	 	 	0001095 		lighttpd - redirection - "/" slash is added to end of url
  	 	 	0001084 		Add select box to change special logfile setting on domain edit
  	 	 	0001051 		include_shell issue in lighttpd 1.4.20
  	 	 	0001058 		Add id/class attributs in <img> tag (left navigation)
  	 	 	0001043 		When creating customer it should also be possible to add domains (merge customer & domain menu)
  	 	 	0001035 		PHP-Error-Log | Adminpanel & CronTask
-WONTFIX 	 	0001033 		Cron-Tasks: creating of php.ini
  	 	 	0001010 		Send info mail to customer if webspace is exceeded
  	 	 	0001004 		Ressources / Domains - Standard subdomains should be separrated from normal Domains
+ 	 	 	9999999 		Write a complete statement about what froxlor is and why we do this (atari)	

admin_index.php

@@ -130,6 +130,7 @@ if($page == 'overview')
 	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains aps_packages');
 
 	$cron_last_runs = getCronjobsLastRun();
+	$outstanding_tasks = getOutstandingTasks();
 
 	$opentickets = 0;
 	$opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '`

lib/functions/froxlor/function.CronjobFunctions.php

@@ -144,3 +144,86 @@ function toggleCronStatus($module = null, $isactive = 0)
 	$db->query($query);
 
 }
+
+function getOutstandingTasks()
+{
+	global $db, $lng;
+	
+	$query = "SELECT * FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC";
+	$result = $db->query($query);
+	
+	$outstanding_tasks = '<tr>
+			<td class="field_name_border_left">'.$lng['tasks']['outstanding_tasks'].':</td>
+			<td class="field_display" colspan="2"><ul>';
+
+	$tasks = '';
+	while($row = $db->fetch_array($result))
+	{
+		if($row['data'] != '')
+		{
+			$row['data'] = unserialize($row['data']);
+		}
+		
+		/*
+		 * rebuilding webserver-configuration
+		 */
+		if($row['type'] == '1')
+		{
+			$task_desc = $lng['tasks']['rebuild_webserverconfig'];
+		}
+		/*
+		 * adding new user
+		 */
+		elseif($row['type'] == '2')
+		{
+			$loginname = '';
+			if(is_array($row['data']))
+			{
+				$loginname = $row['data']['loginname'];
+			}
+			$task_desc = $lng['tasks']['adding_customer'];
+			$task_desc = str_replace('%loginname%', $loginname, $task_desc);
+		}
+		/*
+		 * rebuilding bind-configuration
+		 */
+		elseif($row['type'] == '4')
+		{
+			$task_desc = $lng['tasks']['rebuild_bindconfig'];
+		}
+		/*
+		 * creating ftp-user directory
+		 */
+		elseif($row['type'] == '5')
+		{
+			$task_desc = $lng['tasks']['creating_ftpdir'];
+		}
+		/*
+		 * deleting user-files
+		 */
+		elseif($row['type'] == '6')
+		{
+			$loginname = '';
+			if(is_array($row['data']))
+			{
+				$loginname = $row['data']['loginname'];
+			}
+			$task_desc = $lng['tasks']['deleting_customerfiles'];
+			$task_desc = str_replace('%loginname%', $loginname, $task_desc);
+		}		
+
+		if($task_desc != '') {
+			$tasks .= '<li>'.$task_desc.'</li>';
+		}
+	}
+	
+	if(trim($tasks) == '') {
+		$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
+	} else {
+		$outstanding_tasks .= $tasks;
+	}
+	
+	$outstanding_tasks .= '</ul></td></tr>';
+		
+	return $outstanding_tasks;
+}

lng/english.lng.php

@@ -1281,5 +1281,12 @@ $lng['crondesc']['cron_ticketsreset'] = 'resetting ticket-counters';
 $lng['crondesc']['cron_ticketarchive'] = 'archiving old tickets';
 $lng['admin']['specialsettingsforsubdomains'] = 'Apply specialsettings to all subdomains (*.example.com)';
 $lng['serversettings']['specialsettingsforsubdomains']['description'] = 'If yes these custom vhost-settings will be added to all subdomains; if no subdomain-specialsettings are being removed.';
+$lng['tasks']['outstanding_tasks'] = 'Outstanding cron-tasks';
+$lng['tasks']['rebuild_webserverconfig'] = 'Rebuilding webserver-configuration';
+$lng['tasks']['adding_customer'] = 'Adding new customer %loginname%';
+$lng['tasks']['rebuild_bindconfig'] = 'Rebuilding bind-configuration';
+$lng['tasks']['creating_ftpdir'] = 'Creating directory for new ftp-user';
+$lng['tasks']['deleting_customerfiles'] = 'Deleting customer-files %loginname%';
+$lng['tasks']['noneoutstanding'] = 'There are currently no outstanding tasks for Froxlor';
 
 ?>

lng/german.lng.php

@@ -1261,5 +1261,12 @@ $lng['crondesc']['cron_ticketsreset'] = 'Zurücksetzen der Ticket-Zähle
 $lng['crondesc']['cron_ticketarchive'] = 'Archivieren alter Tickets';
 $lng['admin']['specialsettingsforsubdomains'] = 'Übernehme Einstellungen für alle Subdomains (*.beispiel.de)';
 $lng['serversettings']['specialsettingsforsubdomains']['description'] = 'Wenn ja, werden die individuellen Einstellungen für alle Subdomains übernommen; wenn nein, werden Subdomain-Specialsettings entfernt.';
+$lng['tasks']['outstanding_tasks'] = 'Ausstehende Cron-Aufgaben';
+$lng['tasks']['rebuild_webserverconfig'] = 'Neuerstellung der Webserver-Konfiguration';
+$lng['tasks']['adding_customer'] = 'Erstelle neuen Kunden %loginname%';
+$lng['tasks']['rebuild_bindconfig'] = 'Neuerstellung der Bind-Konfiguration';
+$lng['tasks']['creating_ftpdir'] = 'Erstelle Verzeichnis für neuen FTP-Benutzer';
+$lng['tasks']['deleting_customerfiles'] = 'Löschen von Kunden-Dateien %loginname%';
+$lng['tasks']['noneoutstanding'] = 'Zur Zeit gibt es keine ausstehenden Aufgaben für Froxlor';
 
 ?>

templates/admin/index/index.tpl

@@ -115,6 +115,7 @@ $header
 		<tr>
 			<td colspan="2" class="maintitle"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['admin']['froxlordetails']}</b></td>
 		</tr>
+		{$outstanding_tasks}		
 		{$cron_last_runs}
 		<tr>
 			<td class="field_name_border_left">{$lng['admin']['installedversion']}:</td>

templates/main.css

@@ -81,6 +81,12 @@ input.bottom {
 	background-color	: #C6DEFF;
 }
 
+ul {
+	list-style			: none;
+	padding				: 0;
+	margin				: 0;
+}
+
 .title {
 	background-color	: #ABC9E8;
 	border-color		: #B7B7B7;