1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

adminLinks function cleanup

This commit is contained in:
Cameron
2013-02-26 18:57:33 -08:00
parent 710b21823a
commit 4941a1156d
11 changed files with 76 additions and 30 deletions

View File

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

View File

@@ -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'>

View File

@@ -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'>

View File

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

View File

@@ -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."'>";

View File

@@ -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();
}
@@ -158,7 +158,7 @@ EOF;
}
// "<form method='post' action='".e_SELF."?".e_QUERY."'>";
@@ -184,6 +184,9 @@ EOF;
</span>';
*/
// print_a($user_pref['core-infopanel-mye107']);
$mainPanel .= "
@@ -597,6 +600,8 @@ EOF;
global $user_pref;
$text = "";
foreach ($this->iconlist as $key=>$icon)

View File

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