Menu
▾
▴
[mxbb-commits] core/modules/mx_navmenu/admin mx_module_defs.php, 1.27, 1.28
|
From: Jon O. <jon...@us...> - 2007-09-09 16:50:01
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9513/admin Modified Files: mx_module_defs.php Log Message: Ok, massive update for 2.9.x. Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_module_defs.php 21 Jul 2007 23:09:03 -0000 1.27 --- mx_module_defs.php 9 Sep 2007 16:49:57 -0000 1.28 *************** *** 206,217 **** // Get group data // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name"; if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql); } --- 206,229 ---- // Get group data // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql); } *************** *** 290,294 **** 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => append_sid(PORTAL_URL . $s_action_file), )); --- 302,306 ---- 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => mx_append_sid(PORTAL_URL . $s_action_file), )); *************** *** 296,300 **** { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } --- 308,312 ---- { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } *************** *** 437,442 **** 'CAT_DESC' => ( $cat_desc != '' ) ? ' - ' . $cat_desc : '', ! 'U_CAT_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // --- 449,454 ---- 'CAT_DESC' => ( $cat_desc != '' ) ? ' - ' . $cat_desc : '', ! 'U_CAT_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // *************** *** 461,465 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, --- 473,477 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . mx_append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 548,552 **** $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname . '<br /><br />' . $lang['Delete_nav_menu_explain'] ! . '<br /><br />' . sprintf($lang['Click_nav_menu_delete_yes'], '<a href="' . append_sid($mx_root_path . $s_action_file . $deletemode . '&sid=' . $userdata['session_id']) . '">', '</a>') . '<br /><br />'; --- 560,564 ---- $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname . '<br /><br />' . $lang['Delete_nav_menu_explain'] ! . '<br /><br />' . sprintf($lang['Click_nav_menu_delete_yes'], '<a href="' . mx_append_sid($mx_root_path . $s_action_file . $deletemode . '&sid=' . $userdata['session_id']) . '">', '</a>') . '<br /><br />'; *************** *** 591,596 **** 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // --- 603,608 ---- 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // *************** *** 839,843 **** 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => append_sid(PORTAL_URL . $s_action_file), )); --- 851,855 ---- 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => mx_append_sid(PORTAL_URL . $s_action_file), )); *************** *** 845,849 **** { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } --- 857,861 ---- { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } *************** *** 948,953 **** 'CAT_TITLE' => $cat_title, ! 'U_CAT_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // --- 960,965 ---- 'CAT_TITLE' => $cat_title, ! 'U_CAT_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // *************** *** 1071,1076 **** 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // --- 1083,1088 ---- 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // |
