adminLinks function cleanup

e107_admin/ad_links.php

@@ -635,7 +635,7 @@ $array_functions = array(
 );
 */
 
-$array_functions = e107::getNav()->adminLinks(); // replacement see e107_handlers/sitelinks.php
+$array_functions = e107::getNav()->adminLinks('legacy'); // replacement see e107_handlers/sitelinks.php
 
 
 // SecretR - BC only, obsolete meta title auto detection

e107_admin/includes/beginner.php

@@ -12,7 +12,6 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."message_handler.php");
 $mes = e107::getMessage();
 
 if($_GET['mode'] == "e_advanced"){

e107_admin/includes/cascade.php

@@ -12,7 +12,7 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."message_handler.php");
+
 $mes = e107::getMessage();
 
 $text = "<div style='text-align:center'>

e107_admin/includes/categories.php

@@ -12,7 +12,6 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."message_handler.php");
 $mes = e107::getMessage();
 
 $text = "<div style='text-align:center'>

e107_admin/includes/classis.php

@@ -12,7 +12,6 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."message_handler.php");
 $mes = e107::getMessage(); 
 $buts = "";
 

e107_admin/includes/compact.php

@@ -12,9 +12,12 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-require_once(e_HANDLER."message_handler.php");
+
 $mes = e107::getMessage();
 
+
+$newarray = e107::getNav()->adminLinks('core');
+
 $buts = "";
 $text = "<div style='text-align:center'>
 	<table style='".ADMIN_WIDTH."'>";

e107_admin/includes/infopanel.php

@@ -72,10 +72,10 @@ EOF;
 		}
 		
 		
-		$array_functions_assoc = e107::getNav()->adminLinks('assoc');
+	//	$array_functions_assoc = e107::getNav()->adminLinks('assoc');
-	
-		$this->iconlist = array_merge($array_functions_assoc, e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array"));
 	
+	//	$this->iconlist = array_merge($array_functions_assoc, e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array"));
+		$this->iconlist = e107::getNav()->adminLinks();
 		
 	}
 	
@@ -184,6 +184,9 @@ EOF;
 		        </span>';
 		
 		*/
+		
+	//	print_a($user_pref['core-infopanel-mye107']);
+        
 		$mainPanel .= "
 		
 		
@@ -599,6 +602,8 @@ EOF;
 		$text = "";
         
      
+	
+	
 		foreach ($this->iconlist as $key=>$icon)
 		{
 			if (getperms($icon['perms']))

e107_admin/includes/tabbed.php

@@ -24,11 +24,13 @@ class tabbed
     
     function __construct()
     {
-        $core = e107::getNav()->adminLinks('assoc');
+     //   $core = e107::getNav()->adminLinks('assoc');
-        $plugs = e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array");
+     //   $plugs = e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array");
         
-        $this->links = array_merge($core,$plugs);
+     //   $this->links = array_merge($core,$plugs);
-        $this->links = multiarray_sort($this->links,'title'); //XXX Move this function in e107_class? 
+    //    $this->links = multiarray_sort($this->links,'title'); //XXX Move this function in e107_class? 
+        
+        $this->links = e107::getNav()->adminLinks();
         $this->render();         
     }  
     

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -1273,7 +1273,7 @@ class admin_shortcodes
 		$pref = e107::getPref();
 
 		$admin_cat 				= e107::getNav()->adminCats();		
-		$array_functions 		= e107::getNav()->adminLinks();
+		$array_functions 		= e107::getNav()->adminLinks('legacy');
 		$array_sub_functions	= e107::getNav()->adminLinks('sub');
 
 		$tp 	= e107::getParser();

e107_handlers/sitelinks_class.php

@@ -643,6 +643,10 @@ class e_navigation
 	function adminLinks($mode=false)
 	{
 	
+        if($mode == 'plugin')
+        {
+             return $this->pluginLinks(E_16_PLUGMANAGER, "array") ;   
+        }	
 			if($mode=='sub')
 			{
 				
@@ -717,26 +721,58 @@ class e_navigation
 			38 => array(e_ADMIN.'comment.php', LAN_COMMENTMAN, LAN_COMMENTMAN, 'B', 5, E_16_COMMENT, E_32_COMMENT)
 		);	
 		
-		
+		if($mode == 'legacy')
-			
-		if($mode == 'assoc')
         {
+            return $array_functions; // Old BC format.      
+        }
+
 		$newarray = asortbyindex($array_functions, 1);
     	$array_functions_assoc = $this->convert_core_icons($newarray);
+        
+       if($mode == 'core') // Core links only. 
+        {          
             return $array_functions_assoc;          
         }
             
-		return $array_functions;	
+        $merged = array_merge($array_functions_assoc, $this->pluginLinks(E_16_PLUGMANAGER, "array")); 
+        $sorted = multiarray_sort($merged,'title'); // this deleted the e-xxxx and p-xxxxx keys. 
+        return $this->restoreKeys($sorted); // we restore the keys with this. 
+        
 	}
 
 
-	function convert_core_icons($newarray)  // Put core button array in the same format as plugin button array.
+
+    private function restoreKeys($newarray)  // Put core button array in the same format as plugin button array.
     {       
+        $array_functions_assoc = array();
+        
+        foreach($newarray as $key=>$val)
+        {
+           if(varset($val['key'])) // Plugin Array.  
+            {
+                $key = $val['key']; 
+             
+                $array_functions_assoc[$key] = $val;   
+            }
+        }
+    
+        return $array_functions_assoc;
+    }
+
+
+
+
+	private function convert_core_icons($newarray)  // Put core button array in the same format as plugin button array.
+	{
+	 
+	    $array_functions_assoc = array();
+        
 	    foreach($newarray as $key=>$val)
 		{
 			if(varset($val[0]))
 			{
 				$key = "e-".basename($val[0],".php");
+                $val['key'] = $key;
 				$val['icon'] = $val[5];
 				$val['icon_32'] = $val[6];
 				$val['title'] = $val[1];
@@ -746,6 +782,7 @@ class e_navigation
 				$val['perms'] = $val['3'];
 				$array_functions_assoc[$key] = $val;
 			}
+
 		}
 	
 	    return $array_functions_assoc;
@@ -836,6 +873,7 @@ class e_navigation
 						$plugin_icon = $eplug_icon_small ? "<img class='icon S16' src='".e_PLUGIN.$eplug_icon_small."' alt=''  />" : E_16_PLUGIN;
 						$plugin_icon_32 = $eplug_icon ? "<img class='icon S32' src='".e_PLUGIN.$eplug_icon."' alt=''  />" :  E_32_PLUGIN;
 						$plugin_array['p-'.$plugin_path] = array(
+						  'key'      => 'p-'.$plugin_path,
 						  'link'      => e_PLUGIN.$plugin_path."/".$eplug_conffile, 
 						  'title'     => $eplug_name, 'caption' => $eplug_caption, 
 						  'perms'     => "P".varset($plug_id[$plugin_path]), 

e107_plugins/admin_menu/admin_menu.php

@@ -25,10 +25,11 @@ if (ADMIN == TRUE)
 	
 	$nav = e107::getNav();
 	
-	$admin = $nav->adminLinks('assoc');
+//	$admin = $nav->adminLinks('assoc');
-	$plugins = $nav->pluginLinks('assoc');
+//	$plugins = $nav->pluginLinks('assoc');
 
-	$array_functions = array_merge($admin, $plugins);
+//	$array_functions = array_merge($admin, $plugins);
+    $array_functions = $nav->adminLinks();
 
 	// print_a($array_functions);