Add admin logging to front page setting. Allow {..} path constants

e107_admin/frontpage.php

@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $
-|     $Revision: 1.5 $
+|     $Revision: 1.6 $
-|     $Date: 2008-04-04 21:40:37 $
+|     $Date: 2008-08-25 15:25:12 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -99,6 +99,7 @@ if (isset($_POST['fp_inc']))
 	$fp_settings[$mv-1] = $fp_settings[$mv];
 	$fp_settings[$mv] = $temp;
 	$fp_update_prefs = TRUE;
+	frontpage_adminlog('01','Inc '.$mv);
   }
 }
 elseif (isset($_POST['fp_dec']))
@@ -110,6 +111,7 @@ elseif (isset($_POST['fp_dec']))
 	$fp_settings[$mv+1] = $fp_settings[$mv];
 	$fp_settings[$mv] = $temp;
 	$fp_update_prefs = TRUE;
+	frontpage_adminlog('01','Dec '.$mv);
   }
 }
 
@@ -190,11 +192,13 @@ if (isset($_POST['fp_save_new']))
 	  array_unshift($fp_settings,$temp);		// ....because re-indexed from zero
 	  unset($fp_settings[0]);					// Then knock out index zero
 	  $fp_update_prefs = TRUE;
+		frontpage_adminlog('02',"class => {$_POST['class']},[!br!]page => {$frontpage_value},[!br!]force => {$forcepage_value}");
 	}
 	elseif (array_key_exists($temp['order'],$fp_settings))
 	{
 	  $fp_settings[$temp['order']] = $temp;
 	  $fp_update_prefs = TRUE;
+		frontpage_adminlog('03',"posn => {$temp},[!br!]class => {$_POST['class']},[!br!]page => {$frontpage_value},[!br!]force => {$forcepage_value}");
 	}
 	else
 	{  // Someone playing games
@@ -208,6 +212,7 @@ if (isset($_POST['fp_delete_rule']))
   {
     $rule_no = key($_POST['fp_delete_rule']);
 	$array_size = count($fp_settings);
+	frontpage_adminlog('04',"Rule {$rule_no},[!br!]class => {$fp_settings[$rule_no]['class']},[!br!]page => {$fp_settings[$rule_no]['page']},[!br!]force => {$fp_settings[$rule_no]['force']}");
     unset($fp_settings[$rule_no]);
 	while ($rule_no < $array_size)
 	{  // Move up and renumber any entries after the deleted rule
@@ -479,4 +484,13 @@ class frontpage
 
 require_once('footer.php');
 
+
+// Log event to admin log
+function frontpage_adminlog($msg_num='00', $woffle='')
+{
+  global $pref, $admin_log;
+  $admin_log->log_event('FRONTPG_'.$msg_num,$woffle,E_LOG_INFORMATIVE,'');
+}
+
+
 ?>

e107_languages/English/admin/lan_log_messages.php

@@ -1,6 +1,6 @@
 <?php
 // e107 Language File.
-// $Id: lan_log_messages.php,v 1.10 2008-08-17 15:18:14 e107steved Exp $
+// $Id: lan_log_messages.php,v 1.11 2008-08-25 15:25:19 e107steved Exp $
 
 /*
 The definitions in this file are for standard 'explanatory' messages which might be entered
@@ -105,4 +105,14 @@ define('LAN_ROLL_LOG_11','Admin login fail');
 define('LAN_AL_PREFS_01', 'Preferences changed');
 
 
+// Front Page events
+//------------------
+define('LAN_AL_FRONTPG_00', 'Unknown front page-related event');
+define('LAN_AL_FRONTPG_01', 'Rules order changed');
+define('LAN_AL_FRONTPG_02', 'Rule added');
+define('LAN_AL_FRONTPG_03', 'Rule edited');
+define('LAN_AL_FRONTPG_04', 'Rule deleted');
+define('LAN_AL_FRONTPG_05', '');
+define('LAN_AL_FRONTPG_06', '');
+
 ?>

index.php

@@ -12,8 +12,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/index.php,v $
-|     $Revision: 1.4 $
+|     $Revision: 1.5 $
-|     $Date: 2008-01-12 16:51:43 $
+|     $Date: 2008-08-25 15:25:12 $
 |     $Author: e107steved $
 
 Mods for prioritised system
@@ -53,7 +53,14 @@ else
 	if (in_array($fk,$class_list))
 	{
 		// Debateable whether we should append $query - we may be redirecting to a custom page, for example
+		if (strpos($fp,'{') !== FALSE)
+		{
+			$location = $tp->replaceConstants($fp).$query;
+		}
+		else
+		{
 			$location = ((strpos($fp, 'http') === FALSE) ? e_BASE : '').$fp.$query;
+		}
 	  break;
 	}
   }