More News work, front-end started (rewrites are BROKEN), work in progres

e107_handlers/admin_log_class.php

@@ -11,8 +11,8 @@
  |     GNU General Public License (http://gnu.org).
  |
  |     $Source: /cvs_backup/e107_0.8/e107_handlers/admin_log_class.php,v $
- |     $Revision: 1.15 $
- |     $Date: 2009-09-10 19:08:36 $
+ |     $Revision: 1.16 $
+ |     $Date: 2009-09-13 16:37:18 $
  |     $Author: secretr $
  To do:
  1. Do we need to check for presence of elements of debug_backtrace() to avoid notices?
@@ -92,7 +92,6 @@ class e_admin_log
 	 */
 	function log_event($event_title, $event_detail, $event_type = E_LOG_INFORMATIVE , $event_code = '')
 	{
-		global $e107,$tp;
 		if ($event_code == '')
 		{
 			if (strlen($event_title) <= 10)
@@ -111,12 +110,13 @@ class e_admin_log
 			$tmp = array();
 			if (isset($event_detail['data']))
 			{
-				foreach ($event_detail as $v)
-				{
-					$tmp[] = $v;
-				}
+				$event_detail = $event_detail['data'];
 			}
-			$event_detail = implode(', ', $tmp);
+			foreach ($event_detail as $k => $v)
+			{
+				$tmp[] = $k.'=>'.$v;
+			}
+			$event_detail = implode("[!br!]\n", $tmp);
 			unset($tmp);
 		}
 		
@@ -388,5 +388,3 @@ class e_admin_log
 	}
 	
 }
-
-?>

e107_handlers/e107_class.php

@@ -9,8 +9,8 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.48 $
- * $Date: 2009-09-13 10:31:09 $
+ * $Revision: 1.49 $
+ * $Date: 2009-09-13 16:37:18 $
  * $Author: secretr $
 */
 
@@ -99,6 +99,17 @@ class e107
 	 * @var array
 	 */
 	protected static $_known_handlers = array (
+		'db'			=> '{e_HANDLER}mysql_class.php',
+		'ecache'		=> '{e_HANDLER}cache_handler.php',
+		'user_class'	=> '{e_HANDLER}userclass_class.php',
+		'e107_event'	=> '{e_HANDLER}event_class.php',
+		'ArrayData'		=> '{e_HANDLER}arraystorage_class.php',
+		'eURL'			=> '{e_HANDLER}e107Url.php',
+		'e_file'		=> '{e_HANDLER}file_class.php',
+		'e_admin_log'	=> '{e_HANDLER}admin_log_class.php',
+		'notify'		=> '{e_HANDLER}notify_class.php',
+		'e_online'		=> '{e_HANDLER}online_class.php',
+		'convert'		=> '{e_HANDLER}date_handler.php',
 		'e_news_item' 	=> '{e_HANDLER}news_class.php',
 		'e_news_tree' 	=> '{e_HANDLER}news_class.php',
 		'news' 			=> '{e_HANDLER}news_class.php',
@@ -645,7 +656,7 @@ class e107
 	 */
 	public static function getDb($instance_id = '')
 	{
-		return self::getSingleton('db', e_HANDLER.'mysql_class.php', $instance_id);
+		return self::getSingleton('db', true, $instance_id);
 	}
 	
 	/**
@@ -655,7 +666,7 @@ class e107
 	 */
 	public static function getCache()
 	{
-		return self::getSingleton('ecache', e_HANDLER.'cache_handler.php');
+		return self::getSingleton('ecache', true);
 	}
 	
 	/**
@@ -665,7 +676,7 @@ class e107
 	 */
 	public static function getUserClass()
 	{
-		return self::getSingleton('user_class', e_HANDLER.'userclass_class.php');
+		return self::getSingleton('user_class', true);
 	}
 	
 	/**
@@ -685,7 +696,7 @@ class e107
 	 */
 	public static function getEvent()
 	{
-		return self::getSingleton('e107_event', e_HANDLER.'event_class.php');
+		return self::getSingleton('e107_event', true);
 	}
 	
 	/**
@@ -695,7 +706,7 @@ class e107
 	 */
 	public static function getArrayStorage()
 	{
-		return self::getSingleton('ArrayData', e_HANDLER.'arraystorage_class.php');
+		return self::getSingleton('ArrayData', true);
 	}
 	
 	/**
@@ -705,7 +716,7 @@ class e107
 	 */
 	public static function getMenu()
 	{
-		return self::getSingleton('e_menu', e_HANDLER.'menu_class.php');
+		return self::getSingleton('e_menu', true);
 	}
 	
 	/**
@@ -715,7 +726,7 @@ class e107
 	 */
 	public static function getUrl()
 	{
-		return self::getSingleton('eURL', e_HANDLER.'e107Url.php');
+		return self::getSingleton('eURL', true);
 	}
 	
 	/**
@@ -728,9 +739,9 @@ class e107
 	{
 		if($singleton)
 		{
-			return self::getSingleton('e_file', e_HANDLER.'file_class.php');
+			return self::getSingleton('e_file', true);
 		}
-		return self::getObject('e_file', null, e_HANDLER.'file_class.php');
+		return self::getObject('e_file', null, true);
 	}
 	
 	/**
@@ -740,7 +751,7 @@ class e107
 	 */
 	public static function getAdminLog()
 	{
-		return self::getSingleton('e_admin_log', e_HANDLER.'admin_log_class.php');
+		return self::getSingleton('e_admin_log', true);
 	}
 
 	/**
@@ -750,7 +761,7 @@ class e107
 	 */
 	public static function getDateConvert()
 	{
-		return self::getSingleton('convert', e_HANDLER.'date_handler.php');
+		return self::getSingleton('convert', true);
 	}
 	
 	/**
@@ -760,7 +771,7 @@ class e107
 	 */
 	public static function getNotify()
 	{
-		return self::getSingleton('notify', e_HANDLER.'notify_class.php');
+		return self::getSingleton('notify', true);
 	}
 	
 	/**
@@ -770,7 +781,7 @@ class e107
 	 */
 	public static function getOnline()
 	{
-		return self::getSingleton('e_online', e_HANDLER.'online_class.php');
+		return self::getSingleton('e_online', true);
 	}
 	
 	/**

e107_handlers/form_handler.php

@@ -9,8 +9,8 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.40 $
- * $Date: 2009-08-25 08:41:41 $
+ * $Revision: 1.41 $
+ * $Date: 2009-09-13 16:37:18 $
  * $Author: secretr $
  *
 */
@@ -162,7 +162,7 @@ class e_form
 	function bbarea($name, $value, $help_mod = '', $help_tagid='')
 	{
 	   	$options = array('class' => 'tbox large e-wysiwyg');
-		if(!defsettrue('e_WYSIWYG'))
+		if(!deftrue('e_WYSIWYG'))
 		{
 			require_once(e_HANDLER."ren_help.php");
 			$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'";

e107_handlers/news_class.php

@@ -9,8 +9,8 @@
  * News handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
- * $Revision: 1.21 $
- * $Date: 2009-09-13 10:29:56 $
+ * $Revision: 1.22 $
+ * $Date: 2009-09-13 16:37:18 $
  * $Author: secretr $
 */
 
@@ -624,14 +624,20 @@ class news {
 		$rewrite_data['data']['news_rewrite_source'] = $news_data['news_id'];
 		$rewrite_data['_FIELD_TYPES']['news_rewrite_source'] = 'int';
 		
+		$old_rewrite_data = array();
+		if(e107::getDb()->db_Select('news_rewrite', '*', 'news_rewrite_source='.intval($rewrite_data['data']['news_rewrite_source']).' AND news_rewrite_type='.intval($rewrite_data['data']['news_rewrite_type'])))
+		{
+			$old_rewrite_data = e107::getDb()->db_Fetch();
+		}
+		
 		//Delete if required
 		if (empty($rewrite_data['data']['news_rewrite_string']))
 		{
-			if(e107::getDb()->db_Select('news_rewrite', 'news_rewrite_id,news_rewrite_string', 'news_rewrite_source='.intval($rewrite_data['data']['news_rewrite_source']).' AND news_rewrite_type='.intval($rewrite_data['data']['news_rewrite_type'])))
+			if($old_rewrite_data)
 			{
-				$check = e107::getDb()->db_Fetch();
-				self::clearRewriteCache($check['news_rewrite_string']);
-				e107::getDb()->db_Delete('news_rewrite', 'news_rewrite_id='.$check['news_rewrite_id']);
+				self::clearRewriteCache($old_rewrite_data['news_rewrite_string']);
+				e107::getDb()->db_Delete('news_rewrite', 'news_rewrite_id='.$old_rewrite_data['news_rewrite_id']);
+				e107::getAdminLog()->logArrayAll('NEWS_13', $old_rewrite_data);
 				return true;
 			}
 			
@@ -644,7 +650,9 @@ class news {
 				$rewrite_data['data']['news_rewrite_id'] = 0;
 				if($rewrite_data['data']['news_rewrite_id'] = e107::getDb()->db_Insert('news_rewrite', $rewrite_data))
 				{
+					if($old_rewrite_data) self::clearRewriteCache($old_rewrite_data['news_rewrite_string']);
 					self::setRewriteCache($rewrite_data['data']['news_rewrite_string'], $rewrite_data['data']);
+					e107::getAdminLog()->logArrayAll('NEWS_12', $rewrite_data['data']);
 					return true;
 				}
 				eMessage::getInstance()->add('Friendly URL string related problem detected!', E_MESSAGE_ERROR, $session_message);
@@ -665,7 +673,9 @@ class news {
 					if(e107::getDb()->db_Update('news_rewrite', $rewrite_data))
 					{
 						$rewrite_data['data']['news_rewrite_id'] = $id;
+						if($old_rewrite_data) self::clearRewriteCache($old_rewrite_data['news_rewrite_string']);
 						self::setRewriteCache($rewrite_data['data']['news_rewrite_string'], $rewrite_data['data']);
+						e107::getAdminLog()->logArrayAll('NEWS_12', $rewrite_data['data']);
 						return true;
 					}
 					elseif (e107::getDb()->getLastErrorNumber())
@@ -679,13 +689,19 @@ class news {
 						return 'error';
 					}
 					
+					$rewrite_data['data']['news_rewrite_id'] = $id;
+					if($old_rewrite_data) self::clearRewriteCache($old_rewrite_data['news_rewrite_string']);
+					self::setRewriteCache($rewrite_data['data']['news_rewrite_string'], $rewrite_data['data']);
+					
 					return false;
 				}
 				
 				$rewrite_data['data']['news_rewrite_id'] = 0;
 				if($rewrite_data['data']['news_rewrite_id'] = e107::getDb()->db_Insert('news_rewrite', $rewrite_data))
 				{
+					if($old_rewrite_data) self::clearRewriteCache($old_rewrite_data['news_rewrite_string']);
 					self::setRewriteCache($rewrite_data['data']['news_rewrite_string'], $rewrite_data['data']);
+					e107::getAdminLog()->logArrayAll('NEWS_12', $rewrite_data['data']);
 					return true;
 				}