From fadba975c29c0a631ea0ee92547f970316f379b3 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Tue, 21 Jul 2009 07:41:54 +0000
Subject: [PATCH] theme.xml now uses perm='everyone' etc. for menu presets -
 now consistent with plugin.xml.

---
 e107_admin/frontpage.php      | 13 ++++++++-----
 e107_handlers/menu_class.php  | 33 +++++++++++++++++++++++++++------
 e107_themes/_blank/theme.xml  |  2 +-
 e107_themes/e107v4a/theme.xml |  2 +-
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 21e5ff725..8c76e1492 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -9,8 +9,8 @@
  * Administration Area - Front page
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $
- * $Revision: 1.11 $
- * $Date: 2009-07-17 07:53:13 $
+ * $Revision: 1.12 $
+ * $Date: 2009-07-21 07:41:54 $
  * $Author: e107coders $
  *
 */
@@ -45,11 +45,14 @@ if($sql->db_Select("page", "*", "page_theme=''"))
 }
 
 // Now let any plugins add to the options - must append to the $front_page array as above
-foreach($pref['e_frontpage_list'] as $val)
+if(varset($pref['e_frontpage_list']))
 {
-	if(is_readable(e_PLUGIN.$val."/e_frontpage.php"))
+	foreach($pref['e_frontpage_list'] as $val)
 	{
-		require_once (e_PLUGIN.$val."/e_frontpage.php");
+		if(is_readable(e_PLUGIN.$val."/e_frontpage.php"))
+		{
+			require_once (e_PLUGIN.$val."/e_frontpage.php");
+		}
 	}
 }
 
diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php
index 838bc98e0..05019797a 100644
--- a/e107_handlers/menu_class.php
+++ b/e107_handlers/menu_class.php
@@ -10,8 +10,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/menu_class.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2009-07-17 03:53:14 $
+|     $Revision: 1.5 $
+|     $Date: 2009-07-21 07:41:54 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -311,6 +311,7 @@ class menuManager{
         	return FALSE;
 		}
 
+
 	    $sql->db_Update("menus", "menu_location='0' WHERE menu_layout = '".$this->dbLayout."' "); // Clear All existing.
 		foreach($menuAreas as $val)
 		{
@@ -412,6 +413,26 @@ class menuManager{
 
 	// ---------------------------------------------------------------------------
 
+
+    function menuPresetPerms($val)
+	{
+		$link_class = strtolower(trim($val));
+   		$menu_perm['everyone'] = e_UC_PUBLIC;
+		$menu_perm['guest'] = e_UC_GUEST;
+	  	$menu_perm['member'] = e_UC_MEMBER;
+		$menu_perm['mainadmin'] = e_UC_MAINADMIN;
+		$menu_perm['admin'] = e_UC_ADMIN;
+		$menu_perm['nobody'] = e_UC_NOBODY;
+		$link_class = ($menu_perm[$link_class]) ? $menu_perm[$link_class] : e_UC_PUBLIC;
+
+		return $link_class;
+	}
+
+
+
+
+
+
 	function menuVisibilityOptions()
 	{
 		if(!$_GET['vis']) return;
@@ -541,23 +562,23 @@ class menuManager{
 			{
 				foreach($val['menu'] as $k=>$v)
 				{
-					$uclass = (defined(trim($v['@attributes']['userclass']))) ? constant(trim($v['@attributes']['userclass'])) : 0;
+				   //	$uclass = (defined(trim($v['@attributes']['perm']))) ? constant(trim($v['@attributes']['userclass'])) : 0;
 					$menuArea[] = array(
 						'menu_location' => $iD,
 						'menu_order'	=> $k,
 						'menu_name'		=> $v['@attributes']['name']."_menu",
-						'menu_class'	=> intval($uclass)
+						'menu_class'	=> $this->menuPresetPerms($v['@attributes']['perm'])
 					);
 				}
 			}
 			else  // Only one menu item under <area> in theme.xml.
 			{
-				$uclass = (defined(trim($val['menu']['@attributes']['userclass']))) ? constant(trim($val['menu']['@attributes']['userclass'])) : 0;
+			  //	$uclass = (defined(trim($val['menu']['@attributes']['userclass']))) ? constant(trim($val['menu']['@attributes']['userclass'])) : 0;
                 $menuArea[] = array(
 						'menu_location' => $iD,
 						'menu_order'	=> 0,
 						'menu_name'		=> $val['menu']['@attributes']['name']."_menu",
-						'menu_class'	=> intval($uclass)
+						'menu_class'	=> $this->menuPresetPerms($v['@attributes']['perm'])
 					);
 			}
 		}
diff --git a/e107_themes/_blank/theme.xml b/e107_themes/_blank/theme.xml
index 8360a0b61..25f553c09 100644
--- a/e107_themes/_blank/theme.xml
+++ b/e107_themes/_blank/theme.xml
@@ -12,7 +12,7 @@
 					<menu name='compliance' />
 				</area>
 				<area id='2'>
-					<menu name='online' userclass='E_UC_ADMIN' />
+					<menu name='online' perm='admin' />
 					<menu name='powered_by' />
 					<menu name='sitebutton' />
 				</area>
diff --git a/e107_themes/e107v4a/theme.xml b/e107_themes/e107v4a/theme.xml
index 22fbd8add..e87b496f6 100644
--- a/e107_themes/e107v4a/theme.xml
+++ b/e107_themes/e107v4a/theme.xml
@@ -13,7 +13,7 @@
 				<area id='1' >
                 	<menu name='login' />
 					<menu name='compliance' />
-					<menu name='online' userclass='e_UC_MEMBER' />
+					<menu name='online' perm='member' />
 				</area>
 				<area id='2'>
 					<menu name='poll' />