Menu
▾
▴
[mxbb-commits] core/admin admin_mx_block_cp.php, 1.10, 1.11 admin_mx_chkobjs.php, 1.17, 1.18 admin_mx_gen_cache.php, 1.22, 1.23 admin_mx_meta.php, 1.14, 1.15 admin_mx_module.php, 1.43, 1.44 admin_mx_module_cp.php, 1.14, 1.15 admin_mx_page_cp.php, 1.16, 1.17 admin_mx_phpinfo.php, 1.9, 1.10 admin_mx_portal.php, 1.26, 1.27 index.php, 1.25, 1.26 page_footer_admin.php, 1.12, 1.13 page_header_admin.php, 1.16, 1.17 pagestart.php, 1.19, 1.20
|
From: Jon O. <jon...@us...> - 2006-06-17 20:09:12
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20300/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_gen_cache.php admin_mx_meta.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_phpinfo.php admin_mx_portal.php index.php page_footer_admin.php page_header_admin.php pagestart.php Log Message: Clean up... Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_mx_phpinfo.php 2 May 2006 23:22:15 -0000 1.9 --- admin_mx_phpinfo.php 17 Jun 2006 20:09:06 -0000 1.10 *************** *** 23,27 **** require('./pagestart.' . $phpEx); - // // Capture the phpInfo output --- 23,26 ---- *************** *** 70,73 **** // include_once('page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 69,71 ---- Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_mx_chkobjs.php 2 May 2006 23:22:15 -0000 1.17 --- admin_mx_chkobjs.php 17 Jun 2006 20:09:05 -0000 1.18 *************** *** 86,90 **** ); - // ====================================================== // [ MAIN PROCESS ] --- 86,89 ---- *************** *** 117,120 **** --- 116,120 ---- $main_title ); } + $mode = $HTTP_GET_VARS['mode']; $tb = $HTTP_GET_VARS['table']; *************** *** 126,129 **** --- 126,130 ---- $tab1 = $check_args[$tb]['fkeys'][1][0]; $key1 = $check_args[$tb]['fkeys'][1][1]; + switch($mode) { *************** *** 168,179 **** exit; - // ====================================================== // [ FUNCTIONS ] // ====================================================== ! // ------------ ! // ! // function check_relationship($tb) { --- 169,181 ---- exit; // ====================================================== // [ FUNCTIONS ] // ====================================================== ! /** ! * Enter description here... ! * ! * @param unknown_type $tb ! */ function check_relationship($tb) { *************** *** 272,275 **** --- 274,286 ---- } + /** + * Enter description here... + * + * @param unknown_type $td + * @param unknown_type $class + * @param unknown_type $colspan + * @param unknown_type $text + * @return unknown + */ function tbHead($td, $class, $colspan, $text) { *************** *** 277,284 **** } function tbItem($td, $class, $align, $text) { return "\t\t" . '<'.$td.' class="'.$class.'" align="'.$align.'">'.$text.'</'.$td.'>' . "\n"; - // return '<'.$td.' class="'.$class.'" align="'.$align.'"><span class="gen">'.$text.'</span></'.$td.'>' . "\n"; } --- 288,303 ---- } + /** + * Enter description here... + * + * @param unknown_type $td + * @param unknown_type $class + * @param unknown_type $align + * @param unknown_type $text + * @return unknown + */ function tbItem($td, $class, $align, $text) { return "\t\t" . '<'.$td.' class="'.$class.'" align="'.$align.'">'.$text.'</'.$td.'>' . "\n"; } *************** *** 286,289 **** --- 305,317 ---- // DB Utilities // + + /** + * Enter description here... + * + * @param unknown_type $tbname + * @param unknown_type $where + * @param unknown_type $field + * @return unknown + */ function chkobjs_dbFetchField($tbname, $where, $field) { *************** *** 294,297 **** --- 322,331 ---- } + /** + * Enter description here... + * + * @param unknown_type $sql + * @return unknown + */ function chkobjs_dbFetchRow($sql) { *************** *** 304,307 **** --- 338,347 ---- } + /** + * Enter description here... + * + * @param unknown_type $sql + * @return unknown + */ function chkobjs_dbQuery($sql) { *************** *** 311,314 **** return $result; } - ?> \ No newline at end of file --- 351,353 ---- Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** admin_mx_gen_cache.php 2 May 2006 23:22:15 -0000 1.22 --- admin_mx_gen_cache.php 17 Jun 2006 20:09:05 -0000 1.23 *************** *** 24,28 **** require('./pagestart.' . $phpEx); - // // Getting mode of operation --- 24,27 ---- *************** *** 33,39 **** // Load default template for install // ! $template->set_filenames(array( ! 'body' => 'admin/admin_message_body.tpl') ! ); // --- 32,36 ---- // Load default template for install // ! $template->set_filenames(array( 'body' => 'admin/admin_message_body.tpl' )); // *************** *** 73,76 **** $template->pparse('body'); include_once("./page_footer_admin.$phpEx"); - ?> \ No newline at end of file --- 70,72 ---- Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_mx_page_cp.php 3 May 2006 09:17:28 -0000 1.16 --- admin_mx_page_cp.php 17 Jun 2006 20:09:06 -0000 1.17 *************** *** 176,182 **** $field_names = array('auth_view' => $lang['View']); ! $template->set_filenames(array( ! 'body' => 'admin/mx_pagecp_admin_body.tpl') ! ); // --- 176,180 ---- $field_names = array('auth_view' => $lang['View']); ! $template->set_filenames(array( 'body' => 'admin/mx_pagecp_admin_body.tpl') ); // *************** *** 733,737 **** --- 731,737 ---- 'U_PREVIEW' => append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), + // // Page subpanel - edit + // 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, *************** *** 758,762 **** --- 758,764 ---- 'PAGELIST' => $pagelist, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 950,988 **** $visible_column_delete = in_array('adminColumnDelete_' . $page_id . '_' . $column_id, $cookie_states); $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! // Quick Panels ! 'MESSAGE_DELETE' => $message_delete, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); --- 952,992 ---- $visible_column_delete = in_array('adminColumnDelete_' . $page_id . '_' . $column_id, $cookie_states); $template->assign_block_vars('pages.columnrow', array( ! 'L_TITLE' => $lang['Column_admin'], ! 'L_TITLE_EXPLAIN' => $lang['Column_admin_explain'], ! 'L_COLUMN' => $lang['Column'], ! 'COLUMN_ID' => $column_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! // ! // Quick Panels ! // ! 'MESSAGE_DELETE' => $message_delete, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields )); *************** *** 1021,1076 **** for( $block = 0; $block < $total_blocks; $block++ ) { ! $block_id = $block_rows[$block]['block_id']; ! $mx_block->init( $block_id, true ); ! $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); ! } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); } // for ... blocks --- 1025,1080 ---- for( $block = 0; $block < $total_blocks; $block++ ) { ! $block_id = $block_rows[$block]['block_id']; ! $mx_block->init( $block_id, true ); ! $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); ! $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); ! $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&id=' . $block_id . '&column_id=' . $column_id; ! if( !empty($mx_block->block_edit_file) ) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); ! } ! else ! { ! $u_setting = ''; ! $l_setting = ''; ! // ! // Show Block Settings even if no BLOCK_SYSTEM_PARAMETER_TABLE row exists. ! // admin_mx_block.php will populate them if necessary (see B4). ! // ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } ! $template->assign_block_vars('pages.columnrow.blockrow', array( ! 'L_SETTING' => $l_setting, ! 'L_REMOVE' => $lang['Remove'], ! 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $mx_block->block_title, ! 'BLOCK_DESC' => ( $mx_block->block_desc != '' ) ? '<br /> ' . $mx_block->block_desc : '', ! 'BLOCK_LAST_EDITED' => ( $editor_name != '' ) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'ROW_COLOR' => $row_color, ! 'U_BLOCK_EDIT' => $u_setting, ! 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) ! )); } // for ... blocks *************** *** 1125,1128 **** $template->pparse('body'); include_once('./page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 1129,1131 ---- Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** index.php 2 May 2006 23:22:15 -0000 1.25 --- index.php 17 Jun 2006 20:09:06 -0000 1.26 *************** *** 80,84 **** ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; $template->assign_vars(array( --- 80,84 ---- ); ! $admincp_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons']; $template->assign_vars(array( *************** *** 91,95 **** "U_FORUM_INDEX" => append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), ! //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], --- 91,95 ---- "U_FORUM_INDEX" => append_sid(PHPBB_URL . "index.$phpEx"), "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), ! //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], *************** *** 98,102 **** 'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif', 'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif', ! //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], --- 98,102 ---- 'IMG_URL_CONTRACT' => $admincp_nav_icon_url . '/contract.gif', 'IMG_URL_EXPAND' => $admincp_nav_icon_url . '/expand.gif', ! //-MOD: DHTML Menu for ACP "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], *************** *** 117,123 **** ksort($module_portal); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_portal) ) --- 117,123 ---- ksort($module_portal); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_portal) ) *************** *** 126,133 **** $template->assign_block_vars('module_portal.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 126,133 ---- $template->assign_block_vars('module_portal.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 146,152 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) --- 146,152 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) *************** *** 154,160 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } --- 154,160 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } *************** *** 169,175 **** ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_phpbb) ) --- 169,175 ---- ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_phpbb) ) *************** *** 178,185 **** $template->assign_block_vars('module_phpbb.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 178,185 ---- $template->assign_block_vars('module_phpbb.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 198,204 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) --- 198,204 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) *************** *** 206,212 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } --- 206,212 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } *************** *** 234,237 **** --- 234,251 ---- { $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; + $module_path_root = $mx_root_path . $module_rows[$module_cnt]['module_path']; + + // ********************************************************************** + // Read language definition + // ********************************************************************** + if ( file_exists( $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) ) + { + include( $module_path_root . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ); + } + else if ( file_exists( $module_path_root . 'language/lang_english/lang_admin.' . $phpEx ) ) + { + include( $module_path_root . 'language/lang_english/lang_admin.' . $phpEx ); + } + $module_mx = array_merge_recursive($module_mx, read_admin($module_path_admin)); } *************** *** 242,248 **** ksort($module_mx); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_mx) ) --- 256,262 ---- ksort($module_mx); ! //+MOD: DHTML Menu for ACP $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP while( list($cat, $action_array) = each($module_mx) ) *************** *** 251,258 **** $template->assign_block_vars('module_mx.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); --- 265,272 ---- $template->assign_block_vars('module_mx.catrow', array( ! //+MOD: DHTML Menu for ACP 'MENU_CAT_ID' => $menu_cat_id, 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP 'ADMIN_CATEGORY' => $cat) ); *************** *** 271,277 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, --- 285,291 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, *************** *** 280,286 **** $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } // ----------------------------------------------------------------------------------- --- 294,300 ---- $row_count++; } ! //+MOD: DHTML Menu for ACP $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } // ----------------------------------------------------------------------------------- Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** page_header_admin.php 2 May 2006 23:22:15 -0000 1.16 --- page_header_admin.php 17 Jun 2006 20:09:06 -0000 1.17 *************** *** 57,63 **** **********/ ! $template->set_filenames(array( ! 'header' => 'admin/page_header.tpl') ! ); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility --- 57,61 ---- **********/ ! $template->set_filenames(array( 'header' => 'admin/page_header.tpl') ); // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility *************** *** 67,71 **** $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! // 'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], --- 65,69 ---- $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! // 'PAGE_TITLE' => $page_title, 'L_ADMIN' => $lang['Admin'], *************** *** 155,158 **** $template->pparse('header'); - ?> \ No newline at end of file --- 153,155 ---- Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** admin_mx_module.php 2 May 2006 23:22:15 -0000 1.43 --- admin_mx_module.php 17 Jun 2006 20:09:05 -0000 1.44 *************** *** 98,104 **** // ! $template->set_filenames(array( ! 'body' => 'admin/mx_module_admin_body.tpl') ! ); // --- 98,102 ---- // ! $template->set_filenames(array( 'body' => 'admin/mx_module_admin_body.tpl') ); // *************** *** 361,367 **** $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( ! 'MODULE_SELECT_BOX' => $module_select_box ! )); // --- 359,363 ---- $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( 'MODULE_SELECT_BOX' => $module_select_box )); // *************** *** 371,374 **** $template->pparse('body'); include('./page_footer_admin.php'); - ?> \ No newline at end of file --- 367,369 ---- Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_module_cp.php 2 May 2006 23:22:15 -0000 1.14 --- admin_mx_module_cp.php 17 Jun 2006 20:09:05 -0000 1.15 *************** *** 169,175 **** ); ! $template->set_filenames(array( ! 'admin_block' => 'admin/mx_modulecp_admin_body.tpl') ! ); // --- 169,173 ---- ); ! $template->set_filenames(array( 'admin_block' => 'admin/mx_modulecp_admin_body.tpl') ); // *************** *** 180,184 **** $admin_icon['contract'] = $module_nav_icon_url . 'contract.gif'; $admin_icon['expand'] = $module_nav_icon_url . 'expand.gif'; - $admin_icon['module'] = $module_nav_icon_url . 'icon_module.gif'; $admin_icon['function'] = $module_nav_icon_url . 'icon_function.gif'; --- 178,181 ---- *************** *** 223,227 **** 'L_INCLUDE_BLOCK_PRIVATE' => $lang['Include_block_private'], - 'S_SUBMIT' => $lang['Update'], --- 220,223 ---- *************** *** 257,261 **** --- 253,259 ---- 'L_MODULE_INCLUDE_ADMIN' => $lang['Module_include_admin'], + // // Block + // 'L_AUTH_TITLE' => $lang['Auth_Block'], 'L_AUTH_TITLE_EXPLAIN' => $lang['Auth_Block_explain'], *************** *** 476,480 **** $type_row['Function'] = !empty($lang['ParType_Function']) ? $lang['ParType_Function'] : "Function"; - $type_row['Separator'] = !empty($lang['ParType_Separator']) ? $lang['ParType_Separator'] : "-Separator-"; --- 474,477 ---- *************** *** 778,786 **** 'E_PARAMETER_DEFAULT' => $parameter_default, // Quick Panels 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_parameter_fields, - 'S_SUBMIT' => $new_parameter ? $lang['Create_parameter'] : $lang['Update'] )); --- 775,784 ---- 'E_PARAMETER_DEFAULT' => $parameter_default, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, 'S_HIDDEN_FIELDS' => $s_hidden_parameter_fields, 'S_SUBMIT' => $new_parameter ? $lang['Create_parameter'] : $lang['Update'] )); *************** *** 948,952 **** --- 946,952 ---- 'S_SHOW_STATS_NO' => $show_stats_no, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 1062,1072 **** $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( ! 'MODULE_SELECT_BOX' => $module_select_box ! )); include_once('./page_header_admin.' . $phpEx); $template->pparse('admin_block'); include_once('./page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 1062,1069 ---- $module_select_box = get_list_static('module_id', $module_rows_select, $nav_module_id, false); ! $template->assign_vars(array( 'MODULE_SELECT_BOX' => $module_select_box )); include_once('./page_header_admin.' . $phpEx); $template->pparse('admin_block'); include_once('./page_footer_admin.' . $phpEx); ?> \ No newline at end of file Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** page_footer_admin.php 29 May 2006 15:37:03 -0000 1.12 --- page_footer_admin.php 17 Jun 2006 20:09:06 -0000 1.13 *************** *** 19,25 **** // Show the overall footer. // ! $template->set_filenames(array( ! 'page_footer' => 'admin/page_footer.tpl') ! ); // --- 19,23 ---- // Show the overall footer. // ! $template->set_filenames(array( 'page_footer' => 'admin/page_footer.tpl' )); // *************** *** 75,78 **** exit; - ?> \ No newline at end of file --- 73,75 ---- Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pagestart.php 2 May 2006 23:22:15 -0000 1.19 --- pagestart.php 17 Jun 2006 20:09:06 -0000 1.20 *************** *** 65,69 **** } - if( empty($no_page_header) ) { --- 65,68 ---- *************** *** 74,77 **** include($mx_root_path . 'admin/page_header_admin.' . $phpEx); } - ?> \ No newline at end of file --- 73,75 ---- Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_portal.php 3 May 2006 09:17:28 -0000 1.26 --- admin_mx_portal.php 17 Jun 2006 20:09:06 -0000 1.27 *************** *** 67,73 **** } ! $template->set_filenames(array( ! 'admin_portal' => 'admin/admin_mx_portal.tpl') ! ); $top_phpbb_links_yes = ( $portal_config['top_phpbb_links'] == 1 ) ? 'checked="checked"' : ''; --- 67,71 ---- } ! $template->set_filenames(array( 'admin_portal' => 'admin/admin_mx_portal.tpl') ); $top_phpbb_links_yes = ( $portal_config['top_phpbb_links'] == 1 ) ? 'checked="checked"' : ''; *************** *** 116,120 **** "NAVIGATION_BLOCK" => $navigation_block_list, - // Added in v 2.706 "L_PHPBB_RELATIVE_PATH" => $lang['Phpbb_path'], "L_PHPBB_RELATIVE_PATH_EXPLAIN" => $lang['Phpbb_path_explain'], --- 114,117 ---- *************** *** 153,156 **** include_once('page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 150,152 ---- Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_mx_block_cp.php 2 May 2006 23:22:15 -0000 1.10 --- admin_mx_block_cp.php 17 Jun 2006 20:09:05 -0000 1.11 *************** *** 16,19 **** --- 16,22 ---- } + // + // Security and Page header + // define('IN_PORTAL', 1); $mx_root_path = './../'; *************** *** 36,40 **** $blockcptemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db ); - // // Load BlockCp --- 39,42 ---- *************** *** 85,88 **** --- 87,93 ---- setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + // + // Init the User BlockCP + // $mx_blockcp->init($block_id, true); *************** *** 147,150 **** --- 152,158 ---- } // if .. !empty($mode) + // + // Hidden vars + // $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />'; *************** *** 195,199 **** // $blockcptemplate->set_filenames(array( ! 'body' => 'admin/mx_blockcp_admin_body.tpl' )); --- 203,207 ---- // $blockcptemplate->set_filenames(array( ! 'body' => 'admin/mx_blockcp_admin_body.tpl' )); Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_meta.php 2 May 2006 23:22:15 -0000 1.14 --- admin_mx_meta.php 17 Jun 2006 20:09:05 -0000 1.15 *************** *** 24,28 **** require('./pagestart.' . $phpEx); - // // Load language file. --- 24,27 ---- *************** *** 37,41 **** } - // // Main procedure --- 36,39 ---- *************** *** 97,101 **** } - // // Read current settings and send result to browser --- 95,98 ---- *************** *** 103,109 **** include($mx_root_path . 'mx_meta.inc'); ! $template->set_filenames(array( ! 'meta' => 'admin/admin_mx_meta.tpl') ! ); $template->assign_vars(array( --- 100,104 ---- include($mx_root_path . 'mx_meta.inc'); ! $template->set_filenames(array( 'meta' => 'admin/admin_mx_meta.tpl') ); $template->assign_vars(array( *************** *** 132,139 **** 'KEYWORDS' => $keywords, 'DESCRIPTION' => $description, ! 'LANGUAGE' => generate_meta_select($langcode, 'langcode'), ! 'RATING' => generate_meta_select($rating, 'rating'), ! 'ROBOTS_INDEX' => generate_meta_select($index, 'index'), ! 'ROBOTS_FOLLOW' => generate_meta_select($follow, 'follow'), 'ICON' => $icon, 'HEADER' => htmlspecialchars($header), --- 127,134 ---- 'KEYWORDS' => $keywords, 'DESCRIPTION' => $description, ! 'LANGUAGE' => mx_generate_meta_select($langcode, 'langcode'), ! 'RATING' => mx_generate_meta_select($rating, 'rating'), ! 'ROBOTS_INDEX' => mx_generate_meta_select($index, 'index'), ! 'ROBOTS_FOLLOW' => mx_generate_meta_select($follow, 'follow'), 'ICON' => $icon, 'HEADER' => htmlspecialchars($header), *************** *** 144,167 **** $template->pparse('meta'); include("./page_footer_admin.$phpEx"); - - - // ======================================== - // FUNCTIONS - // ======================================== - - function generate_meta_select($default, $select_name) - { - global $lang; - - $select = '<select name="' . $select_name . '">'; - foreach( $lang['mx_meta'][$select_name] as $key => $value ) - { - $selected = ( $key == $default ) ? ' selected="selected"' : ''; - $select .= '<option value="' . $key . '"' . $selected . '>' . $value . "</option>\n"; - } - $select .= '</select>'; - - return $select; - } - ?> \ No newline at end of file --- 139,141 ---- |
