diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 3d8d26050..7bcc63bf3 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -57,12 +57,9 @@ class adminstyle_infopanel { $user_pref['core-infopanel-mye107'] = $_POST['e-mye107']; - + $user_pref['core-infopanel-menus'] = $_POST['e-mymenus']; + 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); // --------------------- 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); - $inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); + // Custom menu (core). + 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 .= $ns->tablerender("", $inc, $id,true); } } @@ -675,15 +680,22 @@ class adminstyle_infopanel { 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'].$row['menu_name']; - $checked = ($settings && in_array($path_to_menu, $settings)) ? true : false; - $text .= "\n
"; - $text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked); - $text .= "
"; + $path_to_menu = $row['menu_path']; } + // 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
"; + $text .= $frm->checkbox_label($label, "e-mymenus[]",$path_to_menu, $checked); + $text .= "
"; } }