|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:55
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_module_defs.php 29 Jun 2006 13:13:44 -0000 1.22 --- mx_module_defs.php 22 Aug 2006 20:21:50 -0000 1.23 *************** *** 226,230 **** 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', - // // Generic form selects --- 226,229 ---- *************** *** 300,303 **** --- 299,303 ---- // --------------------------------------------------------------------------------------- + /* // // Get menu data *************** *** 316,322 **** $pageMapping = $mx_nav_data['pagemapping']; ! $num_of_cats = count($navCategory); ! if ( $num_of_cats == 0 ) { $template->assign_block_vars('nocat', array( --- 316,341 ---- $pageMapping = $mx_nav_data['pagemapping']; ! $total_cats = count($navCategory); ! */ ! $sql = "SELECT * ! FROM " . MENU_CAT_TABLE . " ! WHERE block_id = '" . $block_id . "' ! ORDER BY cat_order"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query Navigation Categories', '', __LINE__, __FILE__, $sql ); ! } ! ! $cat_rows = array(); ! if( $total_cats = $db->sql_numrows($result) ) ! { ! $cat_rows = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! ! if ( $total_cats == 0 ) { $template->assign_block_vars('nocat', array( *************** *** 325,336 **** } ! $navCategory[] = array(); ! $cat_count = 0; ! foreach($navCategory as $cat_id => $catData) { ! $cat_count++; ! $new_cat = $cat_count == $num_of_cats + 1; ! ! $cat_id = $new_cat ? 'new_cat' : $catData[0]['cat_id']; $mode = MX_MENU_CAT_TYPE; --- 344,351 ---- } ! for( $cat_count = 0; $cat_count < $total_cats + 1; $cat_count++ ) { ! $new_cat = $cat_count == $total_cats; ! $cat_id = $new_cat ? 'new_cat' : $cat_rows[$cat_count]['cat_id']; $mode = MX_MENU_CAT_TYPE; *************** *** 361,366 **** <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $cat_title = !$new_cat ? $catData[0]['cat_title'] : ''; ! $cat_desc = !$new_cat ? $catData[0]['cat_desc'] : ''; // --- 376,381 ---- <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $cat_title = !$new_cat ? $cat_rows[$cat_count]['cat_title'] : ''; ! $cat_desc = !$new_cat ? $cat_rows[$cat_count]['cat_desc'] : ''; // *************** *** 369,373 **** if (!$new_cat) { ! $bbcode_uid = $catData[0]['bbcode_uid']; $cat_desc = preg_replace("/\:(([a-z0-9]:)?)$bbcode_uid/si", '', $cat_desc); --- 384,388 ---- if (!$new_cat) { ! $bbcode_uid = $cat_rows[$cat_count]['bbcode_uid']; $cat_desc = preg_replace("/\:(([a-z0-9]:)?)$bbcode_uid/si", '', $cat_desc); *************** *** 376,380 **** } ! $show_cat = $catData[0]['cat_show']; if( $show_cat == 0 ) --- 391,395 ---- } ! $show_cat = $cat_rows[$cat_count]['cat_show']; if( $show_cat == 0 ) *************** *** 387,392 **** } ! $cat_url = $catData[0]['cat_url']; ! $cat_target = $link_target_options[$catData[0]['cat_target']]; $link_target_list = '<select name="cat_target_sel">'; --- 402,407 ---- } ! $cat_url = $cat_rows[$cat_count]['cat_url']; ! $cat_target = $link_target_options[$cat_rows[$cat_count]['cat_target']]; $link_target_list = '<select name="cat_target_sel">'; *************** *** 404,419 **** { $buttonvalue = $lang['Move_and_or_Delete']; ! $name = $catData[0]['cat_title']; ! if( $num_of_cats == 1 ) { ! if( count($catData) > 0 ) ! { ! mx_message_die(GENERAL_ERROR, $lang['Must_delete_menus']); ! } ! else ! { ! $select_to = $lang['Nowhere_to_move']; ! } } else --- 419,427 ---- { $buttonvalue = $lang['Move_and_or_Delete']; ! $name = $cat_rows[$cat_count]['cat_title']; ! if( $total_cats == 1 ) { ! $select_to = $lang['Nowhere_to_move']; } else *************** *** 494,500 **** } $num_of_menus = count($catData); ! if ( $num_of_menus == 0 ) { $template->assign_block_vars('catrow.nocat', array( --- 502,528 ---- } + /* $num_of_menus = count($catData); + */ ! $sql = "SELECT * ! FROM " . MENU_NAV_TABLE . " ! WHERE cat_id = '" . $cat_id . "' ! ORDER BY menu_order"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query Navigation menus', '', __LINE__, __FILE__, $sql ); ! } ! ! $menu_rows = array(); ! if( $total_menus = $db->sql_numrows($result) ) ! { ! $menu_rows = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! ! if ( $total_menus == 0 ) { $template->assign_block_vars('catrow.nocat', array( *************** *** 503,513 **** } ! $catData[] = array(); ! $menu_count = 0; ! foreach($catData as $key => $menuData) { ! $menu_count++; ! $new_menu = $menu_count == $num_of_menus + 1; ! $menu_id = $new_menu ? $cat_id . '_0' : $menuData['menu_id']; $mode = MX_MENU_TYPE; --- 531,538 ---- } ! for( $menu_count = 0; $menu_count < $total_menus + 1; $menu_count++ ) { ! $new_menu = $menu_count == $total_menus; ! $menu_id = $new_menu ? $cat_id . '_0' : $menu_rows[$menu_count]['menu_id']; $mode = MX_MENU_TYPE; *************** *** 530,535 **** ! $menuname = !$new_menu ? $menuData['menu_name'] : ''; ! $menudesc = !$new_menu ? $menuData['menu_desc'] : ''; $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname --- 555,560 ---- ! $menuname = !$new_menu ? $menu_rows[$menu_count]['menu_name'] : ''; ! $menudesc = !$new_menu ? $menu_rows[$menu_count]['menu_desc'] : ''; $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname *************** *** 538,549 **** . '<br /><br />'; ! $menuicons = $new_menu ? post_icons('menu_icons/') : post_icons('menu_icons/', $menuData['menu_icon']); ! $menulinks = !$new_menu ? $menuData['menu_links'] : ''; ! $block_nav = !$new_menu ? $menuData['block_id'] : ''; ! $function_nav = !$new_menu ? $menuData['function_id'] : ''; ! $page_nav = !$new_menu ? $menuData['page_id'] : ''; ! $auth_view = !$new_menu ? $menuData['auth_view'] : ''; ! $auth_view_group_id = !$new_menu ? $menuData['auth_view_group'] : ''; ! $link_target = !$new_menu ? $link_target_options[$menuData['link_target']] : ''; $link_target_list = '<select name="link_target">'; --- 563,574 ---- . '<br /><br />'; ! $menuicons = $new_menu ? post_icons('menu_icons/') : post_icons('menu_icons/', $menu_rows[$menu_count]['menu_icon']); ! $menulinks = !$new_menu ? $menu_rows[$menu_count]['menu_links'] : ''; ! $block_nav = !$new_menu ? $menu_rows[$menu_count]['block_id'] : ''; ! $function_nav = !$new_menu ? $menu_rows[$menu_count]['function_id'] : ''; ! $page_nav = !$new_menu ? $menu_rows[$menu_count]['page_id'] : ''; ! $auth_view = !$new_menu ? $menu_rows[$menu_count]['auth_view'] : ''; ! $auth_view_group_id = !$new_menu ? $menu_rows[$menu_count]['auth_view_group'] : ''; ! $link_target = !$new_menu ? $link_target_options[$menu_rows[$menu_count]['link_target']] : ''; $link_target_list = '<select name="link_target">'; *************** *** 632,636 **** for( $k = 0; $k < count($module_auth_levels); $k++ ) { ! $selected = ( $menuData[$module_auth_fields[$j]] == $module_auth_const[$k] ) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $module_auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $module_auth_levels[$k]] . "</option>\n"; } --- 657,661 ---- for( $k = 0; $k < count($module_auth_levels); $k++ ) { ! $selected = ( $menu_rows[$menu_count][$module_auth_fields[$j]] == $module_auth_const[$k] ) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $module_auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $module_auth_levels[$k]] . "</option>\n"; } |