theme admin handler - deprecated call_user_method() replaced with call_user_func(); e_theme_config interface class added, theme configs now implement it

e107_handlers/theme_handler.php

@@ -1,23 +1,30 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
+ * e107 website system
-|     e107 website system
+ *
-|
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
-|     Copyright (c) e107 Inc. 2001-2009
+ * Released under the terms and conditions of the
-|     http://e107.org
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-|
+ *
-|     Released under the terms and conditions of the
+ * e107 Admin Theme Handler
-|     GNU General Public License (http://gnu.org).
+ *
-|
+ * $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
-|     $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
+ * $Revision: 1.49 $
-|     $Revision: 1.48 $
+ * $Date: 2009-08-27 12:58:29 $
-|     $Date: 2009-08-17 18:42:21 $
+ * $Author: secretr $
-|     $Author: e107coders $
-+----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
+/**
+ * Base e107 Admin Theme Handler
+ *
+ * @package e107
+ * @category e107_handlers
+ * @version 1.0
+ * @author Cameron
+ * @copyright Copyright (c) 2009, e107 Inc.
+ */
 class themeHandler{
 
 	var $themeArray;
@@ -547,7 +554,7 @@ class themeHandler{
 
 			if($this->themeConfigObj)
 			{
-	        	$var = call_user_method("config",$this->themeConfigObj);
+	        	$var = call_user_func(array(&$this->themeConfigObj, 'config'));
                 foreach($var as $val)
 				{
 	            	$text .= "<tr><td><b>".$val['caption']."</b>:</td><td colspan='2'>".$val['html']."</td></tr>";
@@ -562,7 +569,7 @@ class themeHandler{
 	{
 		if($this->themeConfigObj)
 	   	{
-			return call_user_method("help",$this->themeConfigObj);
+			return call_user_func(array(&$this->themeConfigObj, 'help'));
 		}
 	}
 
@@ -573,7 +580,7 @@ class themeHandler{
         $this -> loadThemeConfig();
         if($this->themeConfigObj)
 	   	{
-			return call_user_method("process",$this->themeConfigObj);
+			return call_user_func(array(&$this->themeConfigObj, 'process'));
 		}
 	}
 
@@ -627,7 +634,7 @@ class themeHandler{
 		<h2 class='caption'>".$theme['name']."</h2>
         <div class='admintabs' id='tab-container'>";
 
-        if(call_user_method("help",$this->themeConfigObj))
+        if(call_user_func(array(&$this->themeConfigObj, 'help')))
 		{
 			$text .= "
 				<ul class='e-tabs e-hideme' id='core-thememanager-tabs'>
@@ -1250,9 +1257,25 @@ class themeHandler{
 	  	return $vars;
 	}
 
-
-
-
-
 }
-?>
+
+interface e_theme_config
+{
+	/**
+	 * Triggered on theme settings submit
+	 * Catch and save theme configuration
+	 */
+	public function process();
+
+	/**
+	 * Theme configuration user interface
+	 * Print out config fields 
+	 */
+	public function config();
+	
+	/**
+	 * Theme help tab
+	 * Print out theme help content 
+	 */
+	public function help();
+}

e107_themes/_blank/_blank_config.php

@@ -1,11 +1,10 @@
 <?php
 
+if (!defined('e107_INIT')) { exit; }
+
 // Dummy Theme Configuration File.
-class theme__blank
+class theme__blank implements e_theme_config
 {
-    var $themePref;
-    
-
 	function process()
 	{
 		$pref = e107::getConfig();
@@ -26,7 +25,6 @@ class theme__blank
 
 		$var[1]['caption'] = "Another Example";
 		$var[1]['html'] = "<input type='text' name='_blank_example2' value='".e107::getThemePref('example2')."' />";
-        //var_dump(e107::getThemePref());
 		return $var;
 	}
 
@@ -52,12 +50,7 @@ class theme__blank
 	
 	
 			</div>
-
-
-
-
 		";
-
 	}
 }
 

e107_themes/e107v4a/e107v4a_config.php

@@ -1,15 +1,20 @@
 <?php
+if (!defined('e107_INIT')) { exit; }
 
 // Dummy Theme Configuration File.
-class theme_e107v4a
+class theme_e107v4a implements e_theme_config
 {
 	function process()
 	{
-		global $theme_pref;
+		$pref = e107::getConfig();
+		
+		$theme_pref = array();
 		$theme_pref['example'] = $_POST['e1074a_example'];
 		$theme_pref['example2'] = $_POST['e1074a_example2'];
-		save_prefs('theme');
+
-		return "Custom Settings Saved Successfully";
+		$pref->set('sitetheme_pref', $theme_pref);
+		
+		return $pref->dataHasChanged();
 	}
 
 
@@ -18,15 +23,18 @@ class theme_e107v4a
 		global $theme_pref;
 
 		$var[0]['caption'] = "Sample configuration field";
-		$var[0]['html'] = "<input type='text' name='e1074a_example' value='".$theme_pref['example']."' />";
+		$var[0]['html'] = "<input type='text' name='e1074a_example' value='".e107::getThemePref('example')."' />";
 
 		$var[1]['caption'] = "Another Example";
-		$var[1]['html'] = "<input type='text' name='e1074a_example' value='".$theme_pref['example2']."' />";
+		$var[1]['html'] = "<input type='text' name='e1074a_example2' value='".e107::getThemePref('example2')."' />";
 
 		return $var;
 	}
+	
+	function help()
+	{
+	}
 }
 
 
-
 ?>