diff --git a/e107_admin/header.php b/e107_admin/header.php index 100a71927..1615e89d1 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ -| $Revision: 1.24 $ -| $Date: 2008-12-19 14:01:07 $ +| $Revision: 1.25 $ +| $Date: 2008-12-20 10:39:14 $ | $Author: secretr $ +---------------------------------------------------------------+ */ @@ -327,6 +327,7 @@ $e107_var = array(); /** * Build admin menus - addmin menus are now supporting unlimitted number of submenus + * TODO - add this to a handler for use on front-end as well (tree, sitelinks.sc replacement) * * $e107_vars structure: * $e107_vars['action']['text'] -> link title @@ -456,11 +457,14 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li return ''; } +/* + * DEPRECATED - use e_admin_menu() + */ if (!function_exists('show_admin_menu')) { function show_admin_menu($title, $active_page, $e107_vars, $js = FALSE, $sub_link = FALSE, $sortlist = FALSE) { - return e_admin_menu($title, $active_page, $e107_vars, false, false, $sortlist); - /* + //return e_admin_menu($title, $active_page, $e107_vars, false, false, $sortlist); + global $ns, $BUTTON, $BUTTON_OVER, $BUTTONS_START, $BUTTONS_END, $SUB_BUTTON, $SUB_BUTTON_OVER, $SUB_BUTTONS_START, $SUB_BUTTONS_END; $id_title = "yop_".str_replace(" ", "", $title); @@ -552,7 +556,7 @@ if (!function_exists('show_admin_menu')) { return $text; } else { $ns -> tablerender($title, $text, array('id' => $id_title, 'style' => 'button_menu')); - }*/ + } } } @@ -576,6 +580,17 @@ if (!function_exists("parse_admin")) { } } +/** + * Automate DB system messages + * NOTE: default value of $output parameter will be changed to false (no output by default) in the future + * + * @param integer|bool $update return result of db::db_Query + * @param string $type update|insert|update + * @param string $success forced success message + * @param string $failed forced error message + * @param bool $output false suppress any function output + * @return integer|bool db::db_Query result + */ function admin_update($update, $type = 'update', $success = false, $failed = false, $output = true) { require_once(e_HANDLER."message_handler.php"); $emessage = &eMessage::getInstance(); diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 46803d7f8..90e960b67 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -9,8 +9,8 @@ * Administration - Site Preferences * * $Source: /cvs_backup/e107_0.8/e107_admin/prefs.php,v $ - * $Revision: 1.20 $ - * $Date: 2008-12-19 14:01:07 $ + * $Revision: 1.21 $ + * $Date: 2008-12-20 10:39:14 $ * $Author: secretr $ * */ @@ -1124,7 +1124,7 @@ function prefs_adminmenu() $var['core-prefs-security']['text'] = PRFLAN_47; $var['core-prefs-comments']['text'] = PRFLAN_87; $var['core-prefs-advanced']['text'] = PRFLAN_149; - show_admin_menu(LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var, TRUE); + e_admin_menu(LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var); } /** diff --git a/e107_plugins/list_new/admin_list_config.php b/e107_plugins/list_new/admin_list_config.php index 2cb14338a..ae6f3add4 100644 --- a/e107_plugins/list_new/admin_list_config.php +++ b/e107_plugins/list_new/admin_list_config.php @@ -11,17 +11,17 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/list_new/admin_list_config.php,v $ -| $Revision: 1.5 $ -| $Date: 2008-12-11 22:38:06 $ -| $Author: e107steved $ +| $Revision: 1.6 $ +| $Date: 2008-12-20 10:39:13 $ +| $Author: secretr $ +---------------------------------------------------------------+ */ //include and require several classes require_once("../../class2.php"); if(!getperms("1") || !plugInstalled('list_new')) -{ - header("location:".e_BASE."index.php"); +{ + header("location:".e_BASE."index.php"); exit ; } require_once(e_ADMIN."auth.php"); @@ -91,8 +91,8 @@ $TOPIC_ROW = " {TOPIC_TOPIC} - {TOPIC_HEADING} -
+ {TOPIC_HEADING} +
{TOPIC_HELP}

{TOPIC_FIELD}
@@ -133,7 +133,7 @@ function showhideit(showid){ $text .= "
-".$rs -> form_open("post", e_SELF, "menu_conf_form", "", "enctype='multipart/form-data'")."\n"; +".$rs -> form_open("post", e_SELF, "menu_conf_form", "", "class='admin-menu' enctype='multipart/form-data'")."\n"; $text .= parse_menu_options("recent_menu"); $text .= parse_menu_options("new_menu"); @@ -154,6 +154,7 @@ function parse_global_options($type){ $TOPIC_TOPIC = LIST_ADMIN_SECT_1; $TOPIC_HEADING = LIST_ADMIN_SECT_2; $TOPIC_HELP = LIST_ADMIN_SECT_3; + $TOPIC_CONTID = "list-new-{$type}-expandable-sections"; $TOPIC_FIELD = ""; for($i=0;$i form_checkbox($sections[$i]."_".$type."_display", 1, ($list_pref[$sections[$i]."_".$type."_display"]) ? "1" : "0")." ".$titles[$i]."
"; @@ -164,6 +165,7 @@ function parse_global_options($type){ $TOPIC_TOPIC = LIST_ADMIN_SECT_4; $TOPIC_HEADING = LIST_ADMIN_SECT_5; $TOPIC_HELP = LIST_ADMIN_SECT_6; + $TOPIC_CONTID = "list-new-{$type}-expandable-display-style"; $TOPIC_FIELD = ""; for($i=0;$i form_checkbox($sections[$i]."_".$type."_open", 1, (isset($list_pref[$sections[$i]."_".$type."_open"]) ? "1" : "0"))." ".$titles[$i]."
"; @@ -174,6 +176,7 @@ function parse_global_options($type){ $TOPIC_TOPIC = LIST_ADMIN_SECT_7; $TOPIC_HEADING = LIST_ADMIN_SECT_8; $TOPIC_HELP = LIST_ADMIN_SECT_9; + $TOPIC_CONTID = "list-new-{$type}-expandable-author"; $TOPIC_FIELD = ""; for($i=0;$i form_checkbox($sections[$i]."_".$type."_author", 1, (isset($list_pref[$sections[$i]."_".$type."_author"]) ? "1" : "0"))." ".$titles[$i]."
"; @@ -185,6 +188,7 @@ function parse_global_options($type){ $TOPIC_HEADING = LIST_ADMIN_SECT_11; $TOPIC_HELP = LIST_ADMIN_SECT_12; $TOPIC_FIELD = ""; + $TOPIC_CONTID = "list-new-{$type}-expandable-category"; for($i=0;$i form_checkbox($sections[$i]."_".$type."_category", 1, (isset($list_pref[$sections[$i]."_".$type."_category"]) ? "1" : "0"))." ".$titles[$i]."
"; } @@ -195,6 +199,7 @@ function parse_global_options($type){ $TOPIC_HEADING = LIST_ADMIN_SECT_14; $TOPIC_HELP = LIST_ADMIN_SECT_15; $TOPIC_FIELD = ""; + $TOPIC_CONTID = "list-new-{$type}-expandable-date"; for($i=0;$i form_checkbox($sections[$i]."_".$type."_date", 1, (isset($list_pref[$sections[$i]."_".$type."_date"]) ? "1" : "0"))." ".$titles[$i]."
"; } @@ -204,6 +209,7 @@ function parse_global_options($type){ $TOPIC_TOPIC = LIST_ADMIN_SECT_22; $TOPIC_HEADING = LIST_ADMIN_SECT_23; $TOPIC_HELP = LIST_ADMIN_SECT_24; + $TOPIC_CONTID = "list-new-{$type}-expandable-icon"; $TOPIC_FIELD = ""; for($i=0;$i
".$rs -> form_text($sections[$i]."_".$type."_icon", 15, $list_pref[$sections[$i]."_".$type."_icon"], 100)." - +