Add banlist retrigger handling

e107_admin/cron.php

@@ -135,7 +135,8 @@ class cron_admin_ui extends e_admin_ui
 					'name' 			=> 'Mail Queue',
 					'category'		=> 'mail',
 					'function' 		=> 'procEmailQueue',
-					'description' 	=> 'Process mail queue'),
+					'description' 	=> 'Process mail queue'
+					),
 				2 => array(
 					'name' 			=> 'Mail Bounce Check',
 					'category'		=> 'mail',
@@ -143,6 +144,13 @@ class cron_admin_ui extends e_admin_ui
 					'description' 	=> 'Check for bounced emails',
 				//	'available' 	=> vartrue($pref['mail_bounce_auto'])
 				),
+				3 => array(
+					'name' 			=> 'Ban Retrigger Check',
+					'category'		=> 'user',
+					'function' 		=> 'procBanRetrigger',
+					'description' 	=> 'Process bounce retriggers<br />Only needed if retriggering of bans enabled.',
+					'available' 	=> e107::getPref('ban_retrigger')
+				),
 			);
 	
 			if(!$_GET['action'])
@@ -424,12 +432,13 @@ class cron_admin_form_ui extends e_admin_form_ui
 	
 	
 	var $cronCategories = array(					
-						'backup'	=> "Backup",
+						'backup'	=> 'Backup',
 						'content'	=> ADLAN_CL_3,
-						'log'		=> "Logging",
+						'log'		=> 'Logging',
 						'mail'		=> ADLAN_136,				
 						'notify'	=> ADLAN_149, 
 						'user'		=> LAN_USER,
+						'plugin'	=> 'Plugins'
 	);
 	
 	/**

e107_handlers/cron_class.php

@@ -18,6 +18,7 @@
 if (!defined('e107_INIT')) { exit; }
 
 define ('CRON_MAIL_DEBUG', TRUE);
+define ('CRON_RETRIGGER_DEBUG', TRUE);
 class _system_cron 
 {
 	
@@ -43,7 +44,7 @@ class _system_cron
 	
 	function procEmailQueue()
 	{
-		global $pref;
+		//global $pref;
 		if (CRON_MAIL_DEBUG)
 		{
 			$e107 = e107::getInstance();
@@ -60,7 +61,7 @@ class _system_cron
 	
 	function procEmailBounce()
 	{
-		global $pref;
+		//global $pref;
 		if (CRON_MAIL_DEBUG)
 		{
 			$e107 = e107::getInstance();
@@ -75,6 +76,23 @@ class _system_cron
 		}
 	}
 	
+	function procBanRetrigger()
+	{
+		//global $pref;
+		if (CRON_RETRIGGER_DEBUG)
+		{
+			$e107 = e107::getInstance();
+			$e107->admin_log->e_log_event(10,debug_backtrace(),'DEBUG','CRON Ban retrigger','Retrigger processing started',FALSE,LOG_TO_ROLLING);
+		}
+		require_once(e_HANDLER.'iphandler_class.php');
+		$ipManager = new banlistManager();
+		$ipManager->banRetriggerAction();
+		if (CRON_RETRIGGER_DEBUG)
+		{
+			$e107->admin_log->e_log_event(10,debug_backtrace(),'DEBUG','CRON Ban Retrigger','Retrigger processing completed',FALSE,LOG_TO_ROLLING);
+		}
+	}
+	
 }
 
 
@@ -100,7 +118,7 @@ class _system_cron
  * This class is idea for people who can not use the traditional Unix cron through shell.
  * One way of using is embedding the calling script in a web page which is often visited.
  * The script will work out the last due time, by comparing with run log timestamp. The scrip
- * will envoke any scripts needed to run, be it deleting older table records, or updating prices.
+ * will invoke any scripts needed to run, be it deleting older table records, or updating prices.
  * It can parse the same cron string used by Unix.
  */
 

e107_handlers/iphandler_class.php

@@ -1480,6 +1480,10 @@ class banlistManager
 				}
 			}
 		}
+		if ($numRet)
+		{
+			$this->writeBanListFiles('ip');		// Just rewrite the ban list - the actual IP addresses won't have changed
+		}
 		return $numRet;
 	}
 }

e107_plugins/calendar_menu/e_cron.php

@@ -56,7 +56,7 @@ class calendar_menu_cron // include plugin-folder in the name.
 	public function config()
 	{
 		$cron = array();
-		$cron[] = array('name' => LAN_EC_MAIL_04, 'function' => 'processSubs', 'description' => LAN_EC_MAIL_05);
+		$cron[] = array('name' => LAN_EC_MAIL_04, 'category' => 'plugin', 'function' => 'processSubs', 'description' => LAN_EC_MAIL_05);
 		return $cron;
 	}
 	

e107_plugins/pm/e_cron.php

@@ -60,7 +60,7 @@ class pm_cron // include plugin-folder in the name.
 		$cron = array();
 		$cron[] = array(
 			'name' 			=> LAN_EC_PM_04,
-			'category'		=> 'log',
+			'category'		=> 'plugin',
 			'function' 		=> 'processPM',
 			'description' 	=> LAN_EC_PM_05
 			);