From 5d81b20d333ca6083640f24e8d6dd9e73110c4e6 Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Wed, 27 Feb 2013 19:49:57 +0200
Subject: [PATCH] Fixes #124: admin-ui banlist inline editing failing. Banlist
 reason and notes inline editable now.

---
 e107_admin/banlist.php     | 14 ++++++--------
 e107_handlers/admin_ui.php | 10 +++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index f6bb34530..560f90e3a 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -102,8 +102,8 @@ class banlist_ui extends e_admin_ui
 		  '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_reason' 		=>   array ( 'title' => 'Reason', 			'type' => 'text', 		'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
-		  'banlist_notes' 		=>   array ( 'title' => 'Notes', 			'type' => 'text', 		'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+		  'banlist_reason' 		=>   array ( 'title' => 'Reason', 			'type' => 'text', 		'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
+		  'banlist_notes' 		=>   array ( 'title' => 'Notes', 			'type' => 'text', 		'data' => 'str', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center',  ),
 		  'options' 			=>   array ( 'title' => 'Options', 			'type' => '', 			'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1',  ),
 		);		
 		
@@ -124,7 +124,7 @@ class banlist_ui extends e_admin_ui
 		{
 			if($_POST['something']) // example 
 			{
-				$this->processSomething();				
+				//$this->processSomething();				
 			}		
 		}
 	
@@ -1364,6 +1364,7 @@ function banlist_adminlog($msg_num = '00', $woffle = '')
  */
 function headerjs()
 {
+/*
 	require_once(e_HANDLER.'js_helper.php');
 	$ret = "
 		<script type='text/javascript'>
@@ -1371,9 +1372,6 @@ function headerjs()
 			(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
 			if(typeof e107Admin == 'undefined') var e107Admin = {}
 
-			/**
-			 * OnLoad Init Control
-			 */
 			e107Admin.initRules = {
 				'Helper': true,
 				'AdminMenu': false
@@ -1383,9 +1381,9 @@ function headerjs()
 	";
 
 	return $ret;
+
+*/
 }
 
 require_once(e_ADMIN."footer.php");
 exit;
-
-?>
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index ff418fc2b..7ac243d03 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -135,7 +135,7 @@ class e_admin_request
 		// Set current id
 		if(isset($this->_request_qry[$this->_id_key]))
 		{
-			$this->_id = preg_replace('/[^\w\-]/', '', $this->_request_qry[$this->_id_key]);
+			$this->_id = preg_replace('/[^\w\-.]/', '', $this->_request_qry[$this->_id_key]);
 		}
 
 		$this->_posted_qry =& $_POST; //raw?
@@ -2819,7 +2819,7 @@ class e_admin_controller_ui extends e_admin_controller
 		{
 			foreach ($selected as $i => $_sel) 
 			{
-				$selected[$i] = preg_replace('/[^\w\-]/', '', $_sel);
+				$selected[$i] = preg_replace('/[^\w\-.]/', '', $_sel);
 			}
 		}
 		
@@ -3144,7 +3144,7 @@ class e_admin_controller_ui extends e_admin_controller
 
 			default:
 				$choice = explode('|', str_replace('{ID}', $id, $choice), 3);
-				$this->redirectAction(preg_replace('/[^\w\-]/', '', $choice[0]), vartrue($choice[1]), vartrue($choice[2]));
+				$this->redirectAction(preg_replace('/[^\w\-.]/', '', $choice[0]), vartrue($choice[1]), vartrue($choice[2]));
 			break;
 		}
 		return;
@@ -3879,7 +3879,7 @@ class e_admin_ui extends e_admin_controller_ui
 				$selected = explode(',', $this->getPosted('delete_confirm_value'));
 				foreach ($selected as $i => $_sel) 
 				{
-					$selected[$i] = preg_replace('/[^\w\-]/', '', $_sel);
+					$selected[$i] = preg_replace('/[^\w\-.]/', '', $_sel);
 				}
 			}
 		}
@@ -4414,7 +4414,7 @@ class e_admin_ui extends e_admin_controller_ui
 		{
 			
 			list($tmp,$id) = explode("-", $row, 2);
-			$id = preg_replace('/[^\w\-]/', '', $id);
+			$id = preg_replace('/[^\w\-.]/', '', $id);
 			if(!is_numeric($id)) $id = "'{$id}'";
 			if($sql->db_Update($this->table, $this->sortField." = {$c} WHERE ".$this->pid." = ".$id))
 			{