From e0a2c65e213a6d8a06ef2d2170b2a74580561744 Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Wed, 7 Feb 2007 21:22:19 +0000
Subject: [PATCH] Only display presets to main admins (per Cameron), don't
 include news item date in preset (caused confusion)

---
 e107_admin/header.php                |  9 +++---
 e107_admin/newspost.php              |  8 ++---
 e107_files/shortcode/admin_preset.sc |  3 +-
 e107_handlers/preset_class.php       | 44 +++++++++++++++++-----------
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/e107_admin/header.php b/e107_admin/header.php
index 1ab3bc828..6371a3d1b 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-|   $Revision: 1.8 $
-|   $Date: 2007-01-23 22:44:47 $
-|   $Author: e107coders $
+|   $Revision: 1.9 $
+|   $Date: 2007-02-07 21:22:09 $
+|   $Author: e107steved $
 +---------------------------------------------------------------+
 */
 
@@ -147,7 +147,8 @@ if (isset($eplug_js) && $eplug_js) {
 if (isset($htmlarea_js) && $htmlarea_js) {
 	echo $htmlarea_js;
 }
-if (strpos(e_SELF, 'fileinspector.php') === FALSE) {
+if ((strpos(e_SELF, 'fileinspector.php') === FALSE) && getperms("0")) 
+{
 echo "<script type='text/javascript'>
 <!--
 function savepreset(ps,pid){
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index cf0eea247..8fe7cb040 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -11,9 +11,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
-|   $Revision: 1.5 $
-|   $Date: 2007-02-07 18:48:27 $
-|   $Author: e107coders $
+|   $Revision: 1.6 $
+|   $Date: 2007-02-07 21:22:09 $
+|   $Author: e107steved $
 +---------------------------------------------------------------+
 
 */
@@ -44,7 +44,7 @@ $pst->id = "admin_newspost";
 
 $newspost = new newspost;
 require_once("auth.php");
-$pst->save_preset(); // save and render result using unique name
+$pst->save_preset('news_datestamp'); // save and render result using unique name. Don't save item datestamp
 
 require_once(e_HANDLER."userclass_class.php");
 require_once(e_HANDLER."news_class.php");
diff --git a/e107_files/shortcode/admin_preset.sc b/e107_files/shortcode/admin_preset.sc
index 08be6341e..a4a71b262 100644
--- a/e107_files/shortcode/admin_preset.sc
+++ b/e107_files/shortcode/admin_preset.sc
@@ -1,4 +1,5 @@
-if(ADMIN){
+if(ADMIN && getperms("0"))
+{
 	global $sql,$pst,$ns,$tp,$e_wysiwyg,$pref;
 	if(isset($pst) && $pst->form && $pst->page){
 		$thispage = urlencode(e_SELF."?".e_QUERY);
diff --git a/e107_handlers/preset_class.php b/e107_handlers/preset_class.php
index 7b8dc89a3..7f25d160d 100644
--- a/e107_handlers/preset_class.php
+++ b/e107_handlers/preset_class.php
@@ -11,9 +11,9 @@
 |		GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_handlers/preset_class.php,v $
-|		$Revision: 1.1.1.1 $
-|		$Date: 2006-12-02 04:33:56 $
-|		$Author: mcfly_e107 $
+|		$Revision: 1.2 $
+|		$Date: 2007-02-07 21:22:09 $
+|		$Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
@@ -25,28 +25,38 @@ class e_preset {
 	var $page;
 	var $id;
 
-	function save_preset(){
+	function save_preset($exclude_fields = '')    // Comma separated list of fields not to save
+	{
 	global $sql,$tp,$ns;
 	$qry = explode(".",e_QUERY);
 	$unique_id = is_array($this->id) ? $this->id : array($this->id);
 	$uid = $qry[1];
 
-		if($_POST && $qry[0] =="savepreset"){
-			foreach($_POST as $key => $value){
-				$value = $tp->toDB($value);
-			if ($sql -> db_Update("preset", "preset_value='$value'  WHERE preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' ")){
+	if($_POST && $qry[0] =="savepreset")
+	{
+	  $exclude_array = explode(',',$exclude_fields);
+	  foreach($_POST as $key => $value)
+	  {
+	    if (!in_array($key,$exclude_array))
+		{
+		  $value = $tp->toDB($value);
+		  if ($sql -> db_Update("preset", "preset_value='$value'  WHERE preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' "))
+		  {
 
-			} elseif ($value !="" && !$sql -> db_Select("preset","*","preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' ")){
-				$sql -> db_Insert("preset", "0, '".$unique_id[$uid]."', '$key', '$value' ");
-			}
+		  } 
+		  elseif ($value !="" && !$sql -> db_Select("preset","*","preset_name ='".$unique_id[$uid]."' AND preset_field ='$key' "))
+		  {
+			$sql -> db_Insert("preset", "0, '".$unique_id[$uid]."', '$key', '$value' ");
+		  }
 
-			if($value == ""){
-				$sql -> db_Delete("preset", "preset_field ='".$key."' ");
-			}
-
-			}
-			$ns -> tablerender(LAN_SAVED, LAN_PRESET_SAVED);
+		  if($value == "")
+		  {
+			$sql -> db_Delete("preset", "preset_field ='".$key."' ");
+		  }
 		}
+	  }
+	  $ns -> tablerender(LAN_SAVED, LAN_PRESET_SAVED);
+	}
 
 		if ($_POST['delete_preset'] && e_QUERY=="clr_preset"){
 			$del = $_POST['del_id'];