Menu
▾
▴
[mxbb-commits] core/admin admin_mx_block_cp.php, 1.11, 1.12 admin_mx_chkobjs.php, 1.19, 1.20 admin_mx_meta.php, 1.15, 1.16 admin_mx_module.php, 1.44, 1.45 admin_mx_module_cp.php, 1.15, 1.16 admin_mx_page_cp.php, 1.17, 1.18 admin_mx_phpinfo.php, 1.10, 1.11 admin_mx_portal.php, 1.27, 1.28 page_footer_admin.php, 1.13, 1.14 page_header_admin.php, 1.17, 1.18 pagestart.php, 1.20, 1.21
|
From: Jon O. <jon...@us...> - 2006-06-27 07:52:08
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1878/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.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 page_footer_admin.php page_header_admin.php pagestart.php Log Message: minor fixes Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_mx_phpinfo.php 17 Jun 2006 20:09:06 -0000 1.10 --- admin_mx_phpinfo.php 27 Jun 2006 07:52:03 -0000 1.11 *************** *** 43,46 **** --- 43,47 ---- '<a><pre><blockquote><img><div><span><p><br>'. '<table><tr><td><th><thead><tbody><tfoot>'; + $body_part = strip_tags($body_part, $allowedTags); Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin_mx_chkobjs.php 26 Jun 2006 21:32:22 -0000 1.19 --- admin_mx_chkobjs.php 27 Jun 2006 07:52:02 -0000 1.20 *************** *** 28,36 **** require('./pagestart.' . $phpEx); - // ====================================================== // [ GLOBAL DATA ] // ====================================================== - $main_title = "Check mxBB Objects"; $main_desc = "This utility allows you to check mxBB object relationships."; --- 28,34 ---- *************** *** 268,272 **** $html.=tbHead('td', 'catBottom', 5, '<a href="'.append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; - $html.='</table><br />' . "\n"; --- 266,269 ---- Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_mx_page_cp.php 17 Jun 2006 20:09:06 -0000 1.17 --- admin_mx_page_cp.php 27 Jun 2006 07:52:03 -0000 1.18 *************** *** 89,93 **** $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates'; $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); - $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array(); --- 89,92 ---- *************** *** 159,164 **** $sort_cookie = array($sort_method, $sort_order, $include_all, isset($sort_cookie[3]) ? $sort_cookie[3] : intval($include_all), isset($sort_cookie[4]) ? $sort_cookie[4] : '', isset($sort_cookie[5]) ? $sort_cookie[5] : $include_all); - setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- --- 158,163 ---- $sort_cookie = array($sort_method, $sort_order, $include_all, isset($sort_cookie[3]) ? $sort_cookie[3] : intval($include_all), isset($sort_cookie[4]) ? $sort_cookie[4] : '', isset($sort_cookie[5]) ? $sort_cookie[5] : $include_all); setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- *************** *** 396,408 **** 'L_TEMPLATE_NAME' => $lang['Template_name'], // Page subpanel - edit 'E_TEMPLATE_TITLE' => $template_title, ! // Main 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // Quick Panels 'MESSAGE_DELETE' => $message_delete, --- 395,412 ---- 'L_TEMPLATE_NAME' => $lang['Template_name'], + // // Page subpanel - edit + // 'E_TEMPLATE_TITLE' => $template_title, ! // // Main + // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 753,757 **** --- 757,763 ---- 'S_PHPBB_STATS_DEFAULT' => $phpbb_stats_default, + // // Main + // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** admin_mx_module.php 17 Jun 2006 20:09:05 -0000 1.44 --- admin_mx_module.php 27 Jun 2006 07:52:02 -0000 1.45 *************** *** 97,101 **** // Start page proper // - $template->set_filenames(array( 'body' => 'admin/mx_module_admin_body.tpl') ); --- 97,100 ---- *************** *** 332,336 **** --- 331,337 ---- 'MODULE_VERSION' => ( $module_rows[$module_count]['module_version'] != '' ) ? '- ' . $module_rows[$module_count]['module_version'] : '', + // // Module subpanel - edit + // 'E_MODULE_NAME' => $module_rows[$module_count]['module_name'], 'E_MODULE_DESC' => $module_rows[$module_count]['module_desc'], *************** *** 338,342 **** --- 339,345 ---- 'E_MODULE_INCLUDE_CHECK_OPT' => $check_opt, + // // Quick Panels + // 'MESSAGE_UPGRADE' => $message_upgrade, 'MESSAGE_EXPORT' => $message_export, Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** page_header_admin.php 17 Jun 2006 20:09:06 -0000 1.17 --- page_header_admin.php 27 Jun 2006 07:52:03 -0000 1.18 *************** *** 59,63 **** --- 59,65 ---- $template->set_filenames(array( 'header' => 'admin/page_header.tpl') ); + // // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility + // $l_timezone = explode('.', $board_config['board_timezone']); $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_mx_module_cp.php 17 Jun 2006 20:09:05 -0000 1.15 --- admin_mx_module_cp.php 27 Jun 2006 07:52:03 -0000 1.16 *************** *** 145,149 **** $sort_cookie = array(isset($sort_cookie[0]) ? $sort_cookie[0] : '', isset($sort_cookie[1]) ? $sort_cookie[1] : '', isset($sort_cookie[2]) ? $sort_cookie[2] : intval($include_all), intval($mx_modulecp_include_block_quickedit), intval($mx_modulecp_include_block_private), intval($include_all)); - setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); --- 145,148 ---- *************** *** 306,310 **** 'S_INCLUDE_BLOCK_PRIVATE_YES' => ( $mx_modulecp_include_block_private == '1' ) ? 'checked="checked"' : '', 'S_INCLUDE_BLOCK_PRIVATE_NO' => ( $mx_modulecp_include_block_private == '0' ) ? 'checked="checked"' : '' - )); --- 305,308 ---- *************** *** 494,498 **** --- 492,498 ---- 'U_MODULE_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_module.$phpEx?module_id=" . $module_rows[$module_count]['module_id']), + // // Module subpanel - edit + // 'E_MODULE_NAME' => $module_rows[$module_count]['module_name'], 'E_MODULE_DESC' => $module_rows[$module_count]['module_desc'], *************** *** 639,643 **** --- 639,645 ---- 'E_FUNCTION_ADMIN_FILE' => $function_admin_file, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** page_footer_admin.php 17 Jun 2006 20:09:06 -0000 1.13 --- page_footer_admin.php 27 Jun 2006 07:52:03 -0000 1.14 *************** *** 33,38 **** 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), ! 'EXECUTION_STATS' => $execution_stats) ! ); $template->pparse('page_footer'); --- 33,38 ---- 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), ! 'EXECUTION_STATS' => $execution_stats ! )); $template->pparse('page_footer'); Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pagestart.php 17 Jun 2006 20:09:06 -0000 1.20 --- pagestart.php 27 Jun 2006 07:52:03 -0000 1.21 *************** *** 22,30 **** $phpEx = substr(strrchr(__FILE__, '.'), 1); - include_once($mx_root_path . 'common.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); --- 22,29 ---- $phpEx = substr(strrchr(__FILE__, '.'), 1); + include_once($mx_root_path . 'common.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); *************** *** 41,45 **** } - //if ( !($userdata['user_level'] == ADMIN || $block_edit_auth['auth_edit'] ) ) if ( !($userdata['user_level'] == ADMIN) ) { --- 40,43 ---- *************** *** 56,60 **** $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; - //mx_redirect("index.$phpEx?sid=" . $userdata['session_id']); mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } --- 54,57 ---- Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_portal.php 17 Jun 2006 20:09:06 -0000 1.27 --- admin_mx_portal.php 27 Jun 2006 07:52:03 -0000 1.28 *************** *** 148,152 **** $template->pparse('admin_portal'); - include_once('page_footer_admin.' . $phpEx); ?> \ No newline at end of file --- 148,151 ---- Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_mx_block_cp.php 17 Jun 2006 20:09:05 -0000 1.11 --- admin_mx_block_cp.php 27 Jun 2006 07:52:02 -0000 1.12 *************** *** 218,225 **** include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx); - $blockcptemplate->pparse('body'); - include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 218,222 ---- Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_mx_meta.php 17 Jun 2006 20:09:05 -0000 1.15 --- admin_mx_meta.php 27 Jun 2006 07:52:02 -0000 1.16 *************** *** 41,47 **** if( $mx_request_vars->is_post('submit') ) { // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). // MX_TYPE_NO_STRIP: Because we need quoted slashes to dynamically build the mx_meta.inc as valid PHP code. ! $title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); --- 41,48 ---- if( $mx_request_vars->is_post('submit') ) { + // // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). // MX_TYPE_NO_STRIP: Because we need quoted slashes to dynamically build the mx_meta.inc as valid PHP code. ! // $title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); *************** *** 56,60 **** --- 57,63 ---- $icon = $mx_request_vars->post('icon', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); + // // Note we need to allow HTML Tags for the Extra Meta Settings!!! + // $header = $mx_request_vars->post('header', (MX_TYPE_NO_STRIP), ''); *************** *** 74,82 **** $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! // Write out the config file. ! @umask(0111); $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); // check if the file was writable if( !$fp ) { --- 77,89 ---- $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! + // // Write out the config file. ! // @umask(0111); $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); + + // // check if the file was writable + // if( !$fp ) { *************** *** 86,95 **** @fclose($fp); // display a message that the meta file has been updated $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">') ! ); ! $message = sprintf($lang['Meta_data_updated'], '<a href="' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } --- 93,104 ---- @fclose($fp); + // // display a message that the meta file has been updated + // $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">' ! )); + $message = sprintf($lang['Meta_data_updated'], '<a href="' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } |
