Menu
▾
▴
[mxbb-commits] core27x/admin admin_mx_block.php,1.1,1.2 admin_mx_chkobjs.php,1.1,1.2 admin_mx_gen_cache.php,1.2,1.3 admin_mx_meta.php,1.1,1.2 admin_mx_module.php,1.1,1.2 admin_mx_page.php,1.1,1.2 admin_mx_page_setting.php,1.1,1.2 admin_mx_phpinfo.php,1.1,1.2 admin_mx_portal.php,1.1,1.2 page_footer_admin.php,1.2,1.3 page_header_admin.php,1.1,1.2
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:37
|
Update of /cvsroot/mxbb/core27x/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/admin Modified Files: admin_mx_block.php admin_mx_chkobjs.php admin_mx_gen_cache.php admin_mx_meta.php admin_mx_module.php admin_mx_page.php admin_mx_page_setting.php admin_mx_phpinfo.php admin_mx_portal.php page_footer_admin.php page_header_admin.php Log Message: updated Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_phpinfo.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_phpinfo.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_phpinfo.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 19,36 **** */ ! if ( !empty($setmodules) ) { - $file = basename(__FILE__); $module['Portal - System']['phpInfo'] = 'admin/' . $file; return; } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); // --- 19,36 ---- */ ! if( !empty($setmodules) ) { $module['Portal - System']['phpInfo'] = 'admin/' . $file; return; } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); ! // Index: admin_mx_page.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_page.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_page.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_page.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 29,39 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); // --- 29,39 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); // *************** *** 116,119 **** --- 116,121 ---- } $template->assign_vars(array( + 'L_TITLE' => $lang['Page_admin'], + 'L_EXPLAIN' => $lang['Page_admin_explain'], 'S_ACTION' => append_sid( PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=add"), 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ) , Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_chkobjs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_chkobjs.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_chkobjs.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 24,29 **** // ====================================================== - $no_page_header = TRUE; - if( !empty($setmodules) ) { --- 24,27 ---- *************** *** 32,42 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); --- 30,41 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! $no_page_header = TRUE; ! require('./pagestart.' . $phpEx); *************** *** 170,174 **** case 'db_delete': $sql = "DELETE FROM ".$table." WHERE $key0 = $val0 AND $key1 = $val1"; ! if( !dbQuery($sql) ) { message_die(GENERAL_ERROR, "Couldn't DELETE data from table : " . $table, --- 169,173 ---- case 'db_delete': $sql = "DELETE FROM ".$table." WHERE $key0 = $val0 AND $key1 = $val1"; ! if( !chkobjs_dbQuery($sql) ) { message_die(GENERAL_ERROR, "Couldn't DELETE data from table : " . $table, *************** *** 260,264 **** else { ! if( !($field_value = dbFetchField($ftab[$i], $field.'='.$row[$field], $fnam[$i])) ) { $field_key = '<font color=red><b>'.$row[$field].'</b></font>'; --- 259,263 ---- else { ! if( !($field_value = chkobjs_dbFetchField($ftab[$i], $field.'='.$row[$field], $fnam[$i])) ) { $field_key = '<font color=red><b>'.$row[$field].'</b></font>'; *************** *** 303,315 **** // DB Utilities // ! function dbFetchField($tbname, $where, $field) { $sql = "SELECT * FROM ".$tbname." WHERE ".$where; ! if( !($row = dbFetchRow($sql)) ) return false; return $row[$field]; } ! function dbFetchRow($sql) { global $db; --- 302,314 ---- // DB Utilities // ! function chkobjs_dbFetchField($tbname, $where, $field) { $sql = "SELECT * FROM ".$tbname." WHERE ".$where; ! if( !($row = chkobjs_dbFetchRow($sql)) ) return false; return $row[$field]; } ! function chkobjs_dbFetchRow($sql) { global $db; *************** *** 321,325 **** } ! function dbQuery($sql) { global $db; --- 320,324 ---- } ! function chkobjs_dbQuery($sql) { global $db; Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_gen_cache.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_gen_cache.php 26 May 2005 21:54:08 -0000 1.2 --- admin_mx_gen_cache.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 10,13 **** --- 10,15 ---- * ***************************************************************************/ + $no_page_header = TRUE; + if( !empty($setmodules) ) { Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_meta.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_meta.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_meta.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 20,26 **** */ ! $no_page_header = true; ! ! if ( !empty($setmodules) ) { $module['Portal - System']['Meta Tag'] = 'admin/' . basename(__FILE__); --- 20,24 ---- */ ! if( !empty($setmodules) ) { $module['Portal - System']['Meta Tag'] = 'admin/' . basename(__FILE__); *************** *** 28,38 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); --- 26,37 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! $no_page_header = TRUE; ! require('./pagestart.' . $phpEx); *************** *** 40,44 **** // Load language file. // ! if ( @file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx) ) { include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx); --- 39,43 ---- // Load language file. // ! if( @file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx) ) { include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx); *************** *** 53,57 **** // Main procedure // ! if ( $mx_request_vars->is_post('submit') ) { // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). --- 52,56 ---- // Main procedure // ! if( $mx_request_vars->is_post('submit') ) { // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). *************** *** 69,72 **** --- 68,73 ---- $pragma = $mx_request_vars->post('pragma', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $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), ''); *************** *** 91,95 **** $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); // check if the file was writable ! if ( !$fp ) { mx_message_die(GENERAL_ERROR, $lang['Meta_data_ioerror']); --- 92,96 ---- $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); // check if the file was writable ! if( !$fp ) { mx_message_die(GENERAL_ERROR, $lang['Meta_data_ioerror']); *************** *** 168,172 **** { $selected = ( $key == $default ) ? ' selected="selected"' : ''; ! $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; } $select .= '</select>'; --- 169,173 ---- { $selected = ( $key == $default ) ? ' selected="selected"' : ''; ! $select .= '<option value="' . $key . '"' . $selected . '>' . $value . "</option>\n"; } $select .= '</select>'; Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_module.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_module.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_module.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 18,27 **** } ! define('IN_PORTAL', 1); ! $mx_root_path = '../'; // Pak file delimiter $delimeter = '=+:'; ! // Security and page header ! require('./pagestart.php'); // Check to see what mode we should operate in. --- 18,32 ---- } ! // Pak file delimiter $delimeter = '=+:'; ! ! // ! // Security and Page header ! // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); // Check to see what mode we should operate in. Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/page_header_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header_admin.php 6 May 2005 06:47:56 -0000 1.1 --- page_header_admin.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * page_header_admin.php ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ if ( !defined('IN_PORTAL') ) --- 1,25 ---- <?php ! /** ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal ! * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System ! * email : jon...@ho... ! * project site : www.mx-system.com ! * ! * description : ! * ------------------------------------------------------------------------- ! * $Id$ ! */ ! /** ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! */ ! ! // ================================================================================ ! // The following code is based on admin/page_header_admin.php (phpBB 2.0.14) ! // ================================================================================ if ( !defined('IN_PORTAL') ) *************** *** 31,35 **** NOTE: ! The following code related to GZIP initialization has been temporaly moved to the new mx_session_start() function, declared in mx_functions.php --- 33,37 ---- NOTE: ! The following code related to GZIP initialization has been moved to the new mx_session_start() function, declared in mx_functions.php *************** *** 47,52 **** { if ( extension_loaded('zlib') ) ! { ! ob_end_clean(); ob_start('ob_gzhandler'); } --- 49,54 ---- { if ( extension_loaded('zlib') ) ! { ! @ob_end_clean(); ob_start('ob_gzhandler'); } *************** *** 84,93 **** $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! 'PAGE_TITLE' => $page_title, ! 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), 'L_FAQ' => $lang['FAQ'], - 'L_MX_ADMIN' => 'MX-System Portal Administration', 'U_INDEX' => append_sid('../index.'.$phpEx), --- 86,94 ---- $template->assign_vars(array( 'SITENAME' => $board_config['sitename'], ! // 'PAGE_TITLE' => $page_title, ! 'L_ADMIN' => $lang['Admin'], 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), 'L_FAQ' => $lang['FAQ'], 'U_INDEX' => append_sid('../index.'.$phpEx), *************** *** 95,107 **** 'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx), 'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx), ! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => $lang['ENCODING'], ! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'], 'T_BODY_BACKGROUND' => $theme['body_background'], --- 96,110 ---- 'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx), 'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx), ! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => $lang['ENCODING'], ! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! // MX ADDON ! 'L_MX_ADMIN' => $lang['mxBB_adminCP'], 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! // END 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'], 'T_BODY_BACKGROUND' => $theme['body_background'], Index: admin_mx_block.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_block.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_block.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_block.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 29,39 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); --- 29,39 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); Index: admin_mx_page_setting.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_page_setting.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_page_setting.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_page_setting.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 29,39 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; - // ! // Security and page header // ! require('./pagestart.php'); // --- 29,39 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); // Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/page_footer_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_footer_admin.php 30 Nov 2005 23:50:44 -0000 1.2 --- page_footer_admin.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,23 **** <?php ! /*************************************************************************** ! * page_footer_admin.php ! * ------------------- ! * begin : Saturday, Jul 14, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * ! * $Id$ ! * ! * ! ***************************************************************************/ ! /*************************************************************************** ! * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! * ! ***************************************************************************/ if ( !defined('IN_PHPBB') ) --- 1,25 ---- <?php ! /** ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal ! * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System ! * email : jon...@ho... ! * project site : www.mx-system.com ! * ! * description : ! * ------------------------------------------------------------------------- ! * $Id$ ! */ ! /** ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU General Public License as published by ! * the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. ! */ ! ! // ================================================================================ ! // The following code is based on admin/page_footer_admin.php (phpBB 2.0.14) ! // ================================================================================ if ( !defined('IN_PHPBB') ) *************** *** 35,42 **** ); $template->assign_vars(array( 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $portal_config['portal_version'] : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : '')) ); --- 37,53 ---- ); + // + // Generate stats + // + $endtime = explode(' ', microtime()); + $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime; + + $execution_stats = '<div align="center"><span class="copyright">' . sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4)) . '</span></div>'; + $template->assign_vars(array( 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $portal_config['portal_version'] : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), ! 'EXECUTION_STATS' => $execution_stats) ); *************** *** 53,57 **** // if( $do_gzip_compress ) ! { // // Borrowed from php.net! --- 64,68 ---- // if( $do_gzip_compress ) ! { // // Borrowed from php.net! Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_portal.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_portal.php 6 May 2005 06:47:56 -0000 1.1 --- admin_mx_portal.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 28,37 **** } - define('IN_PORTAL', 1); - $mx_root_path = '../'; // ! // Security and page header // ! require('./pagestart.php'); // --- 28,38 ---- } // ! // Security and Page header // ! define('IN_PORTAL', 1); ! $mx_root_path = './../'; ! require($mx_root_path . 'extension.inc'); ! require('./pagestart.' . $phpEx); // |
