mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2009 from lonalore/master

Browse Source 
Fix for Dashboard infopanel-menus.
This commit is contained in:
Cameron
2016-11-07 11:45:00 -08:00
committed by GitHub
parent 133fe51002 ca61dc9ef2
commit a3fff13d7f
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
e107_admin/includes/infopanel.php
View File

@@ -57,12 +57,9 @@ class adminstyle_infopanel
{ {
$user_pref['core-infopanel-mye107'] = $_POST['e-mye107']; $user_pref['core-infopanel-mye107'] = $_POST['e-mye107'];
$user_pref['core-infopanel-menus'] = $_POST['e-mymenus'];
save_prefs('user'); save_prefs('user');
$pref['core-infopanel-menus'] = $_POST['e-mymenus'];
save_prefs();
} }
@@ -251,16 +248,24 @@ class adminstyle_infopanel
// $text2 .= $ns->tablerender('Visitors Online : '.vartrue($nOnline), $panelOnline,'core-infopanel_online',true); // $text2 .= $ns->tablerender('Visitors Online : '.vartrue($nOnline), $panelOnline,'core-infopanel_online',true);
// --------------------- User Selected Menus ------------------- // --------------------- User Selected Menus -------------------
if (varset($pref['core-infopanel-menus'])) if(varset($user_pref['core-infopanel-menus']))
{ {
foreach ($pref['core-infopanel-menus'] as $val) foreach($user_pref['core-infopanel-menus'] as $val)
{ {
$id = $frm->name2id('core-infopanel_'.$val); // Custom menu (core).
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); if(is_numeric($val))
{
$inc = e107::getMenu()->renderMenu($val, null, null, true);
}
// Plugin defined menu.
else
{
$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
}
$text .= $inc; $text .= $inc;
// $text .= $ns->tablerender("", $inc, $id,true);
} }
} }
@@ -664,26 +669,33 @@ class adminstyle_infopanel
} }
$frm = e107::getForm(); $frm = e107::getForm();
$pref = e107::getPref(); global $user_pref;
$text = "<div style='padding-left:20px'>"; $text = "<div style='padding-left:20px'>";
$menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name'; $menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name';
$settings = varset($pref['core-infopanel-menus'],array()); $settings = varset($user_pref['core-infopanel-menus'],array());
if (e107::getDb()->gen($menu_qry)) if (e107::getDb()->gen($menu_qry))
{ {
while ($row = e107::getDb()->db_Fetch()) while ($row = e107::getDb()->db_Fetch())
{ {
// if(!is_numeric($row['menu_path'])) // Custom menu (core).
if(is_numeric($row['menu_path']))
{ {
$label = str_replace("_menu","",$row['menu_name']); $path_to_menu = $row['menu_path'];
$path_to_menu = $row['menu_path'].$row['menu_name'];
$checked = ($settings && in_array($path_to_menu, $settings)) ? true : false;
$text .= "\n<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>";
$text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked);
$text .= "</div>";
} }
// Plugin defined menu.
else
{
$path_to_menu = $row['menu_path'].$row['menu_name'];
}
$label = str_replace("_menu","",$row['menu_name']);
$checked = ($settings && in_array($path_to_menu, $settings)) ? true : false;
$text .= "\n<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>";
$text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked);
$text .= "</div>";
} }
} }