|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/admin Modified Files: admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php Log Message: fixing up installer and search and site log Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_module_cp.php 6 Sep 2005 18:51:56 -0000 1.3 --- admin_mx_module_cp.php 8 Sep 2005 21:16:18 -0000 1.4 *************** *** 304,308 **** $module_rows_current = array(); ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); // --- 304,311 ---- $module_rows_current = array(); ! if( $total_modules_current = $db->sql_numrows($q_modules_current) ) ! { ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); ! } // *************** *** 326,330 **** } ! if ( $total_modules == 0 ) { $template->assign_block_vars('nomodule', array( --- 329,333 ---- } ! if ( $total_modules + $total_modules_current == 0 ) { $template->assign_block_vars('nomodule', array( *************** *** 334,337 **** --- 337,341 ---- $module_rows = array_merge($module_rows_current, $module_rows); + $total_modules = $total_modules + $total_modules_current; // *************** *** 351,355 **** $is_current_module = ($module_id == $nav_module_id); ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; if (!$include_all && $module_count > 0) --- 355,362 ---- $is_current_module = ($module_id == $nav_module_id); ! if ($module_count != $total_modules) ! { ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; ! } if (!$include_all && $module_count > 0) Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_page_cp.php 6 Sep 2005 18:51:56 -0000 1.3 --- admin_mx_page_cp.php 8 Sep 2005 21:16:18 -0000 1.4 *************** *** 613,617 **** $is_current_page = $page_id == $nav_page_id; ! if ($page_count - -1) { $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; --- 613,617 ---- $is_current_page = $page_id == $nav_page_id; ! if ($page_count > -1) { $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** admin_mx_module.php 7 Sep 2005 19:36:30 -0000 1.33 --- admin_mx_module.php 8 Sep 2005 21:16:18 -0000 1.34 *************** *** 213,217 **** $module_rows_current = array(); ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); // --- 213,220 ---- $module_rows_current = array(); ! if( $total_modules_current = $db->sql_numrows($q_modules_current) ) ! { ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); ! } // *************** *** 235,239 **** } ! if ( $total_modules == 0 ) { $template->assign_block_vars('nomodule', array( --- 238,242 ---- } ! if ( $total_modules + $total_modules_current == 0 ) { $template->assign_block_vars('nomodule', array( *************** *** 243,246 **** --- 246,250 ---- $module_rows = array_merge($module_rows_current, $module_rows); + $total_modules = $total_modules + $total_modules_current; // *************** *** 281,285 **** $is_current_module = $module_id == $nav_module_id; ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; $check_opt = ''; --- 285,292 ---- $is_current_module = $module_id == $nav_module_id; ! if ($module_count > -1) ! { ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; ! } $check_opt = ''; |