Moved 'Failed logins' onto the banlist admin area. Separated whitelists and blacklists into their own pages.

e107_admin/banlist.php

@@ -56,21 +56,40 @@ class banlist_admin extends e_admin_dispatcher
 			'ui' 			=> 'banlist_form_ui',
 			'uipath' 		=> null
 		),
+		'white'	=> array(
+			'controller' 	=> 'banlist_ui',
+			'path' 			=> null,
+			'ui' 			=> 'banlist_form_ui',
+			'uipath' 		=> null
+		),
+		'failed'	=> array(
+			'controller' 	=> 'failed_ui',
+			'path' 			=> null,
+			'ui' 			=> 'failed_form_ui',
+			'uipath' 		=> null
+		),
 
 	);	
 	
 	
 	protected $adminMenu = array(
 
-		'main/list'			=> array('caption'=> BANLAN_14, 'perm' => '4'),
+		'main/list'			=> array('caption'=> "Blacklist", 'perm' => '4'), //TODO check for LAN.
-		'main/create'		=> array('caption'=> BANLAN_25, 'perm' => '4'),
+		'main/create'		=> array('caption'=> "Add to Blacklist", 'perm' => '4'),
+		'other'            => array('divider'=>true),
 		// Use FILTER to view whitelist instead. 
-	//	'main/white'		=> array('caption'=> BANLAN_52, 'perm' => '4','url'=>"?searchquery=&filter_options=banlist_bantype__100&mode=main&action=list"),
+		'white/list'		=> array('caption'=> BANLAN_52, 'perm' => '4'),
-	//	'main/whadd'		=> array('caption'=> BANLAN_53, 'perm' => '4'),
+		'white/create'		=> array('caption'=> BANLAN_53, 'perm' => '4'),
+
+		'other1'            => array('divider'=>true),
+
+		'failed/list'       => array('caption'=> 'Failed logins', 'perm'=>'4'),
+
+		'other2'            => array('divider'=>true),
 		'main/transfer'		=> array('caption'=> BANLAN_35, 'perm' => '4'),
 		'main/times'		=> array('caption'=> BANLAN_15, 'perm' => '0'),
 		'main/options'		=> array('caption'=> LAN_OPTIONS, 'perm' => '0'),
-		'main/banlog'		=> array('caption'=> BANLAN_81, 'perm' => '0'),
+//		'main/banlog'		=> array('caption'=> BANLAN_81, 'perm' => '0'),
 	);
 
 	protected $adminMenuAliases = array(
@@ -92,6 +111,7 @@ class banlist_ui extends e_admin_ui
 		protected $table			= 'banlist';
 		protected $pid				= 'banlist_id'; 
 		protected $perPage 			= 10;
+		protected $listQry          = "SELECT * FROM `#banlist` WHERE banlist_bantype != 100 ";
 		protected $listOrder		= 'banlist_datestamp DESC';
 
 		protected $fields 	= array (  
@@ -101,7 +121,7 @@ class banlist_ui extends e_admin_ui
 		  'banlist_bantype' 	=>   array ( 'title' => LAN_TYPE, 			'type' => 'method', 	'data' => 'str', 'width' => 'auto', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
 		  'banlist_datestamp' 	=>   array ( 'title' => LAN_DATESTAMP, 		'type' => 'datestamp', 	'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => 'auto=1&hidden=1&readonly=1', 'class' => 'left', 'thclass' => 'left',  ),
 		  'banlist_banexpires' 	=>   array ( 'title' => 'Expires',	 		'type' => 'method', 	'data' => 'int', 'inline'=>true, 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
-		  'banlist_admin' 		=>   array ( 'title' => 'Admin', 			'type' => 'boolean', 	'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+		  'banlist_admin' 		=>   array ( 'title' => 'Admin', 			'type' => 'text', 	    'data' => 'int', 'noedit'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
 		  'banlist_reason' 		=>   array ( 'title' => 'Reason', 			'type' => 'text', 		'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => 'constant=1', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
 		  'banlist_notes' 		=>   array ( 'title' => 'Notes', 			'type' => 'text', 		'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
 		  'options' 			=>   array ( 'title' => LAN_OPTIONS, 		'type' => '', 			'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1',  ),
@@ -120,12 +140,41 @@ class banlist_ui extends e_admin_ui
 		// optional
 		public function init()
 		{
+
+			if($this->getMode() == 'white')
+			{
+				if($this->getAction() == 'list')
+				{
+					$this->listQry = "SELECT * FROM `#banlist` WHERE banlist_bantype = 100 ";
+				}
+
+
+			}
+
+
 			if (isset($_POST['update_ban_prefs']))		// Update ban messages
 			{
 				$this->timesPageSave(); 	
 			}
 		}
 
+
+		public function beforeCreate($new_data, $old_data, $id)
+		{
+			$new_data['banlist_admin'] = ADMINID;
+			return $new_data;
+		}
+
+		public function beforeUpdate($new_data, $old_data, $id)
+		{
+			$new_data['banlist_admin'] = ADMINID;
+			return $new_data;
+		}
+
+
+
+
+
 		public function afterCreate($new_data, $old_data, $id)
 		{
 			e107::getIPHandler()->regenerateFiles();
@@ -334,7 +383,19 @@ class banlist_form_ui extends e_admin_form_ui
 			break;
 			
 			case 'write': // Edit Page
-				return $this->selectbox('banlist_bantype',$ipAdministrator->banTypes, $curVal);		
+
+				if ($this->getController()->getMode() == 'white')
+				{
+					return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_WHITELIST)."<span class='label label-success'>".BANLAN_120."</span>";
+				}
+				elseif($this->getController()->getAction() == 'create')
+				{
+					return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_MANUAL)."<span class='label label-important'>Blacklist entry</span>"; //TODO LAN 
+				}
+
+
+
+				return $this->selectbox('banlist_bantype',$ipAdministrator->banTypes, $curVal);
 			break;
 			
 			case 'filter':
@@ -423,10 +484,108 @@ class banlist_form_ui extends e_admin_form_ui
 		return $opts;		
 	}
 
-}		
+}
-		
+
-	
+
-new banlist_admin();
+
+
+	class failed_ui extends e_admin_ui
+	{
+
+		protected $pluginTitle		= BANLAN_16;
+		protected $pluginName		= 'failed_login';
+		protected $table			= 'generic';
+		protected $pid				= 'gen_id';
+		protected $perPage 			= 10;
+		protected $listQry			= "SELECT * FROM `#generic` WHERE gen_type='failed_login' ORDER BY gen_datestamp DESC";
+
+		protected $fields 		= array (  'checkboxes' =>   array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect',  ),
+		                                    'gen_id' 				=> array ( 'title' => LAN_ID,	 'nolist'=>true,	'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+			//	  'gen_type' 			=> array ( 'title' => LAN_BAN, 	'type' => 'method', 'data' => 'str', 'width' => 'auto', 'batch' => true, 'filter' => true, 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+		                                    'gen_datestamp' 		=> array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+		                                    'gen_chardata' 		=> array ( 'title' => LAN_DESCRIPTION, 'type' => 'method', 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+
+			//	  'gen_user_id' 		=> array ( 'title' => LAN_BAN, 'type' => 'method', 'batch'=>true, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+		                                    'gen_ip' 				=> array ( 'title' => LAN_IP, 'type' => 'ip', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left',  ),
+			//	  'gen_intdata' 		=> array ( 'title' =>  LAN_BAN, 'type' => 'method', 'batch'=>true, 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+		                                    'options'				=> array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', 'readParms'=>'edit=0'  ),
+		);
+
+		protected $fieldpref = array('gen_datestamp', 'gen_ip', 'gen_chardata');
+
+
+		// optional
+		public function init()
+		{
+			if($_POST['etrigger_batch'] == 'gen_intdata__1' && count($_POST['e-multiselect'])) // Do we need BAN here?
+			{
+				$dels = implode(',',$_POST['e-multiselect']);
+				//$e107::getDb()->insert('banlist',
+			}
+		}
+
+		public function afterDelete($data)
+		{
+			//	$sql2->db_Delete('banlist', "banlist_ip='{$banIP}'");
+		}
+
+	}
+
+
+
+	class failed_form_ui extends e_admin_form_ui
+	{
+
+
+		// Custom Method/Function
+		function gen_intdata($curVal,$mode)
+		{
+			$frm = e107::getForm();
+
+			switch($mode)
+			{
+				case 'read': // List Page
+					return $curVal;
+					break;
+
+				case 'write': // Edit Page
+					return $frm->text('gen_type',$curVal);
+					break;
+
+				case 'filter':
+				case 'batch':
+					return  array(1=>LAN_BAN);
+					break;
+			}
+		}
+
+
+		// Custom Method/Function
+		function gen_chardata($curVal,$mode)
+		{
+			$frm = e107::getForm();
+
+			switch($mode)
+			{
+				case 'read': // List Page
+					return str_replace(":::","<br />",$curVal);
+					break;
+
+				case 'write': // Edit Page
+					return $frm->text('gen_chardata',$curVal);
+					break;
+
+				case 'filter':
+				case 'batch':
+					//	return  $array;
+					break;
+			}
+		}
+
+	}
+
+
+	new banlist_admin();
 
 require_once(e_ADMIN."auth.php");
 e107::getAdminUI()->runPage();

e107_admin/fla.php

@@ -9,6 +9,13 @@
  * Manage failed login attempts
  *
 */
+
+
+exit;
+
+// -- No Longer used - see banlist.php
+
+
 require_once('../class2.php');
 if (!getperms('4'))
 {

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -436,7 +436,7 @@ class admin_shortcodes
 					$oldconfigs = array();
 					$oldconfigs['e-news'][0] = array('icon'=>E_16_NEWS, 'title'=>ADLAN_LAT_2, 'url'=> e_ADMIN."newspost.php?mode=sub&action=list", 'total'=>$submitted_news);
 
-					if(empty($pref['comments_disabled']))
+					if(empty($pref['comments_disabled']) && varset($pref['comments_engine'],'e107') == 'e107')
 					{
 						$oldconfigs['e-comment'][0] = array('icon'=>E_16_COMMENT, 'title'=>ADLAN_LAT_9, 'url'=> e_ADMIN_ABS."comment.php?searchquery=&filter_options=comment_blocked__2", 'total'=>$comments_pending);
 					}
@@ -1111,14 +1111,14 @@ class admin_shortcodes
 					$oldconfigs['e-user'][2] 		= array('icon'=>E_16_BANLIST, 'title'=>ADLAN_112, 'url'=> e_ADMIN."users.php?searchquery=&filter_options=user_ban__1", 'total'=>$banned);
 
 
-					if(empty($pref['comments_disabled']))
+					if(empty($pref['comments_disabled']) && varset($pref['comments_engine'],'e107') == 'e107')
 					{
 						$oldconfigs['e-comments'][0] 	= array('icon'=>E_16_COMMENT, 'title'=>ADLAN_114, 'url'=> e_ADMIN_ABS."comment.php", 'total'=>$comments);
 					}
 					if($flo = $sql->count('generic', '(*)', "WHERE gen_type='failed_login'"))
 					{
 						//$text .= "\n\t\t\t\t\t<div style='padding-bottom: 2px;'>".E_16_FAILEDLOGIN." <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a></div>";	
-						$oldconfigs['e-failed'][0]	= array('icon'=>E_16_FAILEDLOGIN, 'title'=>ADLAN_146, 'url'=>e_ADMIN_ABS."fla.php", 'total'=>$flo);
+						$oldconfigs['e-failed'][0]	= array('icon'=>E_16_FAILEDLOGIN, 'title'=>ADLAN_146, 'url'=>e_ADMIN_ABS."banlist.php?mode=failed&action=list", 'total'=>$flo);
 					}
 					
 					

e107_handlers/online_class.php

@@ -219,7 +219,7 @@ class e_online
 				{
 					e107::lan('core','banlist',true);//e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_banlist.php'
 					$reason = e107::getParser()->lanVars(BANLAN_78,$row['online_pagecount']); //  str_replace('--HITS--',$row['online_pagecount'], BANLAN_78)
-					
+
 					if (true === e107::getIPHandler()->add_ban(2, $reason, $ip,0))
 					{
 						e107::getEvent()->trigger('flood', $ip); //BC