Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:27
|
Update of /cvsroot/mxbb/core27x/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/core27x/includes Modified Files: mx_auth.php mx_cache.php mx_constants.php mx_functions.php mx_functions_phpbb.php Added Files: mx_functions_admincp.php Log Message: Updated - more is backported - some is fixed Index: mx_cache.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_cache.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_cache.php 5 Dec 2005 19:25:26 -0000 1.2 --- mx_cache.php 5 Dec 2005 22:25:12 -0000 1.3 *************** *** 271,276 **** $sql = "SELECT blk.*, mdl.module_path, ! fnc.function_file, ! fnc.function_admin FROM " . BLOCK_TABLE . " blk, " . FUNCTION_TABLE . " fnc, --- 271,276 ---- $sql = "SELECT blk.*, mdl.module_path, ! fnc.function_file, fnc.function_id, fnc.function_admin ! FROM " . BLOCK_TABLE . " blk, " . FUNCTION_TABLE . " fnc, *************** *** 290,293 **** --- 290,295 ---- while ( $row = $db->sql_fetchrow( $result ) ) { + $block_id = $row['block_id']; + $block_row = array( "block_id" => $row['block_id'], *************** *** 306,310 **** "module_root_path" => $row['module_path'], "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'] ); --- 308,313 ---- "module_root_path" => $row['module_path'], "block_file" => $row['function_file'], ! "block_edit_file" => $row['function_admin'], ! "function_id" => $row['function_id'] ); *************** *** 316,326 **** // Generate block parameter data $sql = "SELECT blk.*, ! sys.parameter_id, ! par.parameter_name, ! sys.parameter_value, ! sys.bbcode_uid, mdl.module_path, ! fnc.function_file, ! fnc.function_admin FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, " . PARAMETER_TABLE . " par, --- 319,327 ---- // Generate block parameter data $sql = "SELECT blk.*, ! sys.parameter_id, sys.parameter_value, sys.bbcode_uid, ! par.parameter_name, par.parameter_type, par.parameter_function, par.parameter_default, mdl.module_path, ! fnc.function_file, fnc.function_admin ! FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, " . PARAMETER_TABLE . " par, *************** *** 371,376 **** --- 372,381 ---- $param_row = array( "parameter_id" => $row['parameter_id'], + "function_id" => $row['function_id'], "parameter_name" => $row['parameter_name'], + "parameter_type" => $row['parameter_type'], "parameter_value" => $row['parameter_value'], + "parameter_default" => $row['parameter_default'], + "parameter_function" => $row['parameter_function'], "bbcode_uid" => $row['bbcode_uid'] ); *************** *** 583,597 **** // var $show_stats = true; ! var $auth_view = ''; ! var $auth_view_group = ''; ! var $auth_edit = ''; ! var $auth_edit_group = ''; ! ! // var $block_time = ''; ! // var $editor_id = ''; var $module_root_path = ''; var $block_file = ''; var $block_edit_file = ''; // var $dynamic_block_id = ''; --- 588,599 ---- // var $show_stats = true; ! var $auth_view = false; ! var $auth_edit = false; ! var $auth_mod = false; var $module_root_path = ''; var $block_file = ''; var $block_edit_file = ''; + var $function_id = ''; // var $dynamic_block_id = ''; *************** *** 622,625 **** --- 624,630 ---- global $userdata; + // $this->block_info = $this->block_config[$block_id]['block_info']; + // $this->block_parameters = $this->block_config[$block_id]['block_parameters']; + $this->block_id = $this->block_config[$block_id]['block_id']; $this->block_title = $this->block_config[$block_id]['block_title']; *************** *** 645,648 **** --- 650,654 ---- $this->block_file = $this->block_config[$block_id]['block_file']; $this->block_edit_file = $this->block_config[$block_id]['block_edit_file']; + $this->function_id = $this->block_info['function_id']; // $this->is_dynamic = $unset ? false : $this->_is_dynamic( $block_id ); *************** *** 694,700 **** var $total_block = ''; ! var $auth_view = ''; ! var $auth_view_group = ''; ! // ------------------------------ // Properties --- 700,705 ---- var $total_block = ''; ! var $auth_view = false; ! // ------------------------------ // Properties *************** *** 741,745 **** } ! function drop( $page_id ) { global $mx_cache; --- 746,750 ---- } ! function kill_me( $page_id ) { global $mx_cache; Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_constants.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_constants.php 5 Dec 2005 19:25:26 -0000 1.3 --- mx_constants.php 5 Dec 2005 22:25:12 -0000 1.4 *************** *** 24,51 **** } ! ! // Page numbers for session handling ! define('PAGE_FORUM' , -20); ! define('PAGE_ADS' , -21); ! define('PAGE_WELCOME' , -23); ! define('PAGE_LAST_MSG' , -24); ! define('PAGE_WELCOME_ADMIN' , -25); ! define('PAGE_POLL' , -26); ! define('PAGE_URL' , -27); ! define('PAGE_NEWS' , -37); ! define('PAGE_MENU_NAV' , -29); ! ! define('PAGE_MENU_ADMIN' , -31); ! define('PAGE_MODULE_ADMIN' , -32); ! define('PAGE_PORTAL_ADMIN' , -33); ! define('PAGE_META_ADMIN' , -34); ! define('PAGE_ADS_ADMIN' , -35); ! define('PAGE_ANNOUNCEMENT' , -36); ! define('PAGE_ANNOUNCEMENT_ADMIN' , -35); ! ! // Table names ! ! define('PORTAL_TABLE', $mx_table_prefix.'portal'); define('MENU_NAV_TABLE', $mx_table_prefix.'menu_nav'); --- 24,30 ---- } ! // // Table names ! // define('PORTAL_TABLE', $mx_table_prefix.'portal'); define('MENU_NAV_TABLE', $mx_table_prefix.'menu_nav'); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_functions_phpbb.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_phpbb.php 5 Dec 2005 19:25:26 -0000 1.2 --- mx_functions_phpbb.php 5 Dec 2005 22:25:12 -0000 1.3 *************** *** 445,448 **** --- 445,462 ---- } + // + // Fix for correcting possible "bad" links to phpBB + // + if (!(strpos($msg_text, 'href') === false)) + { + $msg_text = str_replace('<a href="index', '<a href="'.$phpbb_root_path.'index', $msg_text); + $msg_text = str_replace('<a href="viewforum', '<a href="'.$phpbb_root_path.'viewforum', $msg_text); + $msg_text = str_replace('<a href="viewtopic', '<a href="'.$phpbb_root_path.'viewtopic', $msg_text); + $msg_text = str_replace('<a href="modcp', '<a href="'.$phpbb_root_path.'modcp', $msg_text); + $msg_text = str_replace('<a href="groupcp', '<a href="'.$phpbb_root_path.'groupcp', $msg_text); + $msg_text = str_replace('<a href="posting', '<a href="'.$phpbb_root_path.'posting', $msg_text); + + } + $template->assign_vars(array( 'MESSAGE_TITLE' => $msg_title, *************** *** 553,557 **** // Prevent from reading pages information more than once. // ! if( $pages_data === false ) { $sql = "SELECT page_id, page_name FROM " . PAGE_TABLE . " ORDER BY page_id"; --- 567,571 ---- // Prevent from reading pages information more than once. // ! if( $mx_pages_data === false ) { $sql = "SELECT page_id, page_name FROM " . PAGE_TABLE . " ORDER BY page_id"; Index: mx_auth.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_auth.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_auth.php 5 Dec 2005 19:25:26 -0000 1.2 --- mx_auth.php 5 Dec 2005 22:25:12 -0000 1.3 *************** *** 26,30 **** * - menu_auth * - get_auth_forum ! * - mx_auth_group * - mx_get_groups */ --- 26,30 ---- * - menu_auth * - get_auth_forum ! * - mx_is_group_member (old mx_auth_group) * - mx_get_groups */ --- NEW FILE: mx_functions_admincp.php --- <?php /** ------------------------------------------------------------------------ * Subject : mxBB - a fully modular portal and CMS (for phpBB) * Author : Jon Ohlsson and the mxBB Team * Credits : The phpBB Group & Marc Morisette * Copyright : (C) 2002-2005 mxBB Portal * Email : jo...@mx... * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- * * $Id: mx_functions_admincp.php,v 1.1 2005/12/05 22:25:12 jonohlsson Exp $ */ /** * 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. */ [...3102 lines suppressed...] $message = "<b>This is the result list of the SQL queries needed for the install/upgrade</b><br /><br />"; while ( $sql[$n] ) { if ( !$result = $db->sql_query( $sql[$n] ) ) { $message .= '<b><font color=#FF0000>[Error or Already added]</font></b> line: ' . ( $n + 1 ) . ' , ' . $sql[$n] . '<br />'; $inst_error = true; } else { $message .= '<b><font color=#0000fF>[Added/Updated]</font></b> line: ' . ( $n + 1 ) . ' , ' . $sql[$n] . '<br />'; } $n++; } $message .= '<br /> If you get some Errors, Already Added or Updated messages, relax, this is normal when updating modules'; return $message; } ?> Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions.php 5 Dec 2005 19:25:26 -0000 1.3 --- mx_functions.php 5 Dec 2005 22:25:12 -0000 1.4 *************** *** 145,149 **** function get_list_static($name_select, $row, $id) { ! $rows_count = ( count($row) < '25' ) ? count($row) : '25'; $column_list = '<select name="' . $name_select . '" size="' . $rows_count . '">'; --- 145,149 ---- function get_list_static($name_select, $row, $id) { ! $rows_count = ( count($row) < '7' ) ? count($row) : '7'; $column_list = '<select name="' . $name_select . '" size="' . $rows_count . '">'; |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:27
|
Update of /cvsroot/mxbb/core27x/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/core27x/language/lang_english Modified Files: lang_admin.php Log Message: Updated - more is backported - some is fixed Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/language/lang_english/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 6 May 2005 06:48:06 -0000 1.1 --- lang_admin.php 5 Dec 2005 22:25:12 -0000 1.2 *************** *** 22,25 **** --- 22,64 ---- // + // Left AdminCP Panel + // + $lang['1_General_admin'] = "General"; + $lang['1_1_Management'] = "Configuration"; + + $lang['2_CP'] = "Management"; + $lang['2_1_Modules'] = "Modules Setup<br /><hr>"; + $lang['2_2_FunctionCP'] = "Functions Control Panel"; + $lang['2_3_BlockCP'] = "Block Control Panel"; + $lang['2_4_PageCP'] = "Page Control Panel"; + $lang['2_5_PageCP_settings'] = "Page Settings"; + + $lang['4_Panel_system'] = "System Tools"; + $lang['4_1_Cache'] = "Regenerate Cache"; + $lang['4_1_Integrity'] = "Integrity Checker"; + $lang['4_1_Meta'] = "META tags"; + $lang['4_1_PHPinfo'] = "PHPInfo()"; + + // + // General + // + $lang['AdminCP_status'] = "<b>Progress report</b>"; + $lang['AdminCP_action'] = "<b>DB Action</b>"; + $lang['Invalid_action'] = "Error"; + $lang['was_installed'] = "was installed"; + $lang['was_uninstalled'] = "was uninstalled"; + $lang['was_upgraded'] = "was upgraded"; + $lang['was_exported'] = "was exported"; + $lang['was_deleted'] = "was deleted"; + $lang['was_removed'] = "was removed"; + $lang['was_inserted'] = "was inserted"; + $lang['was_updated'] = "was updated"; + $lang['was_added'] = "was added"; + $lang['was_moved'] = "was moved"; + $lang['was_synced'] = "was synced"; + + $lang['error_no_field'] = "There's a missing field. Please fill out all the needed fields..."; + + // // Configuration // *************** *** 69,86 **** $lang['Module'] = "Module"; - $lang['Module_admin'] = "Module Administration"; - $lang['Module_admin_explain'] = "Use this form to customize modules"; $lang['Column_delete'] = "Delete a Column"; - $lang['Module_delete'] = "Delete a Module"; - $lang['Module_delete_explain'] = "Use this form to delete a Module (or function)"; - $lang['Edit_module'] = "Edit a module"; - $lang['Create_module'] = "Add new Module"; - $lang['Module_Config_updated'] = "Module Configuration Updated Successfully"; - $lang['Module_updated'] = "Module information updated successfully"; - $lang['Click_return_module_admin'] = "Click %sHere%s to return to Module Administration"; $lang['Column_name'] = "Column Name"; - $lang['Module_name'] = "Module Name"; - $lang['Module_desc'] = "Description"; - $lang['Module_path'] = "Path"; $lang['Create_column'] = "Add new column"; $lang['Column'] = "Column"; --- 108,113 ---- *************** *** 95,99 **** $lang['Menu_Navigation'] = "Navigation Menu"; - $lang['Modules'] = "Modules"; $lang['Portal_index'] = "Portal Index"; $lang['Poll_Display'] = "Which Poll do you want to display?"; --- 122,125 ---- *************** *** 154,164 **** $lang['Parameter_type'] = "Type"; $lang['Parameter_default'] = "Default value"; - $lang['import_module_pack'] = "Install Module"; - $lang['import_module_pack_explain'] = "This will add a module to the portal. Be sure the module package is uploaded to the /modules folder...and use the latest module version!"; - $lang['upgrade_module_pack'] = "Upgrade Module"; - $lang['upgrade_module_pack_explain'] = "This will upgrade your module. Be sure to read the module doc before proceeding, or you may risk module data loss."; - $lang['export_module_pack'] = "Export Module"; - $lang['Export_Module'] = "Select a module:"; - $lang['export_module_pack_explain'] = "This will export a module *.pak file. Only intended for module writers..."; $lang['Not_Specified'] = "Not Specified"; $lang['Page'] = "Page"; --- 180,183 ---- *************** *** 166,170 **** $lang['Block_admin'] = "Block Administration"; $lang['Block_admin_explain'] = "Use this form to add, delete and change the settings for each block."; - $lang['Module_include_admin'] = "Include this module in Admin Menu Navigation"; $lang['Translation_Tools'] = "Translation Tools"; $lang['Create_parameter'] = "Add new Parameter"; --- 185,188 ---- *************** *** 179,186 **** $lang['Click_return_page_admin'] = "Click %sHere%s to return to Page Administration"; - $lang['Module_delete_db'] = "Now the module is uninstalled from the portal, but the specific module db tables still exist. Do you also want to permanently delete any related module tables. Warning: you will then lose all data. This should never be done if you plan to upgrade or reinstall the module."; - $lang['Click_module_delete_db_yes'] = "Click %sHere%s to permanently delete all module tables from db"; - - // // Install Process --- 197,200 ---- *************** *** 278,286 **** // New for v. 2.71 - $lang['Error_no_db_install'] = "Error: The file db_install.php doesn't exist. Please verify this and try again..."; - $lang['Error_no_db_uninstall'] = "Error: The file db_uninstall.php doesn't exist or the uninstall feature is not supported for this module. Please verify this and try again..."; - $lang['Error_no_db_upgrade'] = "Error: The file db_upgrade.php doesn't exist or the upgrade feature is not supported for this module. Please verify this and try again..."; - $lang['Error_module_installed'] = "Error: This module is already installed! Please either first delete module or upgrade module instead."; - $lang['Menu_links'] = "Menu URL <br /> - link to external page"; $lang['Menu_page'] = "Menu Page (default/standard) <br /> - link to internal portal page <br /> NOTE: Pages are created using Page Administration."; --- 292,295 ---- *************** *** 301,304 **** --- 310,358 ---- $lang['Return_to_page'] = "Return to Portal Page"; + // New and/or updated for 2.7.7 + + // + // Module Management + // + $lang['Module_admin'] = "Module Administration"; + $lang['Module_admin_explain'] = "Use this form to manage modules: installation, upgrading and module development.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>"; + $lang['Modulecp_admin'] = "Module Control Panel"; + $lang['Modulecp_admin_explain'] = "Use this form to manage modules: block functions (parameters) and portal blocks.<br /><b>To use this panel, you need to have JavaScript and cookies enabled in your browser!</b>"; + $lang['Modules'] = "Modules"; + $lang['Module'] = "Module"; + $lang['Module_delete'] = "Delete a Module"; + $lang['Module_delete_explain'] = "Use this form to delete a Module (or block function)"; + $lang['Edit_module'] = "Edit a Module"; + $lang['Create_module'] = "Create new Module"; + $lang['Module_name'] = "Module Name"; + $lang['Module_desc'] = "Description"; + $lang['Module_path'] = "Path, eg 'modules/mx_textblocks/'"; + $lang['Module_include_admin'] = "Include this module in left pane Admin Menu Navigation"; + + // + // Module Installation + // + $lang['Module_delete_db'] = "Do you really want to uninstall the Module? Warning: You will lose all module data. Consider upgrading instead..."; + $lang['Click_module_delete_yes'] = "Click %sHere%s to uninstall the module"; + $lang['Click_module_upgrade_yes'] = "Click %sHere%s to upgrade the module"; + $lang['Click_module_export_yes'] = "Click %sHere%s to export the module"; + $lang['Error_no_db_install'] = "Error: The file db_install.php does not exist. Please verify this and try again..."; + $lang['Error_no_db_uninstall'] = "Error: The file db_uninstall.php does not exist, or the uninstall feature is not supported for this module. Please verify this and try again..."; + $lang['Error_no_db_upgrade'] = "Error: The file db_upgrade.php does not exist, or the upgrade feature is not supported for this module. Please verify this and try again..."; + $lang['Error_module_installed'] = "Error: This module is already installed! Please either first delete the module, or upgrade the module instead."; + $lang['Uninstall_module'] = "Uninstall Module"; + $lang['import_module_pack'] = "Install Module"; + $lang['import_module_pack_explain'] = "This will add a module to the portal. Be sure the Module Package is uploaded to the /modules folder. Remember to use the latest Module version!"; + $lang['upgrade_module_pack'] = "Upgrade Module"; + $lang['upgrade_module_pack_explain']= "This will upgrade your module. Be sure to read the Module Documentation before proceeding, or you may risk module data loss."; + $lang['export_module_pack'] = "Export Module"; + $lang['Export_Module'] = "Select a Module:"; + $lang['export_module_pack_explain'] = "This will export a module *.pak file. This is only intended for module writers..."; + $lang['Module_Config_updated'] = "Module Configuration Updated Successfully"; + $lang['Click_return_module_admin'] = "Click %sHere%s to return to Module Administration"; + $lang['Module_updated'] = "Module Information Updated successfully"; + + $lang['Generate_mx_cache'] = "Generate Block Cache"; + // // That's all Folks! |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:25
|
Update of /cvsroot/mxbb/core27x/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/core27x/templates/subSilver/admin Modified Files: index_body.tpl index_frameset.tpl index_navigate.tpl mx_module_admin_body.tpl Added Files: mx_modulecp_admin_body.tpl Log Message: Updated - more is backported - some is fixed --- NEW FILE: mx_modulecp_admin_body.tpl --- <script type="text/javascript"> function getCookie(name) { var cookies = document.cookie; var start = cookies.indexOf(name + '='); if( start < 0 ) return null; var len = start + name.length + 1; var end = cookies.indexOf(';', len); if( end < 0 ) end = cookies.length; return unescape(cookies.substring(len, end)); } function setCookie(name, value, expires, path, domain, secure) { document.cookie = name + '=' + escape (value) + ((expires) ? '; expires=' + ( (expires == 'never') ? 'Thu, 31-Dec-2099 23:59:59 GMT' : expires.toGMTString() ) : '') + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : '') + ((secure) ? '; secure' : ''); } function delCookie(name, path, domain) { if( getCookie(name) ) { document.cookie = name + '=;expires=Thu, 01-Jan-1970 00:00:01 GMT' + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : ''); } } function menuCat(id, mode, visible) { this.cat_id = id; this.menu_mode = mode; this.status = visible != '' ? visible : 'none'; } var menuCats = new Array(); <!-- BEGIN module --> menuCats['adminModule_{module.MODULE_ID}'] = new menuCat('{module.MODULE_ID}', 'adminModule_', '{module.VISIBLE}'); menuCats['adminModuleUpgrade_{module.MODULE_ID}'] = new menuCat('{module.MODULE_ID}', 'adminModuleUpgrade_', '{module.VISIBLE_UPGRADE}'); menuCats['adminModuleExport_{module.MODULE_ID}'] = new menuCat('{module.MODULE_ID}', 'adminModuleExport_', '{module.VISIBLE_EXPORT}'); menuCats['adminModuleDelete_{module.MODULE_ID}'] = new menuCat('{module.MODULE_ID}', 'adminModuleDelete_', '{module.VISIBLE_DELETE}'); <!-- END module --> function getObj(obj) { return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); } function displayObj(obj, status) { var x = getObj(obj); if( x && x.style ) x.style.display = status; } var queueInterval = 0; // milliseconds between queued steps. var execInterval = 0; var queuedSteps; var currentStep; function queueStep(o, s) { this.obj = o; this.status = s; } function execQueue() { if( currentStep < queuedSteps.length ) { var obj = queuedSteps[currentStep].obj; var status = queuedSteps[currentStep].status; displayObj(obj, status); if( menuCats[obj] ) menuCats[obj].status = status; currentStep++; setTimeout("execQueue();", execInterval); } else { execInterval = queueInterval; } } function onMenuCatClick(cat_id, type, init) { var currentCat, currentStatus; var imageSCR = type+'image_'+cat_id; var strSubmitContent = ''; parentCatMode = 'adminModule_'; parentCat = parentCatMode + cat_id; currentCat = type + cat_id; currentStatus = menuCats[currentCat].status; queuedSteps = new Array(); cookieArray = new Array(); currentStep = 0; for( var forCat in menuCats ) { if( (init == 'true' && (menuCats[forCat].status == 'block') && menuCats[forCat].menu_mode == parentCatMode) || (init != 'true' && ( (menuCats[forCat].status == 'block') ))) { queuedSteps[currentStep++] = new queueStep(forCat, 'none'); menuCats[forCat].status = 'none'; forCatimage = menuCats[forCat].menu_mode+'image_'+menuCats[forCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_EXPAND}'; } } } if( currentStatus == 'none' ) { queuedSteps[currentStep++] = new queueStep(currentCat, 'block'); menuCats[currentCat].status = 'block'; if (currentCat == parentCat) { var expdate = new Date(); // 72 Hours from now expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); setCookie('{COOKIE_NAME}_'+type+'module_id', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); } if( document.images && document.images[imageSCR] ) { document.images[imageSCR].src = '{IMG_URL_CONTRACT}'; } } else { delCookie('{COOKIE_NAME}_'+type+'module_id', ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); } for( var forCat in menuCats ) { if ( menuCats[forCat].status == 'block' ) { strSubmitContent += forCat + ','; } } // Remove trailing separator strSubmitContent = strSubmitContent.substr(0, strSubmitContent.length - 1); setCookie('{COOKIE_NAME}_admincp_blockstates', strSubmitContent, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); currentStep = 0; setTimeout("execQueue();", execInterval); } function doOnLoadMenuACP() { var cat_id; if( getObj('adminModule_' + '{NAV_MODULE_ID}') ) { if ( '{NAV_MODULE_ID}' > 0 ) { cat_id = '{NAV_MODULE_ID}'; } else { cat_id = getCookie('{COOKIE_NAME}_adminModule_module_id'); } if( menuCats['adminModule_'+cat_id] ) { menuCats['adminModule_'+cat_id].status = 'none'; onMenuCatClick(cat_id, 'adminModule_', 'true'); } } if( oldOnLoadMenuACP ) { oldOnLoadMenuACP(); } } var oldOnLoadMenuACP = window.onload; window.onload = doOnLoadMenuACP; // --> </script> <h1>{L_TITLE}</h1> <p>{L_EXPLAIN}</p> <form method="post" name="jumpbox" action="{S_ACTION}"> <table cellspacing="0" cellpadding="0" border="0" width="100%"> <tr> <td nowrap="nowrap" align="right"><span class="gensmall"><b>{L_QUICK_NAV}</b> {MODULE_SELECT_BOX} <input type="submit" value="{S_SUBMIT}" class="liteoption" /></span> </td> </tr> </table> </form> <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td align="center" colspan="5">{RESULT_MESSAGE}</td> </tr> <tr> <th class="thHead" colspan="5">{L_TITLE}</th> </tr> <tr> <td class="catBottom" colspan="5" align="center"> <form action="{S_ACTION}" method="post"> {S_MODULE_INSTALL_LIST}{S_HIDDEN_MODULE_INSTALL_FIELDS}<input class="mainoption" type="submit" name="import_pack" value="{L_IMPORT_PACK}"> </form> </td> </tr> <!-- BEGIN module --> <tr title="{L_TITLE}"> <td width="40%" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModule_');"> <span class="cattitle"><img name="adminModule_image_{module.MODULE_ID}" src="{module.IMG_URL}" border="0" align="absmiddle"> <img src="{IMG_ICON_MODULE}" border="0" align="absmiddle"> {module.MODULE_TITLE}</span> <span class="gensmall">{module.MODULE_DESCRIPTION}</span><br /> <span class="gensmall"><i>{module.MODULE_VERSION}</i></span></td> <td width="15%" class="cat" align="center" valign="middle"> <!-- BEGIN settings --> <!-- <img src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <span class="cattitle"><a href="{module.U_MODULE}">{L_SETTING}</a></span> --> <!-- END settings --> </td> <td width="15%" class="cat" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleUpgrade_');"> <!-- BEGIN settings --> <img name="adminModuleUpgrade_image_{module.MODULE_ID}" src="{module.IMG_URL_UPGRADE}" border="0" align="absmiddle"> <span class="genmed">{L_UPGRADE_PACK}</span> <!-- END settings --> </td> <td width="15%" class="cat" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleExport_');"> <!-- BEGIN settings --> <img name="adminModuleExport_image_{module.MODULE_ID}" src="{module.IMG_URL_EXPORT}" border="0" align="absmiddle"> <span class="genmed">{L_EXPORT_PACK}</span> <!-- END settings --> </td> <td width="15%" class="catRight" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleDelete_');"> <!-- BEGIN settings --> <img name="adminModuleDelete_image_{module.MODULE_ID}" src="{module.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="genmed">{L_UNINSTALL}</span> <!-- END settings --> </td> </tr> <!-- Module Delete --> <tr> <td colspan="5" class="row1"> <div id="adminModuleDelete_{module.MODULE_ID}" style="display:{module.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleDelete_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_UNINSTALL}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Module Delete --> <!-- Module Upgrade --> <tr> <td colspan="5" class="row1"> <div id="adminModuleUpgrade_{module.MODULE_ID}" style="display:{module.VISIBLE_UPGRADE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleUpgrade_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_UPGRADE_PACK}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.MESSAGE_UPGRADE}</td> </tr> </table> </div> </td> </tr> <!-- Module Upgrade --> <!-- Module Export --> <tr> <td colspan="5" class="row1"> <div id="adminModuleExport_{module.MODULE_ID}" style="display:{module.VISIBLE_EXPORT};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModuleExport_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_EXPORT_PACK}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.MESSAGE_EXPORT}</td> </tr> </table> </div> </td> </tr> <!-- Module Export --> <!-- Module Settings --> <tr> <td colspan="5" class="row1"> <div id="adminModule_{module.MODULE_ID}" style="display:{module.VISIBLE};" class="genmed"> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModule_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.L_TITLE}</span></td> </tr> <tr> <td width="50%" align="right" >{L_MODULE_NAME}</td> <td ><input type="text" size="50" name="module_name" value="{module.E_MODULE_NAME}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{L_MODULE_DESC}</td> <td ><input type="text" size="50" name="module_desc" value="{module.E_MODULE_DESC}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{L_MODULE_PATH}</td> <td ><input type="text" size="50" name="module_path" value="{module.E_MODULE_PATH}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{L_MODULE_INCLUDE_ADMIN}</td> <td ><input type="checkbox" size="45" name="module_include_admin" value="1" {module.E_MODULE_INCLUDE_CHECK_OPT}/></td> </tr> <tr> <td class="row2" colspan="2" align="center">{module.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{module.S_SUBMIT}" class="liteoption" /></td> </tr> </table> </form> </div> </td> </tr> <!-- Module Settings --> <!-- END module --> </table> Index: index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/index_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index_body.tpl 6 May 2005 06:48:12 -0000 1.1 --- index_body.tpl 5 Dec 2005 22:25:12 -0000 1.2 *************** *** 1,79 **** - <h1>{L_WELCOME}</h1> - <p>{L_ADMIN_INTRO}</p> - <h1>{L_FORUM_STATS}</h1> - <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="25%" nowrap="nowrap" height="25" class="thCornerL">{L_STATISTIC}</th> ! <th width="25%" height="25" class="thTop">{L_VALUE}</th> ! <th width="25%" nowrap="nowrap" height="25" class="thTop">{L_STATISTIC}</th> ! <th width="25%" height="25" class="thCornerR">{L_VALUE}</th> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_POSTS}:</td> ! <td class="row2"><b>{NUMBER_OF_POSTS}</b></td> ! <td class="row1" nowrap="nowrap">{L_POSTS_PER_DAY}:</td> ! <td class="row2"><b>{POSTS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_TOPICS}:</td> ! <td class="row2"><b>{NUMBER_OF_TOPICS}</b></td> ! <td class="row1" nowrap="nowrap">{L_TOPICS_PER_DAY}:</td> ! <td class="row2"><b>{TOPICS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_USERS}:</td> ! <td class="row2"><b>{NUMBER_OF_USERS}</b></td> ! <td class="row1" nowrap="nowrap">{L_USERS_PER_DAY}:</td> ! <td class="row2"><b>{USERS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_BOARD_STARTED}:</td> ! <td class="row2"><b>{START_DATE}</b></td> ! <td class="row1" nowrap="nowrap">{L_AVATAR_DIR_SIZE}:</td> ! <td class="row2"><b>{AVATAR_DIR_SIZE}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td> ! <td class="row2"><b>{DB_SIZE}</b></td> ! <td class="row1" nowrap="nowrap">{L_GZIP_COMPRESSION}:</td> ! <td class="row2"><b>{GZIP_COMPRESSION}</b></td> ! </tr> </table> <h1>{L_WHO_IS_ONLINE}</h1> - <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="20%" class="thCornerL" height="25"> {L_USERNAME} </th> ! <th width="20%" height="25" class="thTop"> {L_STARTED} </th> ! <th width="20%" class="thTop"> {L_LAST_UPDATE} </th> ! <th width="20%" class="thCornerR"> {L_FORUM_LOCATION} </th> ! <th width="20%" height="25" class="thCornerR"> {L_IP_ADDRESS} </th> ! </tr> ! <!-- BEGIN reg_user_row --> ! <tr> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td> ! <td width="20%" align="center" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.STARTED}</span> </td> ! <td width="20%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span> </td> ! </tr> ! <!-- END reg_user_row --> ! <tr> ! <td colspan="5" height="1" class="row3"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}spacer.gif" width="1" height="1" alt="."></td> ! </tr> ! <!-- BEGIN guest_user_row --> ! <tr> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.USERNAME}</span> </td> ! <td width="20%" align="center" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.STARTED}</span> </td> ! <td width="20%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span> </td> ! </tr> ! <!-- END guest_user_row --> </table> ! <br /> --- 1,78 ---- <h1>{L_WELCOME}</h1> <p>{L_ADMIN_INTRO}</p> <h1>{L_FORUM_STATS}</h1> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="25%" nowrap="nowrap" height="25" class="thCornerL">{L_STATISTIC}</th> ! <th width="25%" height="25" class="thTop">{L_VALUE}</th> ! <th width="25%" nowrap="nowrap" height="25" class="thTop">{L_STATISTIC}</th> ! <th width="25%" height="25" class="thCornerR">{L_VALUE}</th> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_POSTS}:</td> ! <td class="row2"><b>{NUMBER_OF_POSTS}</b></td> ! <td class="row1" nowrap="nowrap">{L_POSTS_PER_DAY}:</td> ! <td class="row2"><b>{POSTS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_TOPICS}:</td> ! <td class="row2"><b>{NUMBER_OF_TOPICS}</b></td> ! <td class="row1" nowrap="nowrap">{L_TOPICS_PER_DAY}:</td> ! <td class="row2"><b>{TOPICS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_NUMBER_USERS}:</td> ! <td class="row2"><b>{NUMBER_OF_USERS}</b></td> ! <td class="row1" nowrap="nowrap">{L_USERS_PER_DAY}:</td> ! <td class="row2"><b>{USERS_PER_DAY}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_BOARD_STARTED}:</td> ! <td class="row2"><b>{START_DATE}</b></td> ! <td class="row1" nowrap="nowrap">{L_AVATAR_DIR_SIZE}:</td> ! <td class="row2"><b>{AVATAR_DIR_SIZE}</b></td> ! </tr> ! <tr> ! <td class="row1" nowrap="nowrap">{L_DB_SIZE}:</td> ! <td class="row2"><b>{DB_SIZE}</b></td> ! <td class="row1" nowrap="nowrap">{L_GZIP_COMPRESSION}:</td> ! <td class="row2"><b>{GZIP_COMPRESSION}</b></td> ! </tr> </table> <h1>{L_WHO_IS_ONLINE}</h1> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th width="20%" class="thCornerL" height="25"> {L_USERNAME} </th> ! <th width="20%" height="25" class="thTop"> {L_STARTED} </th> ! <th width="20%" class="thTop"> {L_LAST_UPDATE} </th> ! <th width="20%" class="thCornerR"> {L_FORUM_LOCATION} </th> ! <th width="20%" height="25" class="thCornerR"> {L_IP_ADDRESS} </th> ! </tr> ! <!-- BEGIN reg_user_row --> ! <tr> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td> ! <td width="20%" align="center" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.STARTED}</span> </td> ! <td width="20%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span> </td> ! </tr> ! <!-- END reg_user_row --> ! <tr> ! <td colspan="5" height="1" class="row3"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}spacer.gif" width="1" height="1" alt="."></td> ! </tr> ! <!-- BEGIN guest_user_row --> ! <tr> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.USERNAME}</span> </td> ! <td width="20%" align="center" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.STARTED}</span> </td> ! <td width="20%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span> </td> ! </tr> ! <!-- END guest_user_row --> </table> ! <h1>{L_VERSION_INFORMATION}</h1> ! ! {PHPBB_VERSION_INFO} ! ! <br clear="all" /> \ No newline at end of file Index: index_frameset.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/index_frameset.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index_frameset.tpl 6 May 2005 06:48:12 -0000 1.1 --- index_frameset.tpl 5 Dec 2005 22:25:12 -0000 1.2 *************** *** 1,11 **** <html> <head> ! <title>MX-System Administration</title> ! <meta http-equiv="Content-Type" content="text/html;"> </head> ! <frameset cols="170,*" rows="*" border="2" framespacing="0" frameborder="yes"> ! <frame src="{S_FRAME_NAV}" name="nav" marginwidth="3" marginheight="3" scrolling="auto"> ! <frame src="{S_FRAME_MAIN}" name="main" marginwidth="10" marginheight="10" scrolling="auto"> </frameset> --- 1,11 ---- <html> <head> ! <title>mxBB-Portal Administration</title> ! <meta http-equiv="Content-Type" content="text/html;" /> </head> ! <frameset cols="190,*" rows="*" border="1" framespacing="0" frameborder="yes"> ! <frame src="{S_FRAME_NAV}" name="nav" marginwidth="3" marginheight="3" scrolling="auto" /> ! <frame src="{S_FRAME_MAIN}" name="main" marginwidth="10" marginheight="10" scrolling="auto" /> </frameset> Index: index_navigate.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/index_navigate.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index_navigate.tpl 6 May 2005 06:48:12 -0000 1.1 --- index_navigate.tpl 5 Dec 2005 22:25:12 -0000 1.2 *************** *** 1,93 **** ! <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center"> ! <tr> ! <td align="center" ><a href="{U_FORUM_INDEX}" target="_parent"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo_phpBB_med.gif" border="0" /></a></td> ! </tr> ! <tr> ! <td align="center" > ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th height="25" class="thHead"><b>{L_ADMIN}</b></th> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="_parent" class="genmed">{L_PORTAL_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_parent" class="genmed">{L_FORUM_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="main" class="genmed">{L_PREVIEW_PORTAL}</a></span></td> ! </tr> ! </table> ! <br /> ! <!-- BEGIN module_portal --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th height="25" class="thHead"><b>{module_portal.L_MX_PORTAL}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td height="28" class="catSides"><span class="cattitle">{module_portal.catrow.ADMIN_CATEGORY}</span></td> ! </tr> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><span class="genmed"><a href="{module_portal.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_portal.catrow.modulerow.ADMIN_MODULE}</a></span> ! </td> ! </tr> ! <!-- END modulerow --> ! <!-- END catrow --> ! </table> ! <br /> ! <!-- END module_portal --> ! <!-- BEGIN module_mx --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th height="25" class="thHead"><b>{module_mx.L_MX_MODULES}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td height="28" class="catSides"><span class="cattitle">{module_mx.catrow.ADMIN_CATEGORY}</span></td> ! </tr> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><span class="genmed"><a href="{module_mx.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_mx.catrow.modulerow.ADMIN_MODULE}</a></span> ! </td> ! </tr> ! <!-- END modulerow --> ! <!-- END catrow --> ! </table> ! <br /> ! <!-- END module_mx --> ! <!-- BEGIN module_phpbb --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th height="25" class="thHead"><b>{module_phpbb.L_PHPBB}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td height="28" class="catSides"><span class="cattitle">{module_phpbb.catrow.ADMIN_CATEGORY}</span></td> ! </tr> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><span class="genmed"><a href="{module_phpbb.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_phpbb.catrow.modulerow.ADMIN_MODULE}</a></span> ! </td> ! </tr> ! <!-- END modulerow --> ! <!-- END catrow --> ! </table> ! <br /> ! <!-- END module_phpbb --> ! </td> ! </tr> </table> - <br /> --- 1,339 ---- + <script language="javascript" type="text/javascript"> + <!-- ! /************************************************************* ! * DHTML Slide Menu for ACP MOD ! * ! * Copyright (C) 2004, Markus (phpMiX) ! * This script is released under GPL License. ! * Feel free to use this script (or part of it) wherever you need ! * it ...but please, give credit to original author. Thank you. :-) ! * We will also appreciate any links you could give us. ! * ! * Enjoy! ;-) ! * ! * This MOD is adapted for mxBB adminCP, by Jon ! *************************************************************/ ! function getCookie(name) ! { ! var cookies = document.cookie; ! var start = cookies.indexOf(name + '='); ! if( start < 0 ) return null; ! var len = start + name.length + 1; ! var end = cookies.indexOf(';', len); ! if( end < 0 ) end = cookies.length; ! return unescape(cookies.substring(len, end)); ! } ! function setCookie(name, value, expires, path, domain, secure) ! { ! document.cookie = name + '=' + escape (value) + ! ((expires) ? '; expires=' + ( (expires == 'never') ? 'Thu, 31-Dec-2099 23:59:59 GMT' : expires.toGMTString() ) : '') + ! ((path) ? '; path=' + path : '') + ! ((domain) ? '; domain=' + domain : '') + ! ((secure) ? '; secure' : ''); ! } ! function delCookie(name, path, domain) ! { ! if( getCookie(name) ) ! { ! document.cookie = name + '=;expires=Thu, 01-Jan-1970 00:00:01 GMT' + ! ((path) ? '; path=' + path : '') + ! ((domain) ? '; domain=' + domain : ''); ! } ! } ! function menuCat(id, rows, mode) ! { ! this.cat_id = id; ! this.cat_rows = rows; ! this.menu_mode = mode; ! this.status = 'none'; ! } ! var menuCats = new Array(); ! <!-- BEGIN module_portal --> ! <!-- BEGIN catrow --> ! menuCats['menuPortal_{module_portal.catrow.MENU_CAT_ID}'] = new menuCat('{module_portal.catrow.MENU_CAT_ID}', {module_portal.catrow.MENU_CAT_ROWS}, 'menuPortal_'); ! <!-- END catrow --> ! <!-- END module_portal --> ! ! <!-- BEGIN module_mx --> ! <!-- BEGIN catrow --> ! menuCats['menuMX_{module_mx.catrow.MENU_CAT_ID}'] = new menuCat('{module_mx.catrow.MENU_CAT_ID}', {module_mx.catrow.MENU_CAT_ROWS}, 'menuMX_'); ! <!-- END catrow --> ! <!-- END module_mx --> ! ! <!-- BEGIN module_phpbb --> ! <!-- BEGIN catrow --> ! menuCats['menuphpBB_{module_phpbb.catrow.MENU_CAT_ID}'] = new menuCat('{module_phpbb.catrow.MENU_CAT_ID}', {module_phpbb.catrow.MENU_CAT_ROWS}, 'menuphpBB_'); ! <!-- END catrow --> ! <!-- END module_phpbb --> ! ! function getObj(obj) ! { ! return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); ! } ! function displayObj(obj, status) ! { ! var x = getObj(obj); ! if( x && x.style ) x.style.display = status; ! } ! ! var queueInterval = 20; // milliseconds between queued steps. ! var execInterval = 0; ! var queuedSteps; ! var currentStep; ! ! function queueStep(o, s) ! { ! this.obj = o; ! this.status = s; ! } ! function execQueue() ! { ! if( currentStep < queuedSteps.length ) ! { ! var obj = queuedSteps[currentStep].obj; ! var status = queuedSteps[currentStep].status; ! displayObj(obj, status); ! if( menuCats[obj] ) menuCats[obj].status = status; ! currentStep++; ! setTimeout("execQueue();", execInterval); ! } ! else ! { ! execInterval = queueInterval; ! } ! } ! function onMenuCatClick(cat_id, type, init) ! { ! var currentCat, currentStatus; ! ! currentCat = type + cat_id; ! currentStatus = menuCats[currentCat].status; ! ! queuedSteps = new Array(); ! currentStep = 0; ! ! for( var catName in menuCats ) ! { ! if( (menuCats[catName].menu_mode == type && menuCats[catName].status == 'block')) ! { ! for( var i=(menuCats[catName].cat_rows-1); i >= 0; i-- ) ! { ! queuedSteps[currentStep++] = new queueStep(catName+'_'+i, 'none'); ! } ! queuedSteps[currentStep++] = new queueStep(catName, 'none'); ! menuCats[catName].status == 'none'; ! ! if( document.images && document.images['image_' + catName] ) ! { ! document.images['image_' + catName].src = '{IMG_URL_EXPAND}'; ! } ! } ! } ! ! if( currentStatus == 'none' ) ! { ! queuedSteps[currentStep++] = new queueStep(currentCat, 'block'); ! for( var i=0; i < menuCats[currentCat].cat_rows; i++ ) ! { ! queuedSteps[currentStep++] = new queueStep(currentCat+'_'+i, 'block'); ! } ! menuCats[currentCat].status == 'block'; ! ! var expdate = new Date(); // 72 Hours from now ! expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); ! setCookie('{COOKIE_NAME}_'+type+'cat_id', cat_id, expdate, ! ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ! ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ! ('{COOKIE_SECURE}' == '0') ? false : true); ! ! if( document.images && document.images['image_' + currentCat] ) ! { ! document.images['image_' + currentCat].src = '{IMG_URL_CONTRACT}'; ! } ! } ! else ! { ! delCookie('{COOKIE_NAME}_'+type+'cat_id', ! ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ! ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); ! } ! currentStep = 0; ! setTimeout("execQueue();", execInterval); ! } ! ! function doOnLoadMenuACP() ! { ! var cat_id; ! ! if( getObj('menuPortal_0') ) ! { ! cat_id = getCookie('{COOKIE_NAME}_menuPortal_cat_id'); ! if( !menuCats['menuPortal_'+cat_id] ) ! { ! cat_id = 0; ! } ! else ! { ! menuCats['menuPortal_'+cat_id].status = 'none'; ! } ! onMenuCatClick(cat_id, 'menuPortal_', 'true'); ! } ! ! if( getObj('menuMX_0') ) ! { ! cat_id = getCookie('{COOKIE_NAME}_menuMX_cat_id'); ! if( !menuCats['menuMX_'+cat_id] ) ! { ! cat_id = 0; ! } ! else ! { ! menuCats['menuMX_'+cat_id].status = 'none'; ! } ! } ! ! if( getObj('menuphpBB_0') ) ! { ! cat_id = getCookie('{COOKIE_NAME}_menuphpBB_cat_id'); ! if( !menuCats['menuphpBB_'+cat_id] ) ! { ! cat_id = 0; ! } ! else ! { ! menuCats['menuphpBB_'+cat_id].status = 'none'; ! } ! } ! ! if( oldOnLoadMenuACP ) ! { ! oldOnLoadMenuACP(); ! } ! } ! var oldOnLoadMenuACP = window.onload; ! window.onload = doOnLoadMenuACP; ! ! // --> ! </script> ! ! <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center"> ! <tr> ! <td align="center" ><a href="{U_FORUM_INDEX}" target="_parent"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo_phpBB_med.gif" border="0" /></a></td> ! </tr> ! <tr> ! <td align="center" > ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th class="thHead"><b>{L_ADMIN}</b></th> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_ADMIN_INDEX}" target="main" class="genmed">{L_ADMIN_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="_parent" class="genmed">{L_PORTAL_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_parent" class="genmed">{L_FORUM_INDEX}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></span></td> ! </tr> ! <tr> ! <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="main" class="genmed">{L_PREVIEW_PORTAL}</a></span></td> ! </tr> ! </table> ! </td> ! </tr> ! <tr> ! <td align="center" > ! <!-- BEGIN module_portal --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th class="thHead"><b>{module_portal.L_MX_PORTAL}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td class="catSides" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module_portal.catrow.MENU_CAT_ID}','menuPortal_');"><img name="image_menuPortal_{module_portal.catrow.MENU_CAT_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <span class="cattitle"><a>{module_portal.catrow.ADMIN_CATEGORY}</a></span></td> ! </tr> ! <tr> ! <td class="row1"> ! <div id="menuPortal_{module_portal.catrow.MENU_CAT_ID}" style="display:none;"> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="bodyline"> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><div id="menuPortal_{module_portal.catrow.MENU_CAT_ID}_{module_portal.catrow.modulerow.ROW_COUNT}" style="display:block;" class="genmed"><a href="{module_portal.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_portal.catrow.modulerow.ADMIN_MODULE}</a></div></td> ! </tr> ! <!-- END modulerow --> ! </table> ! </div> ! </td> ! </tr> ! <!-- END catrow --> ! </table> ! <!-- END module_portal --> ! </td> ! </tr> ! <tr> ! <td align="center" > ! <!-- BEGIN module_mx --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th class="thHead"><b>{module_mx.L_MX_MODULES}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td class="catSides" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module_mx.catrow.MENU_CAT_ID}', 'menuMX_');"><img name="image_menuMX_{module_mx.catrow.MENU_CAT_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <span class="cattitle">{module_mx.catrow.ADMIN_CATEGORY}</span></td> ! </tr> ! <tr> ! <td class="row1"> ! <div id="menuMX_{module_mx.catrow.MENU_CAT_ID}" style="display:none;"> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="bodyline"> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><div id="menuMX_{module_mx.catrow.MENU_CAT_ID}_{module_mx.catrow.modulerow.ROW_COUNT}" style="display:block;" class="genmed"><a href="{module_mx.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_mx.catrow.modulerow.ADMIN_MODULE}</a></div></td> ! </tr> ! <!-- END modulerow --> ! </table> ! </div> ! </td> ! </tr> ! <!-- END catrow --> ! </table> ! <!-- END module_mx --> ! </td> ! </tr> ! <tr> ! <td align="center" > ! <!-- BEGIN module_phpbb --> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> ! <tr> ! <th class="thHead"><b>{module_phpbb.L_PHPBB}</b></th> ! </tr> ! <!-- BEGIN catrow --> ! <tr> ! <td class="catSides" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module_phpbb.catrow.MENU_CAT_ID}', 'menuphpBB_');"><img name="image_menuphpBB_{module_phpbb.catrow.MENU_CAT_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <span class="cattitle">{module_phpbb.catrow.ADMIN_CATEGORY}</span></td> ! </tr> ! <tr> ! <td class="row1"> ! <div id="menuphpBB_{module_phpbb.catrow.MENU_CAT_ID}" style="display:none;"> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="bodyline"> ! <!-- BEGIN modulerow --> ! <tr> ! <td class="row1"><div id="menuphpBB_{module_phpbb.catrow.MENU_CAT_ID}_{module_phpbb.catrow.modulerow.ROW_COUNT}" style="display:block;" class="genmed"><a href="{module_phpbb.catrow.modulerow.U_ADMIN_MODULE}" target="main" class="genmed">{module_phpbb.catrow.modulerow.ADMIN_MODULE}</a></div></td> ! </tr> ! <!-- END modulerow --> ! </table> ! </div> ! </td> ! </tr> ! <!-- END catrow --> ! </table> ! <!-- END module_phpbb --> ! </td> ! </tr> </table> Index: mx_module_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/mx_module_admin_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_module_admin_body.tpl 6 May 2005 06:48:12 -0000 1.1 --- mx_module_admin_body.tpl 5 Dec 2005 22:25:12 -0000 1.2 *************** *** 1,29 **** - <h1>{L_MODULE_TITLE}</h1> - - <P>{L_MODULE_TEXT}</p> - - <form method="post" action="{S_ACTION}"><table width="100%" cellspacing="1" cellpadding="4" border="0" align="center" class="forumline"> - <tr> - <th class="thCornerL">{L_CODE}</th> - <th class="thTop">{L_MODULE_NAME}</th> - <th class="thTop">{L_MODULE_DESC}</th> - <th colspan="2" class="thCornerR">{L_ACTION}</th> - </tr> - <!-- BEGIN module --> - <tr> - <td class="{module.ROW_CLASS}">{module.CODE}</td> - <td class="{module.ROW_CLASS}">{module.NAME}</td> - <td class="{module.ROW_CLASS}">{module.DESC}</td> - <td class="{module.ROW_CLASS}"><a href="{module.U_EDIT}">{L_EDIT}</a></td> - <td class="{module.ROW_CLASS}"><a href="{module.U_DELETE}">{L_DELETE}</a></td> - </tr> - <!-- END module --> - <tr> - <td class="catBottom" colspan="5" align="center">{S_HIDDEN_FIELDS_MODULE}<input class="mainoption" type="submit" name="import_pack" value="{L_IMPORT_PACK}"> <input class="mainoption" type="submit" name="upgrade_module" value="{L_UPGRADE_PACK}"> <input type="submit" name="add" value="{L_ADD}" class="liteoption" /> <input class="liteoption" type="submit" name="export_pack" value="{L_EXPORT_PACK}"></td> - </tr> - </table></form> - - <br /> <h1>{L_FUNCTION_TITLE}</h1> --- 1,3 ---- |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:21
|
Update of /cvsroot/mxbb/core27x/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/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 index.php page_footer_admin.php page_header_admin.php pagestart.php Added Files: admin_mx_module_cp.php Log Message: Updated - more is backported - some is fixed Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_phpinfo.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_phpinfo.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_phpinfo.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 21,25 **** if( !empty($setmodules) ) { ! $module['Portal - System']['phpInfo'] = 'admin/' . $file; return; } --- 21,26 ---- if( !empty($setmodules) ) { ! $module['4_Panel_system']['4_1_PHPinfo'] = 'admin/' . basename(__FILE__); ! return; } Index: admin_mx_page.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_page.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_page.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_page.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 24,30 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['Portal - General']['Page_admin'] = 'admin/' . $file; ! return; } --- 24,31 ---- if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['2_CP']['2_4_PageCP'] = 'admin/' . $file; ! ! return; } Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_chkobjs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_chkobjs.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_chkobjs.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 26,30 **** if( !empty($setmodules) ) { ! $module['Portal - System']['Objects_Integrity_Check'] = 'admin/' . basename(__FILE__); return; } --- 26,31 ---- if( !empty($setmodules) ) { ! $module['4_Panel_system']['4_1_Integrity'] = 'admin/' . basename(__FILE__); ! return; } Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_gen_cache.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_gen_cache.php 5 Dec 2005 19:25:26 -0000 1.3 --- admin_mx_gen_cache.php 5 Dec 2005 22:25:11 -0000 1.4 *************** *** 14,18 **** if( !empty($setmodules) ) { ! $module['Portal - System']['Generate cache'] = 'admin/' . basename(__FILE__); return; } --- 14,19 ---- if( !empty($setmodules) ) { ! $module['4_Panel_system']['4_1_Cache'] = 'admin/' . basename(__FILE__); ! return; } Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_meta.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_meta.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_meta.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 22,26 **** if( !empty($setmodules) ) { ! $module['Portal - System']['Meta Tag'] = 'admin/' . basename(__FILE__); return; } --- 22,26 ---- if( !empty($setmodules) ) { ! $module['4_Panel_system']['4_1_Meta'] = 'admin/' . basename(__FILE__); return; } Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/index.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.php 6 May 2005 06:47:56 -0000 1.1 --- index.php 5 Dec 2005 22:25:11 -0000 1.2 *************** *** 1,37 **** <?php ! /*************************************************************************** ! * (admin) index.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. ! * ! ***************************************************************************/ - define('IN_PORTAL', 1); - $mx_root_path = '../'; // ! // Load default header // $no_page_header = TRUE; - require('./pagestart.php'); - - session_start(); - // Unset all of the session variables. - session_unset(); --- 1,42 ---- <?php ! /** ------------------------------------------------------------------------ ! * Subject : mxBB - a fully modular portal and CMS (for phpBB) ! * Author : Jon Ohlsson and the mxBB Team ! * Credits : The phpBB Group & Marc Morisette ! * Copyright : (C) 2002-2005 mxBB Portal ! * Email : jo...@mx... ! * Project site : www.mxbb-portal.com ! * ------------------------------------------------------------------------- ! * ! * $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. ! */ ! ! /** ! * mxNN Notes: ! * This file is borrowed from phpBB, with some modifications ! */ // ! // Security and Page header // + define('IN_PORTAL', 1); + $mx_root_path = './../'; + require($mx_root_path . 'extension.inc'); $no_page_header = TRUE; + require('./pagestart.' . $phpEx); + // ------------------------------ + // DEBUG ONLY ;-) + // + //error_reporting(E_ALL); + // ------------------------------ *************** *** 41,45 **** function inarray($needle, $haystack) { ! for($i = 0; $i < sizeof($haystack); $i++ ) { if( $haystack[$i] == $needle ) --- 46,50 ---- function inarray($needle, $haystack) { ! for( $i = 0; $i < sizeof($haystack); $i++ ) { if( $haystack[$i] == $needle ) *************** *** 50,83 **** return false; } ! ! ! function read_admin($dir_module ) { ! global $phpEx, $template; ! $module = array(); ! $setmodules = 1; ! $dir = @opendir( $dir_module ); ! while( $file = @readdir($dir) ) { ! if( preg_match("/^admin_.*?\." . $phpEx . "$/", $file) ) { ! include($dir_module . '/' . $file); } } - @closedir($dir); - - unset($setmodules); - return $module; } - // // End functions // ------------- - - - // // Generate relevant output --- 55,82 ---- return false; } ! function read_admin($dir_module) { ! global $phpEx, $template, $lang; ! $module = array(); ! if( $dir = @opendir($dir_module) ) { ! $setmodules = 1; ! while( $file = @readdir($dir) ) { ! if( preg_match("/^admin_.*?\." . $phpEx . "$/", $file) ) ! { ! include($dir_module . '/' . $file); ! } } + @closedir($dir); + unset($setmodules); } return $module; } // // End functions // ------------- // // Generate relevant output *************** *** 88,107 **** $template->set_filenames(array( ! "body" => "admin/index_navigate.tpl") ); $template->assign_vars(array( 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! "U_FORUM_INDEX" => append_sid( PHPBB_URL . "index.$phpEx"), ! "U_PORTAL_INDEX" => append_sid( PORTAL_URL . "index.$phpEx"), "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), ! "L_FORUM_INDEX" => $lang['Main_index'], - "L_PORTAL_INDEX" => $lang['Portal_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], ! "L_PREVIEW_FORUM" => $lang['Preview_forum'], ! "L_PREVIEW_PORTAL" => $lang['Preview_portal']) ); --- 87,115 ---- $template->set_filenames(array( ! 'body' => 'admin/index_navigate.tpl') ); + + $admincp_nav_icon_url = PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/'; $template->assign_vars(array( 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + "U_PORTAL_INDEX" => append_sid(PORTAL_URL . "index.$phpEx"), + "L_PORTAL_INDEX" => $lang['Portal_index'], + "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "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'], ! 'COOKIE_DOMAIN' => $board_config['cookie_domain'], ! 'COOKIE_SECURE' => $board_config['cookie_secure'], ! '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'], ! "L_PREVIEW_FORUM" => $lang['Preview_forum']) ); *************** *** 110,128 **** // ! $module_portal = read_admin( "."); ksort($module_portal); ! $template->assign_block_vars('module_portal', array( ! "L_MX_PORTAL" => $lang['MX_Portal'] ! ) ! ); ! while( list($cat, $action_array) = each($module_portal) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $template->assign_block_vars("module_portal.catrow", array( ! "ADMIN_CATEGORY" => $cat) ); --- 118,144 ---- // ! // MX Addon ------------------------------------ ! $module_portal = read_admin('.'); ! $template->assign_block_vars('module_portal', array( ! 'L_MX_PORTAL' => $lang['MX_Portal'] ! )); ! // END ------------------------------------------ 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) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $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) ); *************** *** 130,172 **** $row_count = 0; - while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; - $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! $template->assign_block_vars("module_portal.catrow.modulerow", array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, ! "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid( PORTAL_URL . $file)) ! ); $row_count++; } } ! ! ! // // Include PHPBB Administration ! // ! ! $module_phpbb = array_merge( $module, read_admin( $phpbb_root_path . "admin/" )); ksort($module_phpbb); ! $template->assign_block_vars('module_phpbb', array( ! "L_PHPBB" => $lang['Phpbb'] ! ) ! ); ! while( list($cat, $action_array) = each($module_phpbb) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $template->assign_block_vars("module_phpbb.catrow", array( ! "ADMIN_CATEGORY" => $cat) ); --- 146,196 ---- $row_count = 0; while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; ! $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); + $template->assign_block_vars('module_portal.catrow.modulerow', array( + "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) + )); $row_count++; } + //+MOD: DHTML Menu for ACP + $menu_cat_id++; + //-MOD: DHTML Menu for ACP } ! // MX ADDON // Include PHPBB Administration ! // ------------------------------------------------------------------------------- ! $module_phpbb = read_admin($phpbb_root_path . 'admin/'); ! $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'] ! )); 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) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $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) ); *************** *** 174,232 **** $row_count = 0; - while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; - $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! $template->assign_block_vars("module_phpbb.catrow.modulerow", array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, ! "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid( PHPBB_URL . 'admin/' . $file)) ! ); $row_count++; } } // // Read Portal Module Configuration // ! $sql = "SELECT * ! FROM " . MODULE_TABLE . " ! WHERE module_include_admin = 1 ! ORDER BY module_name"; ! ! if(!$q_modules = $db->sql_query($sql)) ! { ! message_die(GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql); ! } ! ! if( $total_modules = $db->sql_numrows($q_modules) ) ! { ! $module_rows = $db->sql_fetchrowset($q_modules); ! } ! $module_mx = array(); ! for($module_cnt = 0; $module_cnt < $total_modules; $module_cnt++) ! { ! $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; ! $module_mx = array_merge_recursive( $module_mx, read_admin( $module_path_admin ) ); ! } // for ... modules ! ksort($module_mx); $template->assign_block_vars('module_mx', array( ! "L_MX_MODULES" => $lang['MX_Modules'] ! ) ); while( list($cat, $action_array) = each($module_mx) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $template->assign_block_vars("module_mx.catrow", array( ! "ADMIN_CATEGORY" => $cat) ); --- 198,268 ---- $row_count = 0; while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; ! $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); + $template->assign_block_vars('module_phpbb.catrow.modulerow', array( + "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)) + ); $row_count++; } + //+MOD: DHTML Menu for ACP + $menu_cat_id++; + //-MOD: DHTML Menu for ACP } + // // Read Portal Module Configuration // ! $sql = "SELECT * ! FROM " . MODULE_TABLE . " ! WHERE module_include_admin = 1 ! ORDER BY module_name"; ! if( !($q_modules = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not query modules information", '', __LINE__, __FILE__, $sql); ! } ! if( $total_modules = $db->sql_numrows($q_modules) ) ! { ! $module_rows = $db->sql_fetchrowset($q_modules); ! } + $module_mx = array(); + for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ ) + { + $module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/"; + $module_mx = array_merge_recursive($module_mx, read_admin($module_path_admin)); + } $template->assign_block_vars('module_mx', array( ! 'L_MX_MODULES' => $lang['MX_Modules']) ); + 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) ) { $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $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) ); *************** *** 234,256 **** $row_count = 0; - while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! $template->assign_block_vars("module_mx.catrow.modulerow", array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, ! "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid( PORTAL_URL . $file)) ! ); $row_count++; } } ! ! $template->pparse("body"); include('./page_footer_admin.'.$phpEx); --- 270,300 ---- $row_count = 0; while( list($action, $file) = each($action_array) ) { $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; + $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! $template->assign_block_vars('module_mx.catrow.modulerow', array( ! "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)) + ); $row_count++; } + //+MOD: DHTML Menu for ACP + $menu_cat_id++; + //-MOD: DHTML Menu for ACP } ! // ----------------------------------------------------------------------------------- ! // END MX ADDON ! // ----------------------------------------------------------------------------------- ! $template->pparse('body'); include('./page_footer_admin.'.$phpEx); *************** *** 266,277 **** $template->assign_vars(array( ! ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! "L_WELCOME" => $lang['Welcome_phpBB'], "L_ADMIN_INTRO" => $lang['Admin_intro'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], "L_LOCATION" => $lang['Location'], "L_LAST_UPDATE" => $lang['Last_updated'], --- 310,322 ---- $template->assign_vars(array( ! // MX Addon ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! // END "L_WELCOME" => $lang['Welcome_phpBB'], "L_ADMIN_INTRO" => $lang['Admin_intro'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], + "L_USERNAME" => $lang['Username'], "L_LOCATION" => $lang['Location'], "L_LAST_UPDATE" => $lang['Last_updated'], *************** *** 310,314 **** $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path'])) { while( $file = @readdir($avatar_dir) ) --- 355,359 ---- $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path']) ) { while( $file = @readdir($avatar_dir) ) *************** *** 341,345 **** } else ! { // Couldn't open Avatar dir. $avatar_dir_size = $lang['Not_available']; --- 386,390 ---- } else ! { // Couldn't open Avatar dir. $avatar_dir_size = $lang['Not_available']; *************** *** 473,485 **** AND u.user_id = s.session_user_id AND u.user_id <> " . ANONYMOUS . " ! AND u.user_session_time >= " . ( time() - 300 ) . " ORDER BY u.user_session_time DESC"; if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql); } $onlinerow_reg = $db->sql_fetchrowset($result); ! $sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start FROM " . SESSIONS_TABLE . " WHERE session_logged_in = 0 --- 518,530 ---- AND u.user_id = s.session_user_id AND u.user_id <> " . ANONYMOUS . " ! AND s.session_time >= " . ( time() - 300 ) . " ORDER BY u.user_session_time DESC"; if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql); } $onlinerow_reg = $db->sql_fetchrowset($result); ! $sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start FROM " . SESSIONS_TABLE . " WHERE session_logged_in = 0 *************** *** 488,492 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql); } $onlinerow_guest = $db->sql_fetchrowset($result); --- 533,537 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql); } $onlinerow_guest = $db->sql_fetchrowset($result); *************** *** 503,507 **** else { ! message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); } --- 548,552 ---- else { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); } *************** *** 572,575 **** --- 617,628 ---- break; default: + //+MOD: ViewOnline extension for mxBB Portal Pages + $mx_viewonline_info = mx_get_viewonline_info($onlinerow_reg[$i]['user_session_page']); + if( $mx_viewonline_info !== false ) + { + list($location, $location_url) = $mx_viewonline_info; + break; + } + //-MOD: ViewOnline extension for mxBB Portal Pages $location = $lang['Forum_index']; $location_url = "index.$phpEx?pane=right"; *************** *** 578,582 **** else { ! $location_url = append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']); $location = $forum_data[$onlinerow_reg[$i]['user_session_page']]; } --- 631,635 ---- else { ! $location_url = append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']); $location = $forum_data[$onlinerow_reg[$i]['user_session_page']]; } *************** *** 596,601 **** "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$reg_ip", ! "U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), "U_FORUM_LOCATION" => append_sid($location_url)) ); --- 649,654 ---- "IP_ADDRESS" => $reg_ip, ! "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", ! "U_USER_PROFILE" => append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), "U_FORUM_LOCATION" => append_sid($location_url)) ); *************** *** 609,613 **** "L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing']) ); ! } // --- 662,666 ---- "L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing']) ); ! } // *************** *** 621,625 **** { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; ! $guest_users++; if( $onlinerow_guest[$i]['session_page'] < 1 ) --- 674,678 ---- { $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; ! $guest_users++; if( $onlinerow_guest[$i]['session_page'] < 1 ) *************** *** 664,667 **** --- 717,728 ---- break; default: + //+MOD: ViewOnline extension for mxBB Portal Pages + $mx_viewonline_info = mx_get_viewonline_info($onlinerow_guest[$i]['session_page']); + if( $mx_viewonline_info !== false ) + { + list($location, $location_url) = $mx_viewonline_info; + break; + } + //-MOD: ViewOnline extension for mxBB Portal Pages $location = $lang['Forum_index']; $location_url = "index.$phpEx?pane=right"; *************** *** 670,674 **** else { ! $location_url = append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']); $location = $forum_data[$onlinerow_guest[$i]['session_page']]; } --- 731,735 ---- else { ! $location_url = append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']); $location = $forum_data[$onlinerow_guest[$i]['session_page']]; } *************** *** 688,692 **** "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => "http://www.samspade.org/t/ipwhois?a=$guest_ip", "U_FORUM_LOCATION" => append_sid($location_url)) ); --- 749,753 ---- "IP_ADDRESS" => $guest_ip, ! "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", "U_FORUM_LOCATION" => append_sid($location_url)) ); *************** *** 700,704 **** --- 761,833 ---- ); } + + // Check for new phpBB version + $current_phpbb_version = explode('.', '2' . $board_config['version']); + $minor_phpbb_revision = (int) $current_phpbb_version[2]; + + $errno = 0; + $errstr = $phpbb_version_info = ''; + + if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr)) + { + @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); + @fputs($fsock, "HOST: www.phpbb.com\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + $get_info = false; + while (!@feof($fsock)) + { + if ($get_info) + { + $phpbb_version_info .= @fread($fsock, 1024); + } + else + { + if (@fgets($fsock, 1024) == "\r\n") + { + $get_info = true; + } + } + } + @fclose($fsock); + + $phpbb_version_info = explode("\n", $phpbb_version_info); + $latest_phpbb_head_revision = (int) $phpbb_version_info[0]; + $latest_phpbb_minor_revision = (int) $phpbb_version_info[2]; + $latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2]; + + if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision) + { + $phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; + } + else + { + $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; + $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $phpbb_latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; + } + } + else + { + if ($errstr) + { + $phpbb_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>'; + } + else + { + $phpbb_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>'; + } + } + + $phpbb_version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>'; + + // done with the phpBB version check for now + + $template->assign_vars(array( + 'PHPBB_VERSION_INFO' => $phpbb_version_info, + 'L_VERSION_INFORMATION' => $lang['Version_information']) + ); + + $template->pparse("body"); *************** *** 707,711 **** } else ! { // // Generate frameset --- 836,840 ---- } else ! { // // Generate frameset *************** *** 717,721 **** $template->assign_vars(array( "S_FRAME_NAV" => append_sid("index.$phpEx?pane=left"), ! "S_FRAME_MAIN" => append_sid("index.$phpEx?pane=right")) ); --- 846,850 ---- $template->assign_vars(array( "S_FRAME_NAV" => append_sid("index.$phpEx?pane=left"), ! "S_FRAME_MAIN" => append_sid("index.$phpEx?pane=right")) ); --- NEW FILE: admin_mx_module_cp.php --- <?php /** ------------------------------------------------------------------------ * Subject : mxBB - a fully modular portal and CMS (for phpBB) * Author : Jon Ohlsson and the mxBB Team * Credits : The phpBB Group & Marc Morisette * Copyright : (C) 2002-2005 mxBB Portal * Email : jo...@mx... * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- * * $Id: admin_mx_module_cp.php,v 1.1 2005/12/05 22:25:12 jonohlsson Exp $ */ /** * 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( !empty($setmodules) ) { $file = basename(__FILE__); $module['2_CP']['2_1_Modules'] = 'admin/' . $file; return; } // // Security and Page header // define('IN_PORTAL', 1); $mx_root_path = './../'; require($mx_root_path . 'extension.inc'); $no_page_header = TRUE; require('./pagestart.' . $phpEx); // // Instatiate the mx_cache class // $mx_admin = new mx_admin(); // // Pak file delimiter // $delimeter = '=+:'; // // Mode & Action setting // $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, ''); // Main module id, to load the adminCP blocks and parameter data $nav_module_id = $mx_request_vars->request('module_id', MX_TYPE_INT, ''); if ( empty($nav_module_id) ) { $cookie_tmp = $board_config['cookie_name'].'_adminModule_module_id'; $nav_module_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : ''; } // Load states $cookie_tmp = $board_config['cookie_name'].'_admincp_blockstates'; $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); $this_module_path = $mx_request_vars->request('this_module_path', MX_TYPE_NO_TAGS, ''); if( !empty($mode) && !empty($action) ) { // // Get vars // $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); $id = $mx_request_vars->request('id', MX_TYPE_INT, ''); // // Send to adminCP // $result_message = $mx_admin->do_it($mode, $action, $id); // // If new page, load new page settings panel // $is_pak = false; if (is_array($result_message)) { $nav_module_id = $result_message['new_module_id']; $is_pak = !empty($result_message['is_pak']); $result_message = $result_message['text']; } $result_message = $lang['AdminCP_status'] . '<hr>' . $result_message; } // if .. !empty($mode) // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- // // Start page proper // $template->set_filenames(array( 'body' => 'admin/mx_modulecp_admin_body.tpl') ); // // Define some graphics // $module_nav_icon_url = PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/admin_icons/'; $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'; // // Install module // $modules_list = $mx_admin->get_new_module_pak_files(); $modules_select_list = get_list_static('module_path', $modules_list, '', false); // // Hidden fields // $s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" /> <input type="hidden" name="action" value="' . MX_DO_INSTALL . '" /> <input type="hidden" name="id" value="' . $module_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $result_message_height = $is_pak ? '300px' : '50px'; // // Hidden vars // $s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $module_id . '" />'; // // Send to template // $template->assign_vars(array( 'L_TITLE' => $lang['Module_admin'], 'L_EXPLAIN' => $lang['Module_admin_explain'], 'NAV_MODULE_ID' => $nav_module_id, 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // // General // 'L_ACTION' => $lang['Action'], 'L_DELETE' => $lang['Delete'], 'L_UNINSTALL' => $lang['Uninstall_module'], 'L_EDIT' => $lang['Edit'], 'L_SETTING' => $lang['Settings'], 'L_ADD' => $lang['Create_module'], // // Module // 'L_CODE' => $lang['Code'], 'L_MODULE_NAME' => $lang['Module_name'], 'L_MODULE_DESC' => $lang['Module_desc'], 'L_MODULE_PATH' => $lang['Module_path'], 'L_MODULE_INCLUDE_ADMIN' => $lang['Module_include_admin'], 'L_IMPORT_PACK' => $lang['import_module_pack'], 'L_UPGRADE_PACK' => $lang['upgrade_module_pack'], 'L_EXPORT_PACK' => $lang['export_module_pack'], 'L_QUICK_NAV' => $lang['Quick_nav'], 'IMG_URL_CONTRACT' => $admin_icon['contract'], 'IMG_URL_EXPAND' => $admin_icon['expand'], 'IMG_ICON_MODULE' => $admin_icon['module'], 'S_HIDDEN_FIELDS_MODULE' => $s_hidden_fields_module, 'S_SUBMIT' => $lang['Update'], // // Module Install // 'S_MODULE_INSTALL_LIST' => $modules_select_list, 'S_HIDDEN_MODULE_INSTALL_FIELDS' => $s_hidden_module_install_fields, // // Cookies // 'COOKIE_NAME' => $board_config['cookie_name'], 'COOKIE_PATH' => $board_config['cookie_path'], 'COOKIE_DOMAIN' => $board_config['cookie_domain'], 'COOKIE_SECURE' => $board_config['cookie_secure'], 'S_ACTION' => append_sid("admin_mx_module_cp.$phpEx") )); // // ---------------------------------------------------------------------------------- Modules // // Display list of Modules --------------------------------------------------------------- // --------------------------------------------------------------------------------------- // // Get current/active module // $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_id = '" . $nav_module_id . "' ORDER BY module_name ASC"; if( !($q_modules_current = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql); } $module_rows_current = array(); if( $total_modules_current = $db->sql_numrows($q_modules_current) ) { $module_rows_current = $db->sql_fetchrowset($q_modules_current); } // // Get the rest modules // $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_id <> '" . $nav_module_id . "' ORDER BY module_name ASC"; if( !($q_modules = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Could not query modules information", "", __LINE__, __FILE__, $sql); } $module_rows = array(); if( $total_modules = $db->sql_numrows($q_modules) ) { $module_rows = $db->sql_fetchrowset($q_modules); } if ( $total_modules + $total_modules_current == 0 ) { $template->assign_block_vars('nomodule', array( 'NONE' => $lang['No_modules'] )); } $module_rows = array_merge($module_rows_current, $module_rows); $total_modules = $total_modules + $total_modules_current; // // Setup an additional var for the quick nav dropdown // $module_rows_select = array(); // // Loop through the rows of modules setting block vars for the template. // for( $module_count = -1; $module_count < $total_modules; $module_count++ ) { // // Give main vars specific names // $new_module = $module_count == -1; $newmode = $new_module ? 'add' : 'modify'; $module_id = $new_module ? '0' : $module_rows[$module_count]['module_id']; $mode = MX_MODULE_TYPE; $action = $new_module ? MX_DO_INSERT : MX_DO_UPDATE; $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $module_id . '&module_path=' . $module_rows[$module_count]['module_path']; $upgrademode = '?mode=' . $mode . '&action=' . MX_DO_UPGRADE . '&id=' . $module_id . '&module_path=' . $module_rows[$module_count]['module_path']; $exportmode = '?mode=' . $mode . '&action=' . MX_DO_EXPORT . '&id=' . $module_id; $settingmode = '?module_id=' . $module_id; // // Hidden fields // $s_hidden_module_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $module_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $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 = ''; if( $module_rows[$module_count]['module_include_admin'] == 1 ) { $check_opt = 'checked="checked"'; } //$pak_row = search_pak($module_rows[$module_count]['module_path']); //$pak_list = get_list_static('file_select', $pak_row, ''); $message_uninstall = $lang['Module_delete'] . '<br /><br />' . sprintf($lang['Click_module_delete_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; $message_upgrade = $lang['upgrade_module_pack_explain'] . '<br /><br />' . sprintf($lang['Click_module_upgrade_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $upgrademode) . '">', '</a>') . '<br /><br />'; $message_export = $lang['export_module_pack_explain'] . '<br /><br />' . sprintf($lang['Click_module_export_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $exportmode) . '">', '</a>') . '<br /><br />'; // // Module subpanel - edit // $visible = in_array('adminModule_' . $module_id, $cookie_states); $visible_upgrade = in_array('adminModuleUpgrade_' . $module_id, $cookie_states); $visible_export = in_array('adminModuleExport_' . $module_id, $cookie_states); $visible_uninstall = in_array('adminModuleDelete_' . $module_id, $cookie_states); $template->assign_block_vars('module', array( 'L_TITLE' => $new_module ? $lang['Create_module'] : $lang['Edit_module'], 'L_MODULE' => $lang['Module'], 'VISIBLE' => $visible ? 'block' : 'none', 'VISIBLE_UPGRADE' => $visible_upgrade ? 'block' : 'none', 'VISIBLE_EXPORT' => $visible_export ? 'block' : 'none', 'VISIBLE_DELETE' => $visible_uninstall ? 'block' : 'none', 'IMG_URL' => $visible ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', 'IMG_URL_UPGRADE' => $visible_upgrade ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', 'IMG_URL_EXPORT' => $visible_export ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', 'IMG_URL_DELETE' => $visible_uninstall ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', 'U_MODULE' => append_sid("admin_mx_module_cp.$phpEx" . $settingmode), 'MODULE_ID' => $module_id, 'MODULE_TITLE' => $new_module ? $lang['Create_module'] : $module_rows[$module_count]['module_name'], 'MODULE_DESCRIPTION' => ( $module_rows[$module_count]['module_desc'] != '' ) ? ' - ' . $module_rows[$module_count]['module_desc'] : '', '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'], 'E_MODULE_PATH' => $module_rows[$module_count]['module_path'], 'E_MODULE_INCLUDE_CHECK_OPT' => $check_opt, // Quick Panels 'MESSAGE_UPGRADE' => $message_upgrade, 'MESSAGE_EXPORT' => $message_export, 'MESSAGE_DELETE' => $message_uninstall, 'S_SUBMIT' => $new_module ? $lang['Create_module'] : $lang['Update'], 'S_HIDDEN_FIELDS' => $s_hidden_module_fields )); if (!$new_module) { $template->assign_block_vars('module.settings', array()); } } // // Create quick nav box // $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 )); // // Generate Module and Function Page // include_once('./page_header_admin.php'); $template->pparse('body'); include('./page_footer_admin.php'); ?> Index: admin_mx_block.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_block.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_block.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_block.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 24,30 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['Portal - Modules']['Block_admin'] = 'admin/' . $file; ! return; } --- 24,31 ---- if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['2_CP']['2_3_BlockCP'] = 'admin/' . $file; ! ! return; } Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_module.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_module.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_module.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 14,18 **** if (!empty($setmodules)) { $file = basename(__FILE__); ! $module['Portal - Modules']['Module_admin'] = 'admin/' . $file; return; } --- 14,18 ---- if (!empty($setmodules)) { $file = basename(__FILE__); ! $module['2_CP']['2_2_FunctionCP'] = 'admin/' . $file; return; [...1616 lines suppressed...] { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS; ! $sql = "INSERT INTO " . PARAMETER_TABLE . "( function_id, parameter_name, parameter_type, parameter_default, parameter_function ) ! VALUES( " . intval($HTTP_POST_VARS['function_id']) . ", ! '" . str_replace("\'", "''", $HTTP_POST_VARS['parameter_name']) . "', ! '" . str_replace("\'", "''", $HTTP_POST_VARS['parameter_type']) . "', ! '" . str_replace("\'", "''", $HTTP_POST_VARS['parameter_default']) . "', ! '" . str_replace("\'", "''", $HTTP_POST_VARS['parameter_function']) . "' )"; ! if (!$result = $db -> sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert parameter information", "", __LINE__, __FILE__, $sql); } + + $message = $lang['Module_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_module_admin'], "<a href=\"" . append_sid("admin_mx_module.php") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.php?pane=right") . "\">", "</a>"); + mx_message_die(GENERAL_MESSAGE, $message); + } ?> \ No newline at end of file Index: admin_mx_page_setting.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_page_setting.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_page_setting.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_page_setting.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 24,29 **** if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['Portal - General']['Page_Setting'] = 'admin/' . $file; return; } --- 24,30 ---- if( !empty($setmodules) ) { ! $file = basename(__FILE__); ! $module['2_CP']['2_5_PageCP_settings'] = 'admin/' . $file; ! return; } Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/page_header_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_header_admin.php 5 Dec 2005 19:25:26 -0000 1.2 --- page_header_admin.php 5 Dec 2005 22:25:12 -0000 1.3 *************** *** 1,12 **** <?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$ */ --- 1,12 ---- <?php /** ------------------------------------------------------------------------ ! * Subject : mxBB - a fully modular portal and CMS (for phpBB) ! * Author : Jon Ohlsson and the mxBB Team ! * Credits : The phpBB Group & Marc Morisette ! * Copyright : (C) 2002-2005 mxBB Portal ! * Email : jo...@mx... ! * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- + * * $Id$ */ *************** *** 19,26 **** */ - // ================================================================================ - // The following code is based on admin/page_header_admin.php (phpBB 2.0.14) - // ================================================================================ - if ( !defined('IN_PORTAL') ) { --- 19,22 ---- Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/page_footer_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** page_footer_admin.php 5 Dec 2005 19:25:26 -0000 1.3 --- page_footer_admin.php 5 Dec 2005 22:25:12 -0000 1.4 *************** *** 1,12 **** <?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$ */ --- 1,12 ---- <?php /** ------------------------------------------------------------------------ ! * Subject : mxBB - a fully modular portal and CMS (for phpBB) ! * Author : Jon Ohlsson and the mxBB Team ! * Credits : The phpBB Group & Marc Morisette ! * Copyright : (C) 2002-2005 mxBB Portal ! * Email : jo...@mx... ! * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- + * * $Id$ */ *************** *** 19,26 **** */ - // ================================================================================ - // The following code is based on admin/page_footer_admin.php (phpBB 2.0.14) - // ================================================================================ - if ( !defined('IN_PHPBB') ) { --- 19,22 ---- *************** *** 28,33 **** } - global $do_gzip_compress; - // // Show the overall footer. --- 24,27 ---- *************** *** 47,52 **** $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) ); --- 41,46 ---- $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_VERSION : '', ! 'TRANSLATION_INFO' => isset($lang['TRANSLATION_INFO']) ? $lang['TRANSLATION_INFO'] : '', 'EXECUTION_STATS' => $execution_stats) ); Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/pagestart.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pagestart.php 26 May 2005 21:54:08 -0000 1.2 --- pagestart.php 5 Dec 2005 22:25:12 -0000 1.3 *************** *** 1,25 **** <?php ! /*************************************************************************** ! * pagestart.php ! * ------------------- ! * begin : Thursday, Aug 2, 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') ) { die("Hacking attempt"); --- 1,28 ---- <?php ! /** ------------------------------------------------------------------------ ! * Subject : mxBB - a fully modular portal and CMS (for phpBB) ! * Author : Jon Ohlsson and the mxBB Team ! * Credits : The phpBB Group & Marc Morisette ! * Copyright : (C) 2002-2005 mxBB Portal ! * Email : jo...@mx... ! * Project site : www.mxbb-portal.com ! * ------------------------------------------------------------------------- ! * ! * $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. ! */ ! /** ! * mxBB Notes: ! * The BLOCK_EDIT switch makes this file accessible when editing blocks in portal mode. ! */ ! ! if( !defined('IN_PORTAL') ) { die("Hacking attempt"); *************** *** 29,35 **** include_once($mx_root_path . 'extension.inc'); ! include_once($mx_root_path . 'common.'.$phpEx); ! include_once($phpbb_root_path . 'includes/functions_admin.'.$phpEx); ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); // --- 32,42 ---- include_once($mx_root_path . 'extension.inc'); ! 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); // *************** *** 42,65 **** // ! if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid("login.$phpEx?redirect=admin/", true)); } ! else if( $userdata['user_level'] != ADMIN ) { mx_message_die(GENERAL_MESSAGE, $lang['Not_admin']); } ! if ($HTTP_GET_VARS['sid'] != $userdata['session_id']) { ! //mx_redirect(PORTAL_URL . "admin/index.$phpEx?sid=" . $userdata['session_id']); mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } ! if (empty($no_page_header)) { // Not including the pageheader can be neccesarry if META tags are // needed in the calling script. ! include($mx_root_path . 'admin/page_header_admin.'.$phpEx); } --- 49,82 ---- // ! if ( !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid("login.php?redirect=admin/index.$phpEx", true)); } ! ! //if ( !($userdata['user_level'] == ADMIN || $block_edit_auth['auth_edit'] ) ) ! if ( !($userdata['user_level'] == ADMIN) ) { mx_message_die(GENERAL_MESSAGE, $lang['Not_admin']); } ! if( $HTTP_GET_VARS['sid'] != $userdata['session_id'] ) { ! //mx_redirect("index.$phpEx?sid=" . $userdata['session_id']); mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } ! if (!$userdata['session_admin']) { + mx_redirect(append_sid("login.php?redirect=admin/index.$phpEx&admin=1", true)); + } + + + if( empty($no_page_header) ) + { + // // Not including the pageheader can be neccesarry if META tags are // needed in the calling script. ! // ! include($mx_root_path . 'admin/page_header_admin.' . $phpEx); } Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/admin_mx_portal.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_portal.php 5 Dec 2005 19:25:26 -0000 1.2 --- admin_mx_portal.php 5 Dec 2005 22:25:11 -0000 1.3 *************** *** 22,29 **** if( !empty($setmodules) ) { ! $filename = basename(__FILE__); ! $module['Portal - General']['Manage'] = 'admin/' . $filename; ! return; } --- 22,28 ---- if( !empty($setmodules) ) { ! $module['1_General_admin']['1_1_Management'] = 'admin/' . basename(__FILE__); ! return; } |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:21
|
Update of /cvsroot/mxbb/core27x/templates/subSilver/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/core27x/templates/subSilver/images Added Files: contract.gif expand.gif Log Message: Updated - more is backported - some is fixed --- NEW FILE: contract.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: expand.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:25:20
|
Update of /cvsroot/mxbb/core27x/templates/subSilver/images/admin_icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32005/core27x/templates/subSilver/images/admin_icons Added Files: 2105.gif contract.gif expand.gif icon_block.gif icon_dot.gif icon_edit.gif icon_function.gif icon_module.gif icon_page.gif icon_page_column.gif icon_parameter.gif icon_parameter_20.gif icon_search.gif nav_menu.gif script.gif Log Message: Updated - more is backported - some is fixed --- NEW FILE: icon_page_column.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_function.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_parameter_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_block.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_edit.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: expand.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_menu.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 2105.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_module.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: script.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_search.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contract.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_parameter.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_page.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_dot.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Jon O. <jon...@us...> - 2005-12-05 22:24:08
|
Update of /cvsroot/mxbb/core27x/templates/subSilver/images/admin_icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31744/admin_icons Log Message: Directory /cvsroot/mxbb/core27x/templates/subSilver/images/admin_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:44
|
Update of /cvsroot/mxbb/core27x/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/templates/subSilver Modified Files: mx_announce.tpl mx_forum.tpl mx_google.tpl mx_language.tpl mx_online.tpl mx_theme.tpl Log Message: updated Index: mx_google.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_google.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_google.tpl 6 May 2005 06:48:21 -0000 1.1 --- mx_google.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,23 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <!-- Champ de recherche Google --> ! <center> ! <FORM method=GET action="http://www.google.com/search"> ! ! <A HREF="http://www.google.com" target="_blank"> ! <IMG SRC="http://www.google.com/logos/Logo_40wht.gif" border="0" ! ALT="Google" align="absmiddle"></A> ! <INPUT TYPE=text name=q size=25 maxlength=255 value=""> ! <INPUT TYPE=hidden name=hl value=en> ! <INPUT type=submit class="mainoption" name=btnG VALUE="{L_SEARCH}"> ! </FORM> ! </center> ! <!-- Google --> ! </td> ! </tr> ! </table> ! <br clear="all" /> --- 1,14 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <a href="http://www.google.com" target="_blank"><img src="http://www.google.com/logos/Logo_40wht.gif" border="0" alt="Google" title="Google" align="absmiddle" /></a> ! <form method="get" action="http://www.google.com/search"> ! <input class="post" type="text" name="q" size="25" maxlength="255" value="" /> ! <input type="submit" class="mainoption" name="btnG" value="{L_SEARCH}" /> ! </form> ! </td> ! </tr> ! </table> \ No newline at end of file Index: mx_language.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_language.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_language.tpl 6 May 2005 06:48:21 -0000 1.1 --- mx_language.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,36 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" > {L_TITLE} </th> ! </tr> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> ! </tr> ! <!-- BEGIN switch_is_admin --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> ! ! <form method="post" action="{ACTION_URL}"> ! {switch_is_admin.LANG_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_default_lang" value="{L_CHANGE_NOW}" /> ! </form> ! </span></td> ! </tr> ! <!-- END switch_is_admin --> ! <!-- BEGIN switch_is_user --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_user.LANG_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_user_lang" value="{L_CHANGE_NOW}" /> ! </form> ! </span></td> ! </tr> ! <!-- END switch_is_user --> ! </table> ! <br clear="all" /> --- 1,34 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" > {L_TITLE} </th> ! </tr> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> ! </tr> ! <!-- BEGIN switch_is_admin --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_admin.LANG_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_default_lang" value="{L_CHANGE_NOW}" /> ! </form> ! </td> ! </tr> ! <!-- END switch_is_admin --> ! <!-- BEGIN switch_is_user --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_user.LANG_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_user_lang" value="{L_CHANGE_NOW}" /> ! </form> ! </td> ! </tr> ! <!-- END switch_is_user --> ! </table> Index: mx_forum.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_forum.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_forum.tpl 6 May 2005 06:48:21 -0000 1.1 --- mx_forum.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,5 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th colspan="2" class="thCornerL" nowrap="nowrap"> {L_FORUM} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_TOPICS} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_POSTS} </th> --- 1,5 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th colspan="2" class="thCornerL" height="25" nowrap="nowrap"> {L_FORUM} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_TOPICS} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_POSTS} </th> *************** *** 7,16 **** </tr> <!-- BEGIN catrow --> ! <tr> <td class="catLeft" colspan="2" height="28"><span class="cattitle"><a href="{catrow.U_VIEWCAT}" class="cattitle">{catrow.CAT_DESC}</a></span></td> <td class="rowpic" colspan="3" align="right"> </td> </tr> <!-- BEGIN forumrow --> ! <tr> <td class="row1" align="center" valign="middle" height="50"><img src="{U_PHPBB_ROOT_PATH}{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> --- 7,16 ---- </tr> <!-- BEGIN catrow --> ! <tr> <td class="catLeft" colspan="2" height="28"><span class="cattitle"><a href="{catrow.U_VIEWCAT}" class="cattitle">{catrow.CAT_DESC}</a></span></td> <td class="rowpic" colspan="3" align="right"> </td> </tr> <!-- BEGIN forumrow --> ! <tr> <td class="row1" align="center" valign="middle" height="50"><img src="{U_PHPBB_ROOT_PATH}{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td> <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> *************** *** 25,29 **** </table> ! <table width="{BLOCK_SIZE}" cellspacing="0" border="0" align="center" cellpadding="2"> <tr> <td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td> --- 25,29 ---- </table> ! <table width="100%" cellspacing="0" border="0" align="center" cellpadding="2"> <tr> <td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td> *************** *** 46,49 **** </tr> </table> - - <br clear="all" /> --- 46,47 ---- Index: mx_online.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_online.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_online.tpl 6 May 2005 06:48:21 -0000 1.1 --- mx_online.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,15 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_WHO_IS_ONLINE} </th> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" rowspan="2"><a href="{U_VIEWONLINE}" class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" border="0" /></a></td> ! <td class="row1" align="left" width="100%"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span> ! </td> ! </tr> ! <tr> ! <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td> ! </tr> </table> - <br clear="all" /> - --- 1,12 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_WHO_IS_ONLINE} </th> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" rowspan="2"><a href="{U_VIEWONLINE}" class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" border="0" /></a></td> ! <td class="row1" align="left" width="100%"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span></td> ! </tr> ! <tr> ! <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td> ! </tr> </table> Index: mx_theme.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_theme.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_theme.tpl 6 May 2005 06:48:21 -0000 1.1 --- mx_theme.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,36 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" > {L_TITLE} </th> ! </tr> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> ! </tr> ! <!-- BEGIN switch_is_admin --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> ! ! <form method="post" action="{ACTION_URL}"> ! {switch_is_admin.STYLE_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_default_theme" value="{L_CHANGE_NOW}" /> ! </form> ! </span></td> ! </tr> ! <!-- END switch_is_admin --> ! <!-- BEGIN switch_is_user --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_user.STYLE_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_user_theme" value="{L_CHANGE_NOW}" /> ! </form> ! </span></td> ! </tr> ! <!-- END switch_is_user --> ! </table> ! <br clear="all" /> --- 1,34 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thHead" align="left" > {L_TITLE} </th> ! </tr> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> ! </tr> ! <!-- BEGIN switch_is_admin --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_admin.STYLE_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_default_theme" value="{L_CHANGE_NOW}" /> ! </form> ! </td> ! </tr> ! <!-- END switch_is_admin --> ! <!-- BEGIN switch_is_user --> ! <tr> <td class="row1" align="center" valign="middle" height="28"><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> ! </tr> ! <tr> ! <td class="row1" align="center" valign="middle" height="28"> ! <form method="post" action="{ACTION_URL}"> ! {switch_is_user.STYLE_SELECT} <br /> ! <input type="submit" class="mainoption" name="change_user_theme" value="{L_CHANGE_NOW}" /> ! </form> ! </td> ! </tr> ! <!-- END switch_is_user --> ! </table> Index: mx_announce.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/mx_announce.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_announce.tpl 6 May 2005 06:48:20 -0000 1.1 --- mx_announce.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,33 **** <!-- BEGIN postrow --> ! <table width="{BLOCK_SIZE}" border="0" cellpadding="4" cellspacing="0" class="forumline"> ! <tr> ! <th class="thHead" align="left"> {postrow.TITLE} </th> </tr> - <tr> - <td class="row1" colspan="3"> - <table cellSpacing="0" cellPadding="4" width="100%" border="0"> - <tbody> - <tr> - <td class="row1"><A href="{postrow.U_URL}"> - <img alt="{postrow.TITLE}" hspace="5" src="{postrow.IMAGE}" align="right" vspace="5" border="1"></a> - <a href="{postrow.U_URL}"><b>{postrow.TITLE}</b></a><br><font - size=-1><span class="postbody">{postrow.MESSAGE}</span></font></td></tr></tbody></table> - </td> - </tr> - <tr> - <td class="row1" width="100%" valign="top" colspan="3"> - <table width="100%" border="0" cellspacing="1" cellpadding="0"> - <tr> - <td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_AUTHOR} <a href="{U_PHPBB_ROOT_PATH}profile.php?mode=viewprofile&u={postrow.POSTER_ID}">{postrow.POSTER_NAME}</a></span></td> - <td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_POSTED} <br /> {postrow.FIRST_POST_TIME}</span></td> - <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_REPLIES} <br /> {postrow.REPLIES}</span></td> - <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_VIEWS} <br /> {postrow.VIEWS}</span></td> - <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_LASTPOST} <br /> {postrow.LAST_POST_TIME}{postrow.LAST_POST_AUTHOR} {postrow.LAST_POST_IMG}</span></td> - </tr> - </table></td> - </tr> - </table> <br clear="all" /> <!-- END postrow --> - --- 1,44 ---- <!-- BEGIN postrow --> ! <table width="100%" border="0" cellpadding="1" cellspacing="0" class="forumline"> ! <tr> ! <th class="thHead" align="left"> {postrow.TITLE} </th> ! </tr> ! <tr> ! <td class="row1"> ! <table width="100%" border="0" cellpadding="2" cellspacing="1"> ! <tbody> ! <tr> ! <td class="row1"> ! <p> ! <a href="{postrow.U_TOPIC_URL}"> ! <img src="{postrow.IMAGE}" align="right" hspace="5" vspace="5" border="1" title="{postrow.TITLE}" alt="{postrow.TITLE}" /> ! </a> ! <a href="{postrow.U_LAST_POST_URL}" class="topictitle"> ! <img src="{postrow.FOLDER_IMG}" width="19" height="18" ! alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" ! border="0" align="absmiddle" /></a> ! <a href="{postrow.U_TOPIC_URL}" class="topictitle">{postrow.TITLE}</a> ! </p> ! <span class="postbody">{postrow.MESSAGE}</span> ! </td> ! </tr> ! </tbody> ! </table> ! </td> ! </tr> ! <tr> ! <td class="row1" width="100%" valign="top"> ! <table width="100%" border="0" cellpadding="2" cellspacing="1"> ! <tr> ! <td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_AUTHOR}: <a href="{postrow.U_PROFILE_POSTER}">{postrow.POSTER_NAME}</a></span></td> ! <td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_POSTED}:<br />{postrow.FIRST_POST_TIME}</span></td> ! <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_REPLIES}:<br />{postrow.REPLIES}</span></td> ! <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_VIEWS}:<br />{postrow.VIEWS}</span></td> ! <td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_LASTPOST}:<br />{postrow.LAST_POST_TIME} {postrow.LAST_POST_AUTHOR} {postrow.LAST_POST_IMG}</span></td> ! </tr> ! </table> ! </td> </tr> </table> <br clear="all" /> <!-- END postrow --> |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:38
|
Update of /cvsroot/mxbb/core27x/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/templates/subSilver/admin Modified Files: mx_page_admin_edit.tpl page_footer.tpl page_header.tpl Removed Files: admin_mx_poll.tpl mx_announcement_admin.tpl mx_auth_portal_body.tpl mx_language_body.tpl Log Message: updated --- mx_auth_portal_body.tpl DELETED --- --- mx_announcement_admin.tpl DELETED --- --- mx_language_body.tpl DELETED --- Index: page_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/page_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header.tpl 6 May 2005 06:48:12 -0000 1.1 --- page_header.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 3,226 **** <head> {META} ! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> ! <!-- link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_HEAD_STYLESHEET}" type="text/css" --> ! <style type="text/css"> ! <!-- ! ! /* ! The original subSilver Theme for phpBB version 2+ ! Created by subBlue design ! http://www.subBlue.com ! ! NOTE: These CSS definitions are stored within the main page body so that you can use the phpBB2 ! theme administration centre. When you have finalised your style you could cut the final CSS code ! and place it in an external file, deleting this section to save bandwidth. ! */ ! ! ! /* General page style. The scroll bar colours only visible in IE5.5+ */ ! body { ! background-color: {T_BODY_BGCOLOR}; ! scrollbar-face-color: {T_TR_COLOR2}; ! scrollbar-highlight-color: {T_TD_COLOR2}; ! scrollbar-shadow-color: {T_TR_COLOR2}; ! scrollbar-3dlight-color: {T_TR_COLOR3}; ! scrollbar-arrow-color: {T_BODY_LINK}; ! scrollbar-track-color: {T_TR_COLOR1}; ! scrollbar-darkshadow-color: {T_TH_COLOR1}; ! } ! ! /* General font families for common tags */ ! font,th,td,p { font-family: {T_FONTFACE1} } ! p, td { font-size : {T_FONTSIZE2}; color : {T_BODY_TEXT}; } ! a:link,a:active,a:visited { color : {T_BODY_LINK}; } ! a:hover { text-decoration: underline; color : {T_BODY_HLINK}; } ! hr { height: 0px; border: solid {T_TR_COLOR3} 0px; border-top-width: 1px;} ! h1,h2 { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;} ! ! ! /* This is the border line & background colour round the entire page */ ! .bodyline { background-color: {T_TD_COLOR2}; border: 1px {T_TH_COLOR1} solid; } ! ! /* This is the outline round the main forum tables */ ! .forumline { background-color: {T_TD_COLOR2}; border: 2px {T_TH_COLOR2} solid; } ! ! ! /* Main table cell colours and backgrounds */ ! td.row1 { background-color: {T_TR_COLOR1}; } ! td.row2 { background-color: {T_TR_COLOR2}; } ! td.row3 { background-color: {T_TR_COLOR3}; } ! ! ! /* ! This is for the table cell above the Topics, Post & Last posts on the index.php page ! By default this is the fading out gradiated silver background. ! However, you could replace this with a bitmap specific for each forum ! */ ! td.rowpic { ! background-color: {T_TD_COLOR2}; ! background-image: url({U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/{T_TH_CLASS3}); ! background-repeat: repeat-y; ! } ! ! /* Header cells - the blue and silver gradient backgrounds */ ! th { ! color: {T_FONTCOLOR3}; font-size: {T_FONTSIZE2}px; font-weight : bold; ! background-color: {T_BODY_LINK}; height: 25px; ! background-image: url({U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/{T_TH_CLASS2}); ! } ! ! td.cat,td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { ! background-image: url({U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_TH_CLASS1}); ! background-color:{T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid; height: 28px; ! } ! ! ! /* ! Setting additional nice inner borders for the main table cells. ! The names indicate which sides the border will be on. ! Don't worry if you don't understand this, just ignore it :-) ! */ ! td.cat,td.catHead,td.catBottom { ! height: 29px; ! border-width: 0px 0px 0px 0px; ! } ! th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR { ! font-weight: bold; border: {T_TD_COLOR2}; border-style: solid; height: 28px; } ! td.row3Right,td.spaceRow { ! background-color: {T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid; } ! ! th.thHead,td.catHead { font-size: {T_FONTSIZE3}px; border-width: 1px 1px 0px 1px; } ! th.thSides,td.catSides,td.spaceRow { border-width: 0px 1px 0px 1px; } ! th.thRight,td.catRight,td.row3Right { border-width: 0px 1px 0px 0px; } ! th.thLeft,td.catLeft { border-width: 0px 0px 0px 1px; } ! th.thBottom,td.catBottom { border-width: 0px 1px 1px 1px; } ! th.thTop { border-width: 1px 0px 0px 0px; } ! th.thCornerL { border-width: 1px 0px 0px 1px; } ! th.thCornerR { border-width: 1px 1px 0px 0px; } ! ! ! /* The largest text used in the index page title and toptic title etc. */ ! .maintitle { ! font-weight: bold; font-size: 22px; font-family: "{T_FONTFACE2}",{T_FONTFACE1}; ! text-decoration: none; line-height : 120%; color : {T_BODY_TEXT}; ! } ! ! ! /* General text */ ! .gen { font-size : {T_FONTSIZE3}px; } ! .genmed { font-size : {T_FONTSIZE2}px; } ! .gensmall { font-size : {T_FONTSIZE1}px; } ! .gen,.genmed,.gensmall { color : {T_BODY_TEXT}; } ! a.gen,a.genmed,a.gensmall { color: {T_BODY_LINK}; text-decoration: none; } ! a.gen:hover,a.genmed:hover,a.gensmall:hover { color: {T_BODY_HLINK}; text-decoration: underline; } ! ! ! /* The register, login, search etc links at the top of the page */ ! .mainmenu { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT} } ! a.mainmenu { text-decoration: none; color : {T_BODY_LINK}; } ! a.mainmenu:hover{ text-decoration: underline; color : {T_BODY_HLINK}; } ! ! ! /* Forum category titles */ ! .cattitle { font-weight: bold; font-size: {T_FONTSIZE3}px ; letter-spacing: 1px; color : {T_BODY_LINK}} ! a.cattitle { text-decoration: none; color : {T_BODY_LINK}; } ! a.cattitle:hover{ text-decoration: underline; } ! ! ! /* Forum title: Text and link to the forums used in: index.php */ ! .forumlink { font-weight: bold; font-size: {T_FONTSIZE3}px; color : {T_BODY_LINK}; } ! a.forumlink { text-decoration: none; color : {T_BODY_LINK}; } ! a.forumlink:hover{ text-decoration: underline; color : {T_BODY_HLINK}; } ! ! ! /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ ! .nav { font-weight: bold; font-size: {T_FONTSIZE2}px; color : {T_BODY_TEXT};} ! a.nav { text-decoration: none; color : {T_BODY_LINK}; } ! a.nav:hover { text-decoration: underline; } ! ! ! ! /* Name of poster in viewmsg.php and viewtopic.php and other places */ ! .name { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT};} ! ! /* Location, number of posts, post date etc */ ! .postdetails { font-size : {T_FONTSIZE1}px; color : {T_BODY_TEXT}; } ! ! ! /* The content of the posts (body of text) */ ! .postbody { font-size : {T_FONTSIZE3}px; line-height: 18px} ! a.postlink:link { text-decoration: none; color : {T_BODY_LINK} } ! a.postlink:visited { text-decoration: none; color : {T_BODY_VLINK}; } ! a.postlink:hover { text-decoration: underline; color : {T_BODY_HLINK}} ! ! ! /* Quote & Code blocks */ ! .code { ! font-family: {T_FONTFACE3}; font-size: {T_FONTSIZE2}px; color: {T_FONTCOLOR2}; ! background-color: {T_TD_COLOR1}; border: {T_TR_COLOR3}; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px ! } ! ! .quote { ! font-family: {T_FONTFACE1}; font-size: {T_FONTSIZE2}px; color: {T_FONTCOLOR1}; line-height: 125%; ! background-color: {T_TD_COLOR1}; border: {T_TR_COLOR3}; border-style: solid; ! border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px ! } ! ! ! /* Copyright and bottom info */ ! .copyright { font-size: {T_FONTSIZE1}px; font-family: {T_FONTFACE1}; color: {T_FONTCOLOR1}; letter-spacing: -1px;} ! a.copyright { color: {T_FONTCOLOR1}; text-decoration: none;} ! a.copyright:hover { color: {T_BODY_TEXT}; text-decoration: underline;} ! ! ! /* Form elements */ ! input,textarea, select { ! color : {T_BODY_TEXT}; ! font: normal {T_FONTSIZE2}px {T_FONTFACE1}; ! border-color : {T_BODY_TEXT}; ! } ! ! /* The text input fields background colour */ ! input.post, textarea.post, select { ! background-color : {T_TD_COLOR2}; ! } ! ! input { text-indent : 2px; } ! ! /* The buttons used for bbCode styling in message post */ ! input.button { ! background-color : {T_TR_COLOR1}; ! color : {T_BODY_TEXT}; ! font-size: {T_FONTSIZE2}px; font-family: {T_FONTFACE1}; ! } ! ! /* The main submit button option */ ! input.mainoption { ! background-color : {T_TD_COLOR1}; ! font-weight : bold; ! } ! ! /* None-bold submit button */ ! input.liteoption { ! background-color : {T_TD_COLOR1}; ! font-weight : normal; ! } ! ! /* This is the line in the posting page which shows the rollover ! help line. This is actually a text box, but if set to be the same ! colour as the background no one will know ;) ! */ ! .helpline { background-color: {T_TR_COLOR2}; border-style: none; } ! ! ! /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ ! @import url("{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}formIE.css"); ! --> ! </style> <title>{SITENAME} - {L_MX_ADMIN}</title> </head> <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> ! ! <a name="top"></a> --- 3,13 ---- <head> {META} ! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> ! <!-- First load standard template *.css definition, located in the the phpbb template folder --> ! <link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_HEAD_STYLESHEET}" type="text/css" /> ! <!-- Then load addon template *.css definition for mx, located in the the portal template folder --> ! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}mx_addon.css" type="text/css" /> <title>{SITENAME} - {L_MX_ADMIN}</title> </head> <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> ! <a name="top"></a> \ No newline at end of file --- admin_mx_poll.tpl DELETED --- Index: page_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/page_footer.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_footer.tpl 6 May 2005 06:48:12 -0000 1.1 --- page_footer.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,3 **** - <!-- --- 1,2 ---- *************** *** 17,22 **** //--> ! <div align="center"><span class="copyright">Powered by <a href="http://www.mx-system.com/" target="_mx-system" class="copyright">MX-System</a> {MX_VERSION} © 2001, 2005 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2005 phpBB Group<br />{TRANSLATION_INFO}</span></div> ! </body> </html> \ No newline at end of file --- 16,22 ---- //--> ! <div align="center"><span class="copyright">Powered by <a href="http://www.mx-system.com/" target="_mx-system" class="copyright">mxBB-Portal</a> {MX_VERSION} © 2001, 2005 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2005 phpBB Group</span></div> ! <!-- This displays generation info at the bottom of the page --> ! {EXECUTION_STATS} </body> </html> \ No newline at end of file Index: mx_page_admin_edit.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/templates/subSilver/admin/mx_page_admin_edit.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_page_admin_edit.tpl 6 May 2005 06:48:12 -0000 1.1 --- mx_page_admin_edit.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,3 **** ! <br /> <form method="post" action="{S_ACTION}"><table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> --- 1,7 ---- ! ! <h1>{L_TITLE}</h1> ! ! <p>{L_EXPLAIN}</p> ! <form method="post" action="{S_ACTION}"><table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> <tr> |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:37
|
Update of /cvsroot/mxbb/core27x/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/modules/mx_textblocks/admin Removed Files: admin_edit.php Log Message: updated --- admin_edit.php DELETED --- |
|
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); // |
Update of /cvsroot/mxbb/core27x/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/includes Modified Files: mx_auth.php mx_cache.php mx_constants.php mx_form.php mx_functions.php mx_functions_ch.php mx_functions_phpbb.php page_header.php template.php Log Message: updated Index: mx_functions_ch.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_functions_ch.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_ch.php 6 May 2005 06:47:58 -0000 1.1 --- mx_functions_ch.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 20,23 **** --- 20,28 ---- ***************************************************************************/ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + // // This code is part of common.php in Categories Hierarchy 2.1.0 Index: mx_cache.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_cache.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_cache.php 26 May 2005 21:54:08 -0000 1.1 --- mx_cache.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 20,23 **** --- 20,28 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + // -------------------------------------------------------------------------------- // Class: mx_cache Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_constants.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_constants.php 26 May 2005 21:54:08 -0000 1.2 --- mx_constants.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,22 **** <?php ! /*************************************************************************** ! * mx_constants.php ! * ------------------- ! * begin : May, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $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,21 ---- <?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. + */ if ( !defined('IN_PORTAL') ) *************** *** 27,46 **** // Page numbers for session handling ! define('PAGE_FORUM' , -20); ! define('PAGE_ADS' , -21); ! define('PAGE_WELCOME' , -23); ! define('PAGE_LAST_MSG' , -24); ! define('PAGE_WELCOME_ADMIN', -25); ! define('PAGE_POLL' , -26); ! define('PAGE_URL' , -27); ! define('PAGE_NEWS' , -37); ! define('PAGE_MENU_NAV' , -29); ! define('PAGE_MENU_ADMIN', -31); ! define('PAGE_MODULE_ADMIN', -32); ! define('PAGE_PORTAL_ADMIN', -33); ! define('PAGE_META_ADMIN' , -34); ! define('PAGE_ADS_ADMIN' , -35); ! define('PAGE_ANNOUNCEMENT', -36); define('PAGE_ANNOUNCEMENT_ADMIN' , -35); --- 26,45 ---- // Page numbers for session handling ! define('PAGE_FORUM' , -20); ! define('PAGE_ADS' , -21); ! define('PAGE_WELCOME' , -23); ! define('PAGE_LAST_MSG' , -24); ! define('PAGE_WELCOME_ADMIN' , -25); ! define('PAGE_POLL' , -26); ! define('PAGE_URL' , -27); ! define('PAGE_NEWS' , -37); ! define('PAGE_MENU_NAV' , -29); ! define('PAGE_MENU_ADMIN' , -31); ! define('PAGE_MODULE_ADMIN' , -32); ! define('PAGE_PORTAL_ADMIN' , -33); ! define('PAGE_META_ADMIN' , -34); ! define('PAGE_ADS_ADMIN' , -35); ! define('PAGE_ANNOUNCEMENT' , -36); define('PAGE_ANNOUNCEMENT_ADMIN' , -35); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_functions_phpbb.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_phpbb.php 26 May 2005 21:54:08 -0000 1.1 --- mx_functions_phpbb.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 33,36 **** --- 33,41 ---- */ + if ( !defined('IN_PORTAL') ) + { + die("Hacking attempt"); + } + // // Hacking smilies_pass from phpbb/includes/bbcode.php Index: mx_auth.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_auth.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_auth.php 26 May 2005 21:54:08 -0000 1.1 --- mx_auth.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 58,61 **** --- 58,67 ---- | lookup \********************************************************************************/ + + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + function block_auth($type, $module_id, $userdata, $f_access = '', $f_access_group = '') { Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/template.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** template.php 26 May 2005 21:54:08 -0000 1.2 --- template.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,14 **** <?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 : * ------------------------------------------------------------------------- - * copyright : (C) 2001 The phpBB Group - * email : su...@ph... * * $Id$ --- 1,11 ---- <?php /** ------------------------------------------------------------------------ ! * subject : mxBB-Portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * project site : www.mx-system.com * * description : * ------------------------------------------------------------------------- * * $Id$ *************** *** 22,25 **** --- 19,39 ---- */ + if ( !defined( 'IN_PORTAL' ) ) + { + die( "Hacking attempt" ); + } + + /********************************************************************************\ + | Class: mx_Template + | The mx_Template class extends the native phpBB Template class, in reality only redefining the make_filename method. + | Thus modded phpBB templates (eg eXtreme Styles MOD) will also be available for mxBB. + | + | + | // + | // Usage examples: + | // + | + | Nothing new... + \********************************************************************************/ // *************** *** 35,39 **** * This is required. Reason is constructors have different method names. */ ! function mx_Template( $root = "." ) { parent::Template($root); --- 49,53 ---- * This is required. Reason is constructors have different method names. */ ! function mx_Template($root = '.') { parent::Template($root); *************** *** 47,108 **** * object. */ ! function make_filename( $filename ) { global $module_root_path, $mx_root_path, $phpbb_root_path, $theme; ! $style_path = $theme['template_name'] . '/'; ! ! // Look at MX-Module folder... ! ! if ( file_exists( $module_root_path . 'templates/' . $style_path . $filename ) ) { $filename = $module_root_path . 'templates/' . $style_path . $filename; } ! else if ( file_exists( $module_root_path . 'templates/subSilver/' . $filename ) ) { $filename = $module_root_path . 'templates/subSilver/' . $filename; } ! else if ( file_exists( $module_root_path . 'templates/' . $filename ) ) { $filename = $module_root_path . 'templates/' . $filename; ! } ! ! // Look at MX-Root folder... ! ! else if ( file_exists( $mx_root_path . 'templates/' . $style_path . $filename ) ) { $filename = $mx_root_path . 'templates/' . $style_path . $filename; } ! else if ( file_exists( $mx_root_path . 'templates/subSilver/' . $filename ) ) { $filename = $mx_root_path . 'templates/subSilver/' . $filename; } ! else if ( file_exists( $mx_root_path . 'templates/' . $filename ) ) { $filename = $mx_root_path . 'templates/' . $filename; } ! else if ( file_exists( $mx_root_path . $this->root . '/' . $filename ) ) { $filename = $mx_root_path . $this->root . '/' . $filename; ! } ! // Look at phpBB-Root folder... ! ! else if ( file_exists( $phpbb_root_path . 'templates/' . $style_path . $filename ) ) { $filename = $phpbb_root_path . 'templates/' . $style_path . $filename; } ! else if ( file_exists( $phpbb_root_path . 'templates/subSilver/' . $filename ) ) { $filename = $phpbb_root_path . 'templates/subSilver/' . $filename; } ! else if ( file_exists( $phpbb_root_path . $this->root . '/' . $filename ) ) { $filename = $phpbb_root_path . $this->root . '/' . $filename; } ! else if ( file_exists( $this->root . '/' . $filename ) ) ! { // Check if it's an absolute or relative path. ! if ( substr( $filename, 0, 1 ) != '/' ) { $filename = ($rp_filename = phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; --- 61,125 ---- * object. */ ! function make_filename($filename) { global $module_root_path, $mx_root_path, $phpbb_root_path, $theme; ! $style_path = $theme['template_name'] . '/'; ! ! // ! // Look at mxBB-Module folder... ! // ! if( file_exists($module_root_path . 'templates/' . $style_path . $filename) ) { $filename = $module_root_path . 'templates/' . $style_path . $filename; } ! else if( file_exists($module_root_path . 'templates/subSilver/' . $filename) ) { $filename = $module_root_path . 'templates/subSilver/' . $filename; } ! else if( file_exists($module_root_path . 'templates/' . $filename) ) { $filename = $module_root_path . 'templates/' . $filename; ! } ! ! // ! // Look at mxBB-Root folder... ! // ! else if( file_exists($mx_root_path . 'templates/' . $style_path . $filename) ) { $filename = $mx_root_path . 'templates/' . $style_path . $filename; } ! else if( file_exists($mx_root_path . 'templates/subSilver/' . $filename) ) { $filename = $mx_root_path . 'templates/subSilver/' . $filename; } ! else if( file_exists($mx_root_path . 'templates/' . $filename) ) { $filename = $mx_root_path . 'templates/' . $filename; } ! else if( file_exists($mx_root_path . $this->root . '/' . $filename) ) { $filename = $mx_root_path . $this->root . '/' . $filename; ! } ! ! // // Look at phpBB-Root folder... ! // ! else if( file_exists($phpbb_root_path . 'templates/' . $style_path . $filename) ) { $filename = $phpbb_root_path . 'templates/' . $style_path . $filename; } ! else if( file_exists($phpbb_root_path . 'templates/subSilver/' . $filename) ) { $filename = $phpbb_root_path . 'templates/subSilver/' . $filename; } ! else if( file_exists($phpbb_root_path . $this->root . '/' . $filename) ) { $filename = $phpbb_root_path . $this->root . '/' . $filename; } ! else if( file_exists($this->root . '/' . $filename) ) ! { // Check if it's an absolute or relative path. ! if( substr($filename, 0, 1) != '/' ) { $filename = ($rp_filename = phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; *************** *** 110,116 **** } ! if ( !file_exists( $filename ) ) { ! die( "Template->make_filename(): Error - file $filename does not exist." ); } --- 127,133 ---- } ! if( !file_exists($filename) ) { ! die("Template->make_filename(): Error - file $filename does not exist."); } Index: mx_form.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_form.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_form.php 6 May 2005 06:47:58 -0000 1.1 --- mx_form.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,66 **** ! <?php ! /*************************************************************************** ! * mx_form.php ! * ------------------- ! * begin : May, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ /* * Form creator * ! */ ! class form { ! var $items; // array containing the data for the form ! var $arrayname; // name of the form array ! function form($items=array()) ! { ! if (!empty($items)) ! { ! $this->items=$items; ! foreach ($items as $item) ! { ! if ($item[0]=="name") ! { ! $this->arrayname=$item[1]; // getting the table name ! $name=true; ! break; ! } ! } ! if (!isset($name)) die("The form hasn't got name parameter"); ! } ! } ! function drawForm() // drawing the input form ! { ! global $template, $lang; ! ! foreach ($this->items as $item) ! { ! $item_label = ''; ! $item_field = ''; ! ! switch ($item[0]) ! { ! case "text": // text form ! $item_label = $item[1]; ! $item_field = '<input type="text" name="' . $this->arrayname . '['. $item[2] . ']" size="' . $item[3] . '" value="' . $item[4] . '" class="post">'; ! break; ! case "textarea": // textarea ! $item_label = $item[1]; ! $item_field = '<textarea name="' . $this->arrayname . '['. $item[2] . ']" class="post" wrap="on" cols="' . $item[3] . '" rows="' . $item[4] . '">' . $item[5] . '</textarea>'; ! break; ! case "password": // password ! $item_label = $item[1]; ! $item_field = '<input type="password" name="' . $this->arrayname . '['. $item[2] . ']" size="' . $item[3] . '" value="' . $item[4] . '" class="post">'; ! /* case "radio": // radio button $item_label = $item[1]; foreach ($item[3] as $key=>$value) --- 1,75 ---- ! <?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 : ! * ------------------------------------------------------------------------- ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! */ /* * Form creator * ! */ ! if ( !defined( 'IN_PORTAL' ) ) ! { ! die( "Hacking attempt" ); ! } ! class form ! { ! var $items; // array containing the data for the form ! var $arrayname; // name of the form array ! ! function form( $items = array() ) ! { ! if ( !empty( $items ) ) ! { ! $this->items = $items; ! foreach ( $items as $item ) ! { ! if ( $item[0] == "name" ) ! { ! $this->arrayname = $item[1]; // getting the table name ! $name = true; ! break; ! } ! } ! if ( !isset( $name ) ) die( "The form hasn't got name parameter" ); ! } ! } ! function drawForm() // drawing the input form ! { ! global $template, $lang; ! foreach ( $this->items as $item ) ! { ! $item_label = ''; ! $item_field = ''; ! switch ( $item[0] ) ! { ! case "text": // text form ! $item_label = $item[1]; ! $item_field = '<input type="text" name="' . $this->arrayname . '[' . $item[2] . ']" size="' . $item[3] . '" value="' . $item[4] . '" class="post">'; ! break; ! case "textarea": // textarea ! $item_label = $item[1]; ! $item_field = '<textarea name="' . $this->arrayname . '[' . $item[2] . ']" class="post" wrap="on" cols="' . $item[3] . '" rows="' . $item[4] . '">' . $item[5] . '</textarea>'; ! break; ! case "password": // password ! $item_label = $item[1]; ! $item_field = '<input type="password" name="' . $this->arrayname . '[' . $item[2] . ']" size="' . $item[3] . '" value="' . $item[4] . '" class="post">'; ! ! /* case "radio": // radio button $item_label = $item[1]; foreach ($item[3] as $key=>$value) *************** *** 75,219 **** } } ! */ ! break; ! case "checkbox": // checkbox button ! $item_label = $item[1]; ! if (isset($item[3])) ! $item_field = '<input type="checkbox" name="' . $this->arrayname . '[' . $item[2] . ']" value="1" checked>'; ! else ! $item_field = '<input type="checkbox" name="' . $this->arrayname . '[' . $item[2] . ']" value="1"'; ! ! break; ! case "select": ! $item_label = $item[1]; ! $item_field = $item[2]; ! ! break; ! case "file": // file upload field ! $item_label = $item[1]; ! $item_field = '<input type="file" name="' . $item[2] . '" size="'.$item[3].'" class="post">'; ! $item_field .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . $config->MaxUploadSize. '">'; ! $item_field .= '<input type="hidden" name="'. $this->arrayname . '[fileupload]" value="' . $item[2] . '">'; ! break; ! case "hidden": // hidden fields ! $item_label = ''; ! $item_field = '<input type="hidden" name="' . $this->arrayname . '['.$item[1].']" value="' . $item[2]. '">'; ! break; ! case "submit": // defining the label for submit button ! $submit=$item[1]; ! $submitname=$item[2]; ! break; ! case "delete": // delete button ! $item_label = $item[1]; ! $item_field = $item[2]; ! break; ! } ! if ( ! empty( $item_field )) ! { ! $template->assign_block_vars("rows", array( ! 'LABEL' => $item_label, ! 'FIELD' => $item_field, ! )); ! } ! } ! ! $template->pparse("body"); ! } ! ! /* If is there a file upload, it has got some extra parameter (e.g. file_type). * These parameter are put here to the main array ! */ ! function preinsert($pairs=array(),$tabla="") ! { ! global $config; ! ! foreach ($pairs as $key=>$value) { ! if ($key=="fileupload") { // special variable containing the prefix of the name of the uploaded file ! $name=$value."_name"; ! $size=$value."_size"; ! $type=$value."_type"; ! $path=$value; ! global $$name,$$size,$$type,$$path; ! if ($$size>$config->MaxUploadSize) { // checking the size of the uploaded file, you must set $config->MaxUploadSize ! printf("The uploaded file is too big. The maximal size is %d byte. <br>Please repeat the upload!",$config->MaxUploadSize); ! $this->drawform(); ! } else { ! // let's put the values of the uploaded image to the main array ! $pairs[file_name]=$$name; ! $pairs[file_size]=$$size; ! $pairs[file_type]=$$type; ! $pairs[file_path]=$$path; ! if (!empty($tabla)) $this->insert($pairs,$tabla); // if you get table name, insert do everything to you ! else return($pairs); // if there's no table, we return with the finished array ! break; ! } ! } ! } ! } ! function insert($pairs,$table) { // method for inserting record to the database ! global $db; ! $sql="INSERT INTO $table ("; ! $first=true; ! foreach ($pairs as $key=>$value) { ! if ($key!="id" || $key!="title" || $key!="submit") { // everything except record ID,title,submit ! if ($first) { ! $value="\"".$value; ! $first=false; ! }else { ! $key=",".$key; ! $value=",\"".$value; ! } ! $fields.=$key; ! $values.=$value."\""; ! } ! } ! $sql.=$fields.") VALUES(".$values.")"; ! if( !$result = $db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql); ! } ! } ! function update($pairs,$table, $key) { // method for updating records in the database ! global $db; ! $sql="UPDATE $table SET "; ! $first=true; ! foreach ($pairs as $key=>$value) { ! if ($key!="id" || $key!="title" || $key!="submit") { // everything except record ID,title,submit ! if ($first) { ! $sql.="$key=\"$value\""; ! $first=false; ! }else { ! $sql.=",$key=\"$value\""; ! } ! } ! } ! $sql.=" WHERE $key = $pairs[$key]"; ! if( !$result = $db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql); ! } ! } ! function delete($id,$table, $key) { // method for deleting record from a table ! global $db; ! $sql="DELETE FROM $table WHERE $key =$id"; ! if( !$result = $db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, "Couldn't delete $table information", "", __LINE__, __FILE__, $sql); ! } ! } ! } ! ?> --- 84,242 ---- } } ! */ ! break; ! case "checkbox": // checkbox button ! $item_label = $item[1]; ! if ( isset( $item[3] ) ) ! $item_field = '<input type="checkbox" name="' . $this->arrayname . '[' . $item[2] . ']" value="1" checked>'; ! else ! $item_field = '<input type="checkbox" name="' . $this->arrayname . '[' . $item[2] . ']" value="1"'; ! break; ! case "select": ! $item_label = $item[1]; ! $item_field = $item[2]; ! break; ! case "file": // file upload field ! $item_label = $item[1]; ! $item_field = '<input type="file" name="' . $item[2] . '" size="' . $item[3] . '" class="post">'; ! $item_field .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . $config->MaxUploadSize . '">'; ! $item_field .= '<input type="hidden" name="' . $this->arrayname . '[fileupload]" value="' . $item[2] . '">'; ! break; ! case "hidden": // hidden fields ! $item_label = ''; ! $item_field = '<input type="hidden" name="' . $this->arrayname . '[' . $item[1] . ']" value="' . $item[2] . '">'; ! break; ! case "submit": // defining the label for submit button ! $submit = $item[1]; ! $submitname = $item[2]; ! break; ! case "delete": // delete button ! $item_label = $item[1]; ! $item_field = $item[2]; ! break; ! } ! if ( ! empty( $item_field ) ) ! { ! $template->assign_block_vars( "rows", array( 'LABEL' => $item_label, ! 'FIELD' => $item_field, ! ) ); ! } ! } ! ! $template->pparse( "body" ); ! } ! ! /* If is there a file upload, it has got some extra parameter (e.g. file_type). * These parameter are put here to the main array ! */ ! function preinsert( $pairs = array(), $tabla = "" ) ! { ! global $config; ! foreach ( $pairs as $key => $value ) ! { ! if ( $key == "fileupload" ) // special variable containing the prefix of the name of the uploaded file ! { ! $name = $value . "_name"; ! $size = $value . "_size"; ! $type = $value . "_type"; ! $path = $value; ! global $$name, $$size, $$type, $$path; ! if ( $$size > $config->MaxUploadSize ) // checking the size of the uploaded file, you must set $config->MaxUploadSize ! { ! printf( "The uploaded file is too big. The maximal size is %d byte. <br>Please repeat the upload!", $config->MaxUploadSize ); ! $this->drawform(); ! } ! else ! { ! // let's put the values of the uploaded image to the main array ! $pairs[file_name] = $$name; ! $pairs[file_size] = $$size; ! $pairs[file_type] = $$type; ! $pairs[file_path] = $$path; ! if ( !empty( $tabla ) ) $this->insert( $pairs, $tabla ); // if you get table name, insert do everything to you ! else return( $pairs ); // if there's no table, we return with the finished array ! break; ! } ! } ! } ! } ! function insert( $pairs, $table ) // method for inserting record to the database ! { ! global $db; ! $sql = "INSERT INTO $table ("; ! $first = true; ! foreach ( $pairs as $key => $value ) ! { ! if ( $key != "id" || $key != "title" || $key != "submit" ) // everything except record ID,title,submit ! { ! if ( $first ) ! { ! $value = "\"" . $value; ! $first = false; ! } ! else ! { ! $key = "," . $key; ! $value = ",\"" . $value; ! } ! $fields .= $key; ! $values .= $value . "\""; ! } ! } ! $sql .= $fields . ") VALUES(" . $values . ")"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql ); ! } ! } ! function update( $pairs, $table, $key ) // method for updating records in the database ! { ! global $db; ! $sql = "UPDATE $table SET "; ! $first = true; ! foreach ( $pairs as $key => $value ) ! { ! if ( $key != "id" || $key != "title" || $key != "submit" ) // everything except record ID,title,submit ! { ! if ( $first ) ! { ! $sql .= "$key=\"$value\""; ! $first = false; ! } ! else ! { ! $sql .= ",$key=\"$value\""; ! } ! } ! } ! $sql .= " WHERE $key = $pairs[$key]"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql ); ! } ! } ! function delete( $id, $table, $key ) // method for deleting record from a table ! { ! global $db; ! $sql = "DELETE FROM $table WHERE $key =$id"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! message_die( GENERAL_ERROR, "Couldn't delete $table information", "", __LINE__, __FILE__, $sql ); ! } ! } ! } + ?> \ No newline at end of file Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/page_header.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** page_header.php 30 Nov 2005 23:50:45 -0000 1.2 --- page_header.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 114,118 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); } --- 114,118 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); } *************** *** 193,197 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } --- 193,197 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } *************** *** 201,205 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); } } --- 201,205 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); } } *************** *** 281,285 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); } --- 281,285 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); } Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/mx_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions.php 26 May 2005 21:54:08 -0000 1.2 --- mx_functions.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 20,23 **** --- 20,28 ---- ***************************************************************************/ + if ( !defined('IN_PORTAL') ) + { + die("Hacking attempt"); + } + /********************************************************************************\ | |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:36
|
Update of /cvsroot/mxbb/core27x/modules/mx_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/modules/mx_statistics Modified Files: mx_statistics.php Log Message: updated Index: mx_statistics.php =================================================================== RCS file: /cvsroot/mxbb/core27x/modules/mx_statistics/mx_statistics.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_statistics.php 6 May 2005 06:48:07 -0000 1.1 --- mx_statistics.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,99 **** <?php ! /*************************************************************************** ! * statistics.php ! * ------------------- ! * begin : Tue February 26 2002 ! * copyright : (C) 2002 Nivisec.com ! * email : ad...@ni... ! * ! * $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') ) { ! define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! ! ! include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.'.$phpEx); ! ! // ! // ! // Start session management ! // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! mx_init_userprefs($userdata); ! // ! // End session management ! // ! $block = FALSE; } else { ! // ! // Read block Configuration ! // ! $block_config = read_block_config( $block_id ); ! ! $title = $block_config[$block_id]['block_title']; ! $block = TRUE; } // ! //Start user modifiable variables // $return_limit = 10; // ! //End user modifiable variables // ! $template->assign_block_vars("switch_view", array()); // ! // End session management // ! ! //Vote Images based on the theme path, (i.e. templates/CURRNT_THEME/ is already inserted) ! $vote_left = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/vote_lcap.gif"; $vote_right = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/vote_rcap.gif"; ! $vote_bar = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/voting_bar.gif"; ! ! ! if ( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx) ) { ! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } else { ! include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx); ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } ! // Do the math :) (i think this is the same method as in philip mayer's statistic's file) // Taken from Acyd Burn. function do_math($firstval, $value, $total, &$percentage, &$bar_percent) { ! $cst = ($firstval > 0) ? 90 / $firstval : 90; ! if ( $value != 0 ) { ! $percentage = ( $total ) ? round( min(100, ($value / $total) * 100)) : 0; } else --- 1,90 ---- <?php ! /** ------------------------------------------------------------------------ ! * subject : mx-portal module ! * 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. ! */ ! if( !defined('IN_PORTAL') ) { ! define('IN_PORTAL', true); ! $mx_root_path = '../../'; ! include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.' . $phpEx); ! // ! // Start session management ! // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! mx_init_userprefs($userdata); ! // ! // End session management ! // ! $is_block = false; } else { ! // ! // Read block Configuration ! // ! $block_config = read_block_config($block_id); ! $title = $block_config[$block_id]['block_title']; ! ! $is_block = true; } // ! // Start user modifiable variables // $return_limit = 10; // ! // End user modifiable variables // ! $template->assign_block_vars('switch_view', array()); // ! // Vote Images based on the theme path, (i.e. templates/CURRNT_THEME/ is already inserted) // ! $vote_left = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/vote_lcap.gif"; $vote_right = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/vote_rcap.gif"; ! $vote_bar = PHPBB_URL . TEMPLATE_ROOT_PATH . "/images/voting_bar.gif"; ! if( file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); } else { ! include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx); ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } ! // // Do the math :) (i think this is the same method as in philip mayer's statistic's file) // Taken from Acyd Burn. + // function do_math($firstval, $value, $total, &$percentage, &$bar_percent) { ! $cst = ( $firstval > 0 ) ? 90 / $firstval : 90; ! if( $value != 0 ) { ! $percentage = ( $total ) ? round(min(100, ( $value / $total ) * 100)) : 0; } else *************** *** 106,135 **** $template->set_filenames(array( ! "body" => "mx_statistics.tpl") ); $template->assign_vars(array( ! "GRAPH_IMAGE" => $graph_image, ! "L_ADMIN_STATISTICS" => $lang['Admin_Stats'], ! "L_TOP_SMILIES" => $lang['Top_Smilies'], ! "L_MOST_ACTIVE" => $lang['Most_Active_Topics'], ! "L_MOST_VIEWED" => $lang['Most_Viewed_Topics'], ! "L_TOP_POSTERS" => $lang['Top_Posting_Users'], ! "L_USES" => $lang['Uses'], ! "L_RANK" => $lang['Rank'], ! "L_PERCENTAGE" => $lang['Percent'], ! "L_GRAPH" => $lang['Graph'], ! "L_REPLIES" => $lang['Replies'], ! "L_TOPIC" => $lang['Topic'], ! "L_VIEWS" => $lang['Views'], ! "L_USERNAME" => $lang['Username'], ! "L_POSTS" => $lang['Posts'], ! "L_STATISTIC" => $lang['Statistic'], ! "L_VALUE" => $lang['Value'], ! "L_IMAGE" => $lang['smiley_url'], ! "L_CODE" => $lang['smiley_code'], ! "PAGE_NAME" => $lang['Statistics']) ); --- 97,126 ---- $template->set_filenames(array( ! 'body' => 'mx_statistics.tpl') ); $template->assign_vars(array( ! "GRAPH_IMAGE" => $graph_image, ! "L_ADMIN_STATISTICS" => $lang['Admin_Stats'], ! "L_TOP_SMILIES" => $lang['Top_Smilies'], ! "L_MOST_ACTIVE" => $lang['Most_Active_Topics'], ! "L_MOST_VIEWED" => $lang['Most_Viewed_Topics'], ! "L_TOP_POSTERS" => $lang['Top_Posting_Users'], ! "L_USES" => $lang['Uses'], ! "L_RANK" => $lang['Rank'], ! "L_PERCENTAGE" => $lang['Percent'], ! "L_GRAPH" => $lang['Graph'], ! "L_REPLIES" => $lang['Replies'], ! "L_TOPIC" => $lang['Topic'], ! "L_VIEWS" => $lang['Views'], ! "L_USERNAME" => $lang['Username'], ! "L_POSTS" => $lang['Posts'], ! "L_STATISTIC" => $lang['Statistic'], ! "L_VALUE" => $lang['Value'], ! "L_IMAGE" => $lang['smiley_url'], ! "L_CODE" => $lang['smiley_code'], ! "PAGE_NAME" => $lang['Statistics']) ); *************** *** 139,143 **** $auth_data_sql_stats = get_auth_forum(); - // // Getting voting bar info from template --- 130,133 ---- *************** *** 149,175 **** $style = $userdata['user_style']; if( !$theme ) ! $style = $board_config['default_style']; } else ! $style = $board_config['default_style']; } else ! $style = $board_config['default_style']; - $sql = "SELECT * FROM " . THEMES_TABLE . " WHERE themes_id = $style"; ! if(!$result = $db->sql_query($sql)) { ! message_die(CRITICAL_ERROR, "Couldn't query database for theme info."); } ! if( !$row = $db->sql_fetchrow($result) ) { ! message_die(CRITICAL_ERROR, "Couldn't get theme data for themes_id=$style."); } $template->assign_vars(array( ! "LEFT_GRAPH_IMAGE" => $vote_left, ! "RIGHT_GRAPH_IMAGE" => $vote_right, ! "GRAPH_IMAGE" => $vote_bar) ); --- 139,171 ---- $style = $userdata['user_style']; if( !$theme ) ! { ! $style = $board_config['default_style']; ! } } else ! { ! $style = $board_config['default_style']; ! } } else ! { ! $style = $board_config['default_style']; ! } ! $sql = "SELECT * FROM " . THEMES_TABLE . " WHERE themes_id = $style"; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(CRITICAL_ERROR, "Couldn't query database for theme info."); } ! if( !($row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, "Couldn't get theme data for themes_id=$style."); } $template->assign_vars(array( ! "LEFT_GRAPH_IMAGE" => $vote_left, ! "RIGHT_GRAPH_IMAGE" => $vote_right, ! "GRAPH_IMAGE" => $vote_bar) ); *************** *** 177,187 **** // Top posters SQL // ! $sql = "SELECT user_id, username, user_posts FROM " . USERS_TABLE . " WHERE user_id <> " . ANONYMOUS . " AND user_posts > 0 ! ORDER BY user_posts DESC ! LIMIT " . $return_limit; ! if (!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql); } --- 173,185 ---- // Top posters SQL // ! $sql = "SELECT user_id, username, user_posts ! FROM " . USERS_TABLE . " ! WHERE user_id <> " . ANONYMOUS . " AND user_posts > 0 ! ORDER BY user_posts DESC ! LIMIT " . $return_limit; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql); } *************** *** 193,208 **** $firstcount = $user_data[0]['user_posts']; ! for ($i = 0; $i < $user_count; $i++) { ! do_math($firstcount, $user_data[$i]['user_posts'], get_db_stat('postcount'), $percentage, $bar_percent); ! $template->assign_block_vars("users", array( ! "RANK" => $i+1, ! "CLASS" => ( !($i+1 % 2) ) ? $theme['td_class2'] : $theme['td_class1'], ! "USERNAME" => $user_data[$i]['username'], ! "PERCENTAGE" => $percentage, ! "BAR" => $bar_percent, ! "URL" => append_sid( PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id'] ), ! "POSTS" => $user_data[$i]['user_posts']) ); } --- 191,206 ---- $firstcount = $user_data[0]['user_posts']; ! for( $i = 0; $i < $user_count; $i++ ) { ! do_math($firstcount, $user_data[$i]['user_posts'], get_db_stat( 'postcount' ), $percentage, $bar_percent); ! $template->assign_block_vars('users', array( ! "RANK" => $i + 1, ! "CLASS" => ( !( $i + 1 % 2 ) ) ? $theme['td_class2'] : $theme['td_class1'], ! "USERNAME" => $user_data[$i]['username'], ! "PERCENTAGE" => $percentage, ! "BAR" => $bar_percent, ! "URL" => append_sid(PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id']), ! "POSTS" => $user_data[$i]['user_posts']) ); } *************** *** 212,238 **** // $sql = "SELECT topic_id, topic_title, topic_replies ! FROM " . TOPICS_TABLE ." ! WHERE forum_id IN ( $auth_data_sql_stats ) ! AND topic_status <> 2 ! AND topic_replies > 0 ! ORDER BY topic_replies DESC ! LIMIT " . $return_limit; ! if (!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't retrieve topic data", "", __LINE__, __FILE__, $sql); } $topic_data = $db->sql_fetchrowset($result); ! for ($i = 0; $i < count($topic_data); $i++) { ! ! $template->assign_block_vars("topicreplies", array( ! "RANK" => $i+1, ! "CLASS" => ( !($i+1 % 2) ) ? $theme['td_class2'] : $theme['td_class1'], ! "TITLE" => $topic_data[$i]['topic_title'], ! "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => append_sid( PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } --- 210,235 ---- // $sql = "SELECT topic_id, topic_title, topic_replies ! FROM " . TOPICS_TABLE . " ! WHERE forum_id IN ( $auth_data_sql_stats ) ! AND topic_status <> 2 ! AND topic_replies > 0 ! ORDER BY topic_replies DESC ! LIMIT " . $return_limit; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve topic data", "", __LINE__, __FILE__, $sql); } $topic_data = $db->sql_fetchrowset($result); ! for( $i = 0; $i < count($topic_data); $i++ ) { ! $template->assign_block_vars('topicreplies', array( ! "RANK" => $i + 1, ! "CLASS" => ( !( $i + 1 % 2 ) ) ? $theme['td_class2'] : $theme['td_class1'], ! "TITLE" => $topic_data[$i]['topic_title'], ! "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } *************** *** 243,396 **** $rank = 0; $sql = "SELECT topic_id, topic_title, topic_views ! FROM " . TOPICS_TABLE ." ! WHERE forum_id IN ( $auth_data_sql_stats ) ! AND topic_status <> 2 ! AND topic_views > 0 ! ORDER BY topic_views DESC ! LIMIT " . $return_limit; ! if (!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't retrieve topic data", "", __LINE__, __FILE__, $sql); } $topic_data = $db->sql_fetchrowset($result); ! for ($i = 0; $i < count($topic_data); $i++) { ! $template->assign_block_vars("topicviews", array( ! "RANK" => $i+1, ! "CLASS" => ( !($i+1 % 2) ) ? $theme['td_class2'] : $theme['td_class1'], ! "TITLE" => $topic_data[$i]['topic_title'], ! "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => append_sid( PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } // ! // Get forum statistics (taken from admin panel) // ! $total_posts = get_db_stat('postcount'); ! $total_users = get_db_stat('usercount'); ! $total_topics = get_db_stat('topiccount'); ! $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); ! $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; ! $posts_per_day = sprintf("%.2f", $total_posts / $boarddays); ! $topics_per_day = sprintf("%.2f", $total_topics / $boarddays); ! $users_per_day = sprintf("%.2f", $total_users / $boarddays); ! $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path'])) ! { ! while( $file = @readdir($avatar_dir) ) { ! if( $file != "." && $file != ".." ) { ! $avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file); } - } - @closedir($avatar_dir); - // - // This bit of code translates the avatar directory size into human readable format - // Borrowed the code from the PHP.net annoted manual, origanally written by: - // Jesse (je...@je...) - // - if($avatar_dir_size >= 1048576) - { - $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; - } - else if($avatar_dir_size >= 1024) - { - $avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB"; } else { ! $avatar_dir_size = $avatar_dir_size . " Bytes"; } ! } ! else ! { ! // Couldn't open Avatar dir. ! $avatar_dir_size = $lang['Not_available']; ! } ! ! if($posts_per_day > $total_posts) ! { ! $posts_per_day = $total_posts; ! } ! ! if($topics_per_day > $total_topics) ! { ! $topics_per_day = $total_topics; ! } ! if($users_per_day > $total_users) ! { ! $users_per_day = $total_users; ! } ! // ! // DB size ... MySQL only ! // ! // This code is heavily influenced by a similar routine ! // in phpMyAdmin 2.2.0 ! // ! if( preg_match("/^mysql/", SQL_LAYER) ) ! { ! $sql = "SELECT VERSION() AS mysql_version"; ! if($result = $db->sql_query($sql)) { ! $row = $db->sql_fetchrow($result); ! $version = $row['mysql_version']; ! if( preg_match("/^(3\.23|4\.)/", $version) ) { ! $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)/", $version) ) ? "`$dbname`" : $dbname; ! ! $sql = "SHOW TABLE STATUS"; ! // FROM " . $db_name; ! if($result = $db->sql_query($sql)) { ! $tabledata_ary = $db->sql_fetchrowset($result); ! $dbsize = 0; ! for($i = 0; $i < count($tabledata_ary); $i++) { ! if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" ) { ! if( $table_prefix != "" ) { ! if( strstr($tabledata_ary[$i]['Name'], $table_prefix) ) { $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; } } - else - { - $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; - } } ! } ! ! if( $dbsize >= 1048576 ) ! { ! $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); ! } ! else if( $dbsize >= 1024 ) ! { ! $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); ! } ! else ! { ! $dbsize = sprintf("%.2f Bytes", $dbsize); ! } ! } // Else we couldn't get the table status. } else --- 240,401 ---- $rank = 0; $sql = "SELECT topic_id, topic_title, topic_views ! FROM " . TOPICS_TABLE . " ! WHERE forum_id IN ( $auth_data_sql_stats ) ! AND topic_status <> 2 ! AND topic_views > 0 ! ORDER BY topic_views DESC ! LIMIT " . $return_limit; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve topic data", "", __LINE__, __FILE__, $sql); } $topic_data = $db->sql_fetchrowset($result); ! for( $i = 0; $i < count($topic_data); $i++ ) { ! $template->assign_block_vars('topicviews', array( ! "RANK" => $i + 1, ! "CLASS" => ( !( $i + 1 % 2 ) ) ? $theme['td_class2'] : $theme['td_class1'], ! "TITLE" => $topic_data[$i]['topic_title'], ! "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } // ! // Begin Of Administrative Statistics (based on admin/index.php) ! // Also, takes into mxBB tables (DB Size) and Attachment MOD // ! // ! // Get forum statistics ! // ! $total_posts = get_db_stat('postcount'); ! $total_users = get_db_stat('usercount'); ! $total_topics = get_db_stat('topiccount'); ! $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); ! $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; ! $posts_per_day = sprintf("%.2f", $total_posts / $boarddays); ! $topics_per_day = sprintf("%.2f", $total_topics / $boarddays); ! $users_per_day = sprintf("%.2f", $total_users / $boarddays); ! $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path'])) { ! while( $file = @readdir($avatar_dir) ) { ! if( $file != "." && $file != ".." ) ! { ! $avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file); ! } ! } ! @closedir($avatar_dir); ! ! // ! // This bit of code translates the avatar directory size into human readable format ! // Borrowed the code from the PHP.net annoted manual, origanally written by: ! // Jesse (je...@je...) ! // ! if($avatar_dir_size >= 1048576) ! { ! $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; ! } ! else if($avatar_dir_size >= 1024) ! { ! $avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB"; ! } ! else ! { ! $avatar_dir_size = $avatar_dir_size . " Bytes"; } } else { ! // Couldn't open Avatar dir. ! $avatar_dir_size = $lang['Not_available']; } ! if($posts_per_day > $total_posts) ! { ! $posts_per_day = $total_posts; ! } ! if($topics_per_day > $total_topics) ! { ! $topics_per_day = $total_topics; ! } ! if($users_per_day > $total_users) { ! $users_per_day = $total_users; ! } ! // ! // DB size ... MySQL only ! // ! // This code is heavily influenced by a similar routine ! // in phpMyAdmin 2.2.0 ! // ! if( preg_match("/^mysql/", SQL_LAYER) ) ! { ! $sql = "SELECT VERSION() AS mysql_version"; ! if($result = $db->sql_query($sql)) { ! $row = $db->sql_fetchrow($result); ! $version = $row['mysql_version']; ! if( preg_match("/^(3\.23|4\.)/", $version) ) { ! $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)/", $version) ) ? "`$dbname`" : $dbname; ! $sql = "SHOW TABLE STATUS ! FROM " . $db_name; ! if($result = $db->sql_query($sql)) { ! $tabledata_ary = $db->sql_fetchrowset($result); ! ! $dbsize = 0; ! for($i = 0; $i < count($tabledata_ary); $i++) { ! if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" ) { ! if( $table_prefix != "" && $mx_table_prefix != "" ) ! { ! if( strstr($tabledata_ary[$i]['Name'], $table_prefix) || strstr($tabledata_ary[$i]['Name'], $mx_table_prefix) ) ! { ! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; ! } ! } ! else { $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; } } } ! } // Else we couldn't get the table status. ! } ! else ! { ! $dbsize = $lang['Not_available']; ! } ! } ! else ! { ! $dbsize = $lang['Not_available']; ! } ! } ! else if( preg_match("/^mssql/", SQL_LAYER) ) ! { ! $sql = "SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize ! FROM sysfiles"; ! if( $result = $db->sql_query($sql) ) ! { ! $dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available']; } else *************** *** 403,414 **** $dbsize = $lang['Not_available']; } ! } ! else ! { ! $dbsize = $lang['Not_available']; ! } // ! //Newest user data // $newest_userdata = get_db_stat('newestuser'); --- 408,433 ---- $dbsize = $lang['Not_available']; } ! ! if ( is_integer($dbsize) ) ! { ! if( $dbsize >= 1048576 ) ! { ! $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); ! } ! else if( $dbsize >= 1024 ) ! { ! $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); ! } ! else ! { ! $dbsize = sprintf("%.2f Bytes", $dbsize); ! } ! } ! // ! // End Of Administrative Statistics ! // // ! // Newest user data // $newest_userdata = get_db_stat('newestuser'); *************** *** 416,425 **** $newest_uid = $newest_userdata['user_id']; $sql = "SELECT user_regdate ! FROM " . USERS_TABLE . " ! WHERE user_id = " . $newest_userdata['user_id'] . " ! LIMIT 1"; ! if (!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 435,444 ---- $newest_uid = $newest_userdata['user_id']; $sql = "SELECT user_regdate ! FROM " . USERS_TABLE . " ! WHERE user_id = " . $newest_userdata['user_id'] . " ! LIMIT 1"; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 427,478 **** // ! //Most Online data // $sql = "SELECT * ! FROM " . CONFIG_TABLE . " ! WHERE config_name = 'record_online_users' ! OR config_name = 'record_online_date'"; ! ! if (!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't retrieve configuration data", "", __LINE__, __FILE__, $sql); } - $row = $db->sql_fetchrow($result); ! $most_users_date = ($row['config_value'] > 0) ? create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $most_users_date = $lang['Not_available']; ! $row = $db->sql_fetchrow($result); ! $most_users = ($row['config_value'] > 0) ? $row['config_value'] : $lang['Not_available']; ! $statistic_array = array($lang['Number_posts'],$lang['Posts_per_day'],$lang['Number_topics'],$lang['Topics_per_day'],$lang['Number_users'],$lang['Users_per_day'],$lang['Board_started'],$lang['Board_Up_Days'],$lang['Database_size'],$lang['Avatar_dir_size'],$lang['Latest_Reg_User_Date'],$lang['Latest_Reg_User'],$lang['Most_Ever_Online_Date'],$lang['Most_Ever_Online'],$lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); ! for ($i = 0; $i < count($statistic_array); $i += 2) { ! $template->assign_block_vars("adminrow", array( ! "STATISTIC" => $statistic_array[$i], ! "VALUE" => $value_array[$i], ! "STATISTIC2" => (isset($statistic_array[$i+1])) ? $statistic_array[$i + 1] : "", ! "VALUE2" => (isset($value_array[$i+1])) ? $value_array[$i + 1] : "") ! ); } // ! // End forum statistics // // ! //Output the page // $page_title = $lang['Statistics']; ! if ( !$block ) { ! include($mx_root_path . 'includes/page_header.'.$phpEx); } ! $template->pparse("body"); ! if ( !$block ) { ! include($mx_root_path . 'includes/page_tail.'.$phpEx); } --- 446,505 ---- // ! // Most Online data // $sql = "SELECT * ! FROM " . CONFIG_TABLE . " ! WHERE config_name = 'record_online_users' ! OR config_name = 'record_online_date'"; ! if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve configuration data", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); ! $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; ! $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); ! // ! // Disk Usage, if Attachment Mod is installed ! // ! if( defined('ATTACH_VERSION') ) { ! include($phpbb_root_path . 'attach_mod/includes/functions_admin.'.$phpEx); ! $disk_usage = get_formatted_dirsize(); ! $statistic_array[] = $lang['Disk_usage']; ! $value_array[] = $disk_usage; } + // ! // Output Administrative Statistics // + for( $i = 0; $i < count($statistic_array); $i += 2 ) + { + $template->assign_block_vars('adminrow', array( + "STATISTIC" => $statistic_array[$i], + "VALUE" => $value_array[$i], + "STATISTIC2" => ( isset($statistic_array[$i + 1]) ) ? $statistic_array[$i + 1] : '', + "VALUE2" => ( isset($value_array[$i + 1]) ) ? $value_array[$i + 1] : '') + ); + } // ! // Output the page // $page_title = $lang['Statistics']; ! if( !$is_block ) { ! include($mx_root_path . 'includes/page_header.' . $phpEx); } ! $template->pparse('body'); ! if( !$is_block ) { ! include($mx_root_path . 'includes/page_tail.' . $phpEx); } |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:36
|
Update of /cvsroot/mxbb/core27x/modules/mx_last_msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/modules/mx_last_msg Modified Files: mx_last_msg.php Log Message: updated Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core27x/modules/mx_last_msg/mx_last_msg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_last_msg.php 6 May 2005 06:48:06 -0000 1.1 --- mx_last_msg.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,13 **** <?php ! /*************************************************************************** ! * mx_last_msg.php ! * ------------------- ! * begin : April, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ $block_config = read_block_config( $block_id ); --- 1,22 ---- <?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. ! */ $block_config = read_block_config( $block_id ); *************** *** 30,35 **** // Read block Configuration // - - $PostNumber = $block_config[$block_id][Last_Msg_Number_Title]['parameter_value']; $display_date = $block_config[$block_id][Last_Msg_Display_Date]['parameter_value']; --- 39,42 ---- *************** *** 69,73 **** $forum_lst_msg = $auth_data_sql_msg; } ! // Added for 2.705 if ( empty( $forum_lst_msg ) ) { --- 76,80 ---- $forum_lst_msg = $auth_data_sql_msg; } ! if ( empty( $forum_lst_msg ) ) { *************** *** 90,95 **** $url_prev = mx_url( 'lmsg_start' , $start_prev ); // append_sid( $URL_INDEX . ( ( strpos($URL_INDEX, '?') != false ) ? '&' : '?' ) . 'lmsg_start=' . $start_prev ); } $template->assign_vars(array( - // 'L_TITLE' => ( !empty( $lang['Latest_Post'] ) ? $lang['Latest_Post'] : 'Last Message' ), 'L_TITLE' => ( !empty( $title ) ? $title : 'Last Message' ), 'U_TARGET' => $target, --- 97,102 ---- $url_prev = mx_url( 'lmsg_start' , $start_prev ); // append_sid( $URL_INDEX . ( ( strpos($URL_INDEX, '?') != false ) ? '&' : '?' ) . 'lmsg_start=' . $start_prev ); } + $template->assign_vars(array( 'L_TITLE' => ( !empty( $title ) ? $title : 'Last Message' ), 'U_TARGET' => $target, *************** *** 108,132 **** $GetType = "topics"; // posts ou topics - // $private = "USER"; - $timediff = 0; // Différence de temps entre le serveur et l'heure du forum en heures, en clair si votre forum est reglé sur GMT et que vous habitez en France il suffit de mettre 0 pour qu'il se regle sur le fuseau français (a verfifier selon les cas)(GMT+1) - - // if ( $private == "USER") { - // $private1 = " AND f.auth_view < 1"; - // } - //elseif ( $private == "PRIVATE") { - // $private1 = " AND f.auth_view < 2"; - // } - //elseif ( $private == "MODO") { - // $private1 = " AND f.auth_view <3"; - // } - //elseif ( $private == "ADMIN") { - // $private1 = " AND f.auth_view <5"; - // } - //else { - // $private =""; - // } - $sql = "SELECT t.topic_title, p.topic_id, t.topic_last_post_id, p.post_time, f.forum_name, f.forum_id, u.username, u.user_id, p.post_username, u2.username as user2, u2.user_id as id2 --- 115,120 ---- *************** *** 154,174 **** $postrow = $db->sql_fetchrowset($result); ! for($row_count = 0; $row_count < count($postrow); $row_count++) { ! $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; ! ! ! $message = $postrow[$row_count]['topic_title']; ! $url = append_sid( PHPBB_URL . 'viewtopic.php?t='.$postrow[$row_count]['topic_id'].'#'.$postrow[$row_count]['topic_last_post_id']); ! ! if( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) { $topic_type = $lang['Topic_Moved'] . ' '; $topic_id = $postrow[$row_count]['topic_moved_id']; ! $folder_image = $images['folder']; $folder_alt = $lang['Topics_Moved']; $newest_post_img = ''; --- 142,159 ---- $postrow = $db->sql_fetchrowset($result); ! for( $row_count = 0; $row_count < count($postrow); $row_count++ ) { ! $row_color = ( !( $row_count % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $row_count % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; + $message = $postrow[$row_count]['topic_title']; + $url = append_sid(PHPBB_URL . 'viewtopic.php?t=' . $postrow[$row_count]['topic_id'] . '#' . $postrow[$row_count]['topic_last_post_id']); ! if ( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) { $topic_type = $lang['Topic_Moved'] . ' '; $topic_id = $postrow[$row_count]['topic_moved_id']; ! $folder_image = $images['folder']; $folder_alt = $lang['Topics_Moved']; $newest_post_img = ''; *************** *** 176,190 **** else { ! if( $postrow[$row_count]['topic_type'] == POST_ANNOUNCE ) { $folder = $images['folder_announce']; $folder_new = $images['folder_announce_new']; } ! else if( $postrow[$row_count]['topic_type'] == POST_STICKY ) { $folder = $images['folder_sticky']; $folder_new = $images['folder_sticky_new']; } ! else if( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) { $folder = $images['folder_locked']; --- 161,175 ---- else { ! if ( $postrow[$row_count]['topic_type'] == POST_ANNOUNCE ) { $folder = $images['folder_announce']; $folder_new = $images['folder_announce_new']; } ! else if ( $postrow[$row_count]['topic_type'] == POST_STICKY ) { $folder = $images['folder_sticky']; $folder_new = $images['folder_sticky_new']; } ! else if ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) { $folder = $images['folder_locked']; *************** *** 193,197 **** else { ! if($replies >= $board_config['hot_threshold']) { $folder = $images['folder_hot']; --- 178,182 ---- else { ! if ( $replies >= $board_config['hot_threshold'] ) { $folder = $images['folder_hot']; *************** *** 206,239 **** $newest_post_img = ''; ! if( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array(); ! $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array(); ! if( $postrow[$row_count]['post_time'] > $userdata['user_lastvisit'] ) ! { ! if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) ! { ! $unread_topics = true; ! if( !empty($tracking_topics[$postrow[$row_count]['topic_id']]) ) ! { ! if( $tracking_topics[$postrow[$row_count]['topic_id']] >= $postrow[$row_count]['post_time'] ) ! { ! $unread_topics = false; ! } ! } ! if( !empty($tracking_forums[$postrow[$row_count]['topic_id']]) ) ! { ! if( $tracking_forums[$postrow[$row_count]['topic_id']] >= $postrow[$row_count]['post_time'] ) ! { ! $unread_topics = false; ! } ! } ! if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) { ! if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $postrow[$row_count]['post_time'] ) { $unread_topics = false; --- 191,224 ---- $newest_post_img = ''; ! if ( $userdata['session_logged_in'] ) { ! $tracking_topics = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"] ) : array(); ! $tracking_forums = ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f'] ) ) ? unserialize( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"] ) : array(); ! if ( $postrow[$row_count]['post_time'] > $userdata['user_lastvisit'] ) ! { ! if ( !empty( $tracking_topics ) || !empty( $tracking_forums ) || isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] ) ) ! { ! $unread_topics = true; ! if ( !empty( $tracking_topics[$postrow[$row_count]['topic_id']] ) ) ! { ! if ( $tracking_topics[$postrow[$row_count]['topic_id']] >= $postrow[$row_count]['post_time'] ) ! { ! $unread_topics = false; ! } ! } ! if ( !empty( $tracking_forums[$postrow[$row_count]['topic_id']] ) ) ! { ! if ( $tracking_forums[$postrow[$row_count]['topic_id']] >= $postrow[$row_count]['post_time'] ) ! { ! $unread_topics = false; ! } ! } ! if ( isset( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] ) ) { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $postrow[$row_count]['post_time'] ) { $unread_topics = false; *************** *** 241,250 **** } ! if( $unread_topics ) { $folder_image = $folder_new; $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else --- 226,235 ---- } ! if ( $unread_topics ) { $folder_image = $folder_new; $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else *************** *** 261,268 **** $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } ! else { $folder_image = $folder; --- 246,253 ---- $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } ! else { $folder_image = $folder; *************** *** 281,358 **** } ! IF ( $display_author == "TRUE" ) ! { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '">' : ''; ! $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); ! $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! } ! else ! { ! $topic_author = ''; ! } ! if ( $display_last_author == "TRUE" ) ! { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ($postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '">' . $postrow[$row_count]['user2'] . '</a>'; ! } ! else ! { ! $last_post_author = ''; ! } ! ! if( strlen($message ) > $nb_characteres ) ! { ! $message = substr( $message, 0, $nb_characteres); ! $position_espace = strrpos($message, " "); ! $message = substr($message, 0, $position_espace); ! $message .= "..."; ! } ! if ( $display_date == "TRUE" ) ! { ! $message_date = create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'],$board_config['board_timezone']); ! } ! else ! { ! $message_date = ''; ! } ! ! if ( $display_forum == "TRUE" ) ! { ! $forum_name = $postrow[$row_count]['forum_name']; ! $forum_url = append_sid( PHPBB_URL . 'viewforum.php?f=' . $postrow[$row_count]['forum_id']); ! } ! else ! { ! $forum_name = ''; ! $forum_url = ''; ! } ! if ( $display_icon_view == "TRUE" ) ! { ! $last_post_url = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . PHPBB_URL. $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! } ! else ! { ! $last_post_url = ''; ! } ! ! $template->assign_block_vars("msg_row", array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, ! "LAST_MSG" => $message, ! "LAST_MSG_DATE" => $message_date, ! "FORUM_NAME" => $forum_name, ! "U_LAST_MSG" => $url, ! "U_FORUM" => $forum_url , ! 'LAST_POST_IMG' => $last_post_url, ! 'FOLDER_IMG' => $folder_image, ! 'TOPIC_AUTHOR' => $topic_author, ! 'LAST_POST_AUTHOR' => $last_post_author, ! 'L_TOPIC_FOLDER_ALT' => $folder_alt ! ) ! ); ! } --- 266,340 ---- } ! if ( $display_author == "TRUE" ) ! { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '">' : ''; ! $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); ! $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! } ! else ! { ! $topic_author = ''; ! } ! if ( $display_last_author == "TRUE" ) ! { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '">' . $postrow[$row_count]['user2'] . '</a>'; ! } ! else ! { ! $last_post_author = ''; ! } ! if ( strlen($message) > $nb_characteres ) ! { ! $message = substr($message, 0, $nb_characteres); ! $position_espace = strrpos($message, ' '); ! $message = substr($message, 0, $position_espace); ! $message .= '...'; ! } ! if ( $display_date == "TRUE" ) ! { ! $message_date = create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); ! } ! else ! { ! $message_date = ''; ! } + if ( $display_forum == "TRUE" ) + { + $forum_name = $postrow[$row_count]['forum_name']; + $forum_url = append_sid(PHPBB_URL . 'viewforum.php?f=' . $postrow[$row_count]['forum_id']); + } + else + { + $forum_name = ''; + $forum_url = ''; + } + + if ( $display_icon_view == "TRUE" ) + { + $last_post_url = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . PHPBB_URL . $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; + } + else + { + $last_post_url = ''; + } + + $template->assign_block_vars('msg_row', array( + 'ROW_COLOR' => "#" . $row_color, + 'ROW_CLASS' => $row_class, + 'LAST_MSG' => $message, + 'LAST_MSG_DATE' => $message_date, + 'FORUM_NAME' => $forum_name, + 'U_LAST_MSG' => $url, + 'U_FORUM' => $forum_url, + 'LAST_POST_IMG' => $last_post_url, + 'FOLDER_IMG' => $folder_image, + 'TOPIC_AUTHOR' => $topic_author, + 'LAST_POST_AUTHOR' => $last_post_author, + 'L_TOPIC_FOLDER_ALT' => $folder_alt + )); } |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:35
|
Update of /cvsroot/mxbb/core27x/modules/mx_last_msg/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/modules/mx_last_msg/admin Removed Files: admin_mx_last_msg.php Log Message: updated --- admin_mx_last_msg.php DELETED --- |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:35
|
Update of /cvsroot/mxbb/core27x/modules/mx_statistics/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x/modules/mx_statistics/templates Modified Files: mx_statistics.tpl Log Message: updated Index: mx_statistics.tpl =================================================================== RCS file: /cvsroot/mxbb/core27x/modules/mx_statistics/templates/mx_statistics.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_statistics.tpl 6 May 2005 06:48:08 -0000 1.1 --- mx_statistics.tpl 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,108 **** ! <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center" colspan="4"> ! <span class="cattitle">{L_ADMIN_STATISTICS}</span> ! </td> ! </tr> ! <tr> ! <th width="25%" class="thCornerL" align="center"><strong>{L_STATISTIC}</strong></td> ! <th width="25%" class="thTop" align="center"><strong>{L_VALUE}</strong></td> ! <th width="25%" class="thTop" align="center"><strong>{L_STATISTIC}</strong></td> ! <th width="25%" class="thCornerR" align="center"><strong>{L_VALUE}</strong></td> ! </tr> ! ! <!-- BEGIN adminrow --> ! <tr> ! <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC}</span></td> ! <td class="row1" width="25%" align="center"><span class="gen">{adminrow.VALUE}</span></td> ! <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC2}</span></td> ! <td class="row1" width="25%" align="center"><span class="gen">{adminrow.VALUE2}</span></td> ! </tr> ! <!-- END adminrow --> ! </table> ! <br /> ! <br /> ! <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center" colspan="5"> ! <span class="cattitle">{L_TOP_POSTERS}</span> ! </td> ! </tr> ! <tr> ! <th class="thCornerL" align="center"><strong>{L_RANK}</strong></th> ! <th class="thTop" align="center" width="10%"><strong>{L_USERNAME}</strong></th> ! <th class="thTop" align="center" width="10%"><strong>{L_POSTS}</strong></th> ! <th class="thTop" align="center" width="10%"><strong>{L_PERCENTAGE}</strong></th> ! <th class="thCornerR" align="center" width="50%"><strong>{L_GRAPH}</strong></th> ! </tr> ! <!-- BEGIN users --> ! <tr> ! <td class="{users.CLASS}" align="left" width="10%"><span class="gen">{users.RANK}</span></td> ! <td class="{users.CLASS}" align="left" width="10%"><span class="gen"><a href="{users.URL}">{users.USERNAME}</a></span></td> ! <td class="{users.CLASS}" align="center" width="10%"><span class="gen">{users.POSTS}</span></td> ! <td class="{users.CLASS}" align="center" width="10%"><span class="gen">{users.PERCENTAGE}%</span></td> ! <td class="{users.CLASS}" align="left" width="50%"> ! <table cellspacing="0" cellpadding="0" border="0" align="left"> ! <tr> ! <td align="right"><img src="{LEFT_GRAPH_IMAGE}" width="4" height="12" /></td> ! </tr> ! </table> ! <table cellspacing="0" cellpadding="0" border="0" align="left" width="{users.BAR}%"> ! <tr> ! <td><img src="{GRAPH_IMAGE}" width="100%" height="12" /></td> ! </tr> ! </table> ! <table cellspacing="0" cellpadding="0" border="0" align="left"> ! <tr> ! <td align="left"><img src="{RIGHT_GRAPH_IMAGE}" width="4" height="12" /></td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END users --> ! </table> ! <br /> ! <br /> ! <table width="100%" border="0" cellspacing="5" cellpadding="0"> ! <tr> ! <td valign="top" width="50%"> ! <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center" colspan="3"><span class="cattitle">{L_MOST_VIEWED}</span></td> ! </tr> ! <tr> ! <th colspan="1" class="thCornerL" align="left"><strong>{L_RANK}</strong></th> ! <th class="thTop" align="center"><strong>{L_VIEWS}</strong></th> ! <th class="thCornerR" align="center"><strong>{L_TOPIC}</strong></th> ! <!-- BEGIN topicviews --> ! <tr> ! <td class="{topicviews.CLASS}" align="left" width="5%"><span class="gen">{topicviews.RANK}</span></td> ! <td class="{topicviews.CLASS}" align="center" width="20%"><span class="gen">{topicviews.VIEWS}</span></td> ! <td class="{topicviews.CLASS}" align="left"><span class="gen"><a href="{topicviews.URL}">{topicviews.TITLE}</a></span></td> ! </tr> ! <!-- END topicviews --> ! </table> ! </td> ! <td valign="top" width="50%"> ! <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center" colspan="3" height="28"> <span class="cattitle">{L_MOST_ACTIVE}</span> ! </td> ! </tr> ! <tr> ! <th colspan="1" class="thCornerL" align="left"><strong>{L_RANK}</strong></th> ! <th class="thTop" align="center"><strong>{L_REPLIES}</strong></th> ! <th class="thCornerR" align="center"><strong>{L_TOPIC}</strong></th> ! </tr> ! <!-- BEGIN topicreplies --> ! <tr> ! <td class="{topicreplies.CLASS}" align="left" width="5%"><span class="gen">{topicreplies.RANK}</span></td> ! <td class="{topicreplies.CLASS}" align="center" width="20%"><span class="gen">{topicreplies.REPLIES}</span></td> ! <td class="{topicreplies.CLASS}" align="left"><span class="gen"><a href="{topicreplies.URL}">{topicreplies.TITLE}</a></span></td> ! </tr> ! <!-- END topicreplies --> ! </table> ! </td> ! </tr> ! </table> ! <br /> --- 1,124 ---- ! <table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center"><span class="cattitle">{L_ADMIN_STATISTICS}</span></td> ! </tr> ! <tr> ! <td> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;"> ! <tr> ! <th width="25%" class="thCornerL" align="center"><b>{L_STATISTIC}</b></td> ! <th width="25%" class="thTop" align="center"><b>{L_VALUE}</b></td> ! <th width="25%" class="thTop" align="center"><b>{L_STATISTIC}</b></td> ! <th width="25%" class="thCornerR" align="center"><b>{L_VALUE}</b></td> ! </tr> ! <!-- BEGIN adminrow --> ! <tr> ! <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC}</span></td> ! <td class="row1" align="center"><span class="gen">{adminrow.VALUE}</span></td> ! <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC2}</span></td> ! <td class="row1" align="center"><span class="gen">{adminrow.VALUE2}</span></td> ! </tr> ! <!-- END adminrow --> ! </table> ! </td> ! </tr> ! </table> ! <br clear="all" /> ! <table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center"><span class="cattitle">{L_TOP_POSTERS}</span></td> ! </tr> ! <tr> ! <td> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;"> ! <tr> ! <th class="thCornerL" align="center" width="10%"><b>{L_RANK}</b></th> ! <th class="thTop" align="center" width="20%"><b>{L_USERNAME}</b></th> ! <th class="thTop" align="center" width="10%"><b>{L_POSTS}</b></th> ! <th class="thTop" align="center" width="10%"><b>{L_PERCENTAGE}</b></th> ! <th class="thCornerR" align="center" width="50%"><b>{L_GRAPH}</b></th> ! </tr> ! <!-- BEGIN users --> ! <tr> ! <td class="{users.CLASS}" align="center"><span class="gen">{users.RANK}</span></td> ! <td class="{users.CLASS}" align="center"><span class="gen"><a href="{users.URL}">{users.USERNAME}</a></span></td> ! <td class="{users.CLASS}" align="center"><span class="gen">{users.POSTS}</span></td> ! <td class="{users.CLASS}" align="center"><span class="gen">{users.PERCENTAGE}%</span></td> ! <td class="{users.CLASS}" align="left"> ! <table cellspacing="0" cellpadding="0" border="0" align="left"> ! <tr> ! <td align="right"><img src="{LEFT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> ! </tr> ! </table> ! <table cellspacing="0" cellpadding="0" border="0" align="left" width="{users.BAR}%"> ! <tr> ! <td><img src="{GRAPH_IMAGE}" width="100%" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> ! </tr> ! </table> ! <table cellspacing="0" cellpadding="0" border="0" align="left"> ! <tr> ! <td align="left"><img src="{RIGHT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> ! </tr> ! </table> ! </td> ! </tr> ! <!-- END users --> ! </table> ! </td> ! </tr> ! </table> ! <br clear="all" /> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td valign="top" width="50%" style="padding-right:2px;"> ! <table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center"><span class="cattitle">{L_MOST_VIEWED}</span></td> ! </tr> ! <tr> ! <td> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;"> ! <tr> ! <th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th> ! <th class="thTop" align="center" width="20%"><b>{L_VIEWS}</b></th> ! <th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th> ! </tr> ! <!-- BEGIN topicviews --> ! <tr> ! <td class="{topicviews.CLASS}" align="left"><span class="gen">{topicviews.RANK}</span></td> ! <td class="{topicviews.CLASS}" align="center"><span class="gen">{topicviews.VIEWS}</span></td> ! <td class="{topicviews.CLASS}" align="left"><span class="gen"><a href="{topicviews.URL}">{topicviews.TITLE}</a></span></td> ! </tr> ! <!-- END topicviews --> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td valign="top" width="50%" style="padding-left:2px;"> ! <table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%"> ! <tr> ! <td class="catHead" align="center"> <span class="cattitle">{L_MOST_ACTIVE}</span></td> ! </tr> ! <tr> ! <td> ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;"> ! <tr> ! <th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th> ! <th class="thTop" align="center" width="20%"><b>{L_REPLIES}</b></th> ! <th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th> ! </tr> ! <!-- BEGIN topicreplies --> ! <tr> ! <td class="{topicreplies.CLASS}" align="left"><span class="gen">{topicreplies.RANK}</span></td> ! <td class="{topicreplies.CLASS}" align="center"><span class="gen">{topicreplies.REPLIES}</span></td> ! <td class="{topicreplies.CLASS}" align="left"><span class="gen"><a href="{topicreplies.URL}">{topicreplies.TITLE}</a></span></td> ! </tr> ! <!-- END topicreplies --> ! </table> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! </table> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2005-12-05 19:25:35
|
Update of /cvsroot/mxbb/core27x In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23896/core27x Modified Files: common.php extension.inc index.php mx_announce.php mx_forum.php mx_google.php mx_language.php mx_login.php mx_online.php mx_poll.php mx_theme.php Log Message: updated Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_poll.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_poll.php 26 May 2005 21:54:08 -0000 1.2 --- mx_poll.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,13 **** <?php ! /*************************************************************************** ! * mx-poll.php ! * ------------------- ! * begin : April, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ if( !defined('IN_PORTAL') ) --- 1,21 ---- <?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. ! */ if( !defined('IN_PORTAL') ) *************** *** 76,81 **** $sql = "SELECT vd.vote_id FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr ! WHERE vd.topic_id = $topic_id ! AND vr.vote_id = vd.vote_id AND vr.vote_option_id = $vote_option_id GROUP BY vd.vote_id"; --- 84,89 ---- $sql = "SELECT vd.vote_id FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr ! WHERE vd.topic_id = $topic_id ! AND vr.vote_id = vd.vote_id AND vr.vote_option_id = $vote_option_id GROUP BY vd.vote_id"; *************** *** 90,95 **** $sql = "SELECT * ! FROM " . VOTE_USERS_TABLE . " ! WHERE vote_id = $vote_id AND vote_user_id = " . $userdata['user_id']; if ( !($result2 = $db->sql_query($sql)) ) --- 98,103 ---- $sql = "SELECT * ! FROM " . VOTE_USERS_TABLE . " ! WHERE vote_id = $vote_id AND vote_user_id = " . $userdata['user_id']; if ( !($result2 = $db->sql_query($sql)) ) *************** *** 101,106 **** { $sql = "UPDATE " . VOTE_RESULTS_TABLE . " ! SET vote_result = vote_result + 1 ! WHERE vote_id = $vote_id AND vote_option_id = $vote_option_id"; if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) --- 109,114 ---- { $sql = "UPDATE " . VOTE_RESULTS_TABLE . " ! SET vote_result = vote_result + 1 ! WHERE vote_id = $vote_id AND vote_option_id = $vote_option_id"; if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) *************** *** 113,117 **** if ( !$db->sql_query($sql, END_TRANSACTION) ) { ! mx_message_die(GENERAL_ERROR, "Could not insert user_id for poll", "", __LINE__, __FILE__, $sql); } --- 121,125 ---- if ( !$db->sql_query($sql, END_TRANSACTION) ) { ! mx_message_die(GENERAL_ERROR, "Could not insert user_id for poll", '', __LINE__, __FILE__, $sql); } *************** *** 146,150 **** // Does this topic contain a poll? // ! if ( !empty($topic_id) ) { $s_hidden_fields = ''; --- 154,158 ---- // Does this topic contain a poll? // ! //if ( !empty($forum_topic_data['topic_vote']) ) { $s_hidden_fields = ''; *************** *** 209,213 **** for($i = 0; $i < $vote_options; $i++) { ! $vote_percent = ( $vote_results_sum > 0 ) ? $vote_info[$i]['vote_result'] / $vote_results_sum : 0; $vote_graphic_length = is_numeric($block_size) ? round($vote_percent * ( $block_size - 50 )) : $vote_percent * 400; --- 217,221 ---- for($i = 0; $i < $vote_options; $i++) { ! $vote_percent = ( $vote_results_sum > 0 ) ? $vote_info[$i]['vote_result'] / $vote_results_sum : 0; $vote_graphic_length = is_numeric($block_size) ? round($vote_percent * ( $block_size - 50 )) : $vote_percent * 400; *************** *** 220,224 **** } ! $template->assign_block_vars("poll_option", array( 'POLL_OPTION_CAPTION' => $vote_info[$i]['vote_option_text'], 'POLL_OPTION_RESULT' => $vote_info[$i]['vote_result'], --- 228,232 ---- } ! $template->assign_block_vars('poll_option', array( 'POLL_OPTION_CAPTION' => $vote_info[$i]['vote_option_text'], 'POLL_OPTION_RESULT' => $vote_info[$i]['vote_result'], *************** *** 235,239 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'L_TOTAL_VOTES' => $lang['Total_votes'], ! 'TOTAL_VOTES' => $vote_results_sum) ); --- 243,248 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'L_TOTAL_VOTES' => $lang['Total_votes'], ! 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); *************** *** 287,291 **** $template->pparse('pollbox'); } - } ?> \ No newline at end of file --- 296,301 ---- $template->pparse('pollbox'); } + } + ?> \ No newline at end of file Index: extension.inc =================================================================== RCS file: /cvsroot/mxbb/core27x/extension.inc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extension.inc 6 May 2005 06:47:57 -0000 1.1 --- extension.inc 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,15 **** <?php ! /*************************************************************************** ! * extension.inc ! * ------------------- ! * begin : Saturday, Feb 13, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... ! * * $Id$ ! * ! * ! ***************************************************************************/ if ( !defined('IN_PORTAL') ) { --- 1,27 ---- <?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 : ! * ------------------------------------------------------------------------- ! * 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') ) { Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_online.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_online.php 26 May 2005 21:54:08 -0000 1.2 --- mx_online.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- } + // ================================================================================ // The following code is backported from includes/page_header.php (phpBB 2.0.13) *************** *** 38,194 **** $l_online_users = ''; ! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip ! FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s ! WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".( time() - 300 ) . " ! ORDER BY u.username ASC, s.session_ip ASC"; ! ! if( !($result = $db->sql_query($sql)) ) { - message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); - } - $userlist_ary = array(); - $userlist_visible = array(); ! $prev_user_id = 0; ! $prev_user_ip = $prev_session_ip = ''; ! while( $row = $db->sql_fetchrow($result) ) ! { ! // User is logged in and therefor not a guest ! if ( $row['session_logged_in'] ) { ! // Skip multiple sessions for one user ! if ( $row['user_id'] != $prev_user_id ) { ! $style_color = ''; ! if ( $row['user_level'] == ADMIN ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; ! } ! else if ( $row['user_level'] == MOD ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; ! } ! if ( $row['user_allow_viewonline'] ) ! { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>'; ! $logged_visible_online++; ! } ! else { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; ! $logged_hidden_online++; } ! if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) { ! $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link; } } ! $prev_user_id = $row['user_id']; } ! else { ! // Skip multiple sessions for one user ! if ( $row['session_ip'] != $prev_session_ip ) ! { ! $guests_online++; ! } } ! $prev_session_ip = $row['session_ip']; ! } ! $db->sql_freeresult($result); ! if ( empty($online_userlist) ) ! { ! $online_userlist = $lang['None']; ! } ! $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist; ! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! if ( $total_online_users > $board_config['record_online_users']) ! { ! $board_config['record_online_users'] = $total_online_users; ! $board_config['record_online_date'] = time(); ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! if ( !$db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '" . $board_config['record_online_date'] . "' ! WHERE config_name = 'record_online_date'"; ! if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); } - } ! if ( $total_online_users == 0 ) ! { ! $l_t_user_s = $lang['Online_users_zero_total']; ! } ! else if ( $total_online_users == 1 ) ! { ! $l_t_user_s = $lang['Online_user_total']; ! } ! else ! { ! $l_t_user_s = $lang['Online_users_total']; ! } ! if ( $logged_visible_online == 0 ) ! { ! $l_r_user_s = $lang['Reg_users_zero_total']; ! } ! else if ( $logged_visible_online == 1 ) ! { ! $l_r_user_s = $lang['Reg_user_total']; ! } ! else ! { ! $l_r_user_s = $lang['Reg_users_total']; ! } ! if ( $logged_hidden_online == 0 ) ! { ! $l_h_user_s = $lang['Hidden_users_zero_total']; ! } ! else if ( $logged_hidden_online == 1 ) ! { ! $l_h_user_s = $lang['Hidden_user_total']; ! } ! else ! { ! $l_h_user_s = $lang['Hidden_users_total']; ! } ! if ( $guests_online == 0 ) ! { ! $l_g_user_s = $lang['Guest_users_zero_total']; ! } ! else if ( $guests_online == 1 ) ! { ! $l_g_user_s = $lang['Guest_user_total']; ! } ! else ! { ! $l_g_user_s = $lang['Guest_users_total']; } - $l_online_users = sprintf($l_t_user_s, $total_online_users); - $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); - $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); - $l_online_users .= sprintf($l_g_user_s, $guests_online); - // ================================================================================ // The following code is backported from index.php (phpBB 2.0.13) --- 39,203 ---- $l_online_users = ''; ! //if (defined('SHOW_ONLINE')) { ! $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip ! FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s ! WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".( time() - 300 ) . " ! ORDER BY u.username ASC, s.session_ip ASC"; ! if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); ! } ! ! $userlist_ary = array(); ! $userlist_visible = array(); ! ! $prev_user_id = 0; ! $prev_user_ip = $prev_session_ip = ''; ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! // User is logged in and therefor not a guest ! if ( $row['session_logged_in'] ) { ! // Skip multiple sessions for one user ! if ( $row['user_id'] != $prev_user_id ) { ! $style_color = ''; ! if ( $row['user_level'] == ADMIN ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; ! } ! else if ( $row['user_level'] == MOD ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; ! } ! ! if ( $row['user_allow_viewonline'] ) ! { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>'; ! $logged_visible_online++; ! } ! else ! { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; ! $logged_hidden_online++; ! } ! ! if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) ! { ! $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link; ! } } ! ! $prev_user_id = $row['user_id']; ! } ! else ! { ! // Skip multiple sessions for one user ! if ( $row['session_ip'] != $prev_session_ip ) { ! $guests_online++; } } ! $prev_session_ip = $row['session_ip']; } ! $db->sql_freeresult($result); ! ! if ( empty($online_userlist) ) { ! $online_userlist = $lang['None']; } ! $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist; ! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! if ( $total_online_users > $board_config['record_online_users']) ! { ! $board_config['record_online_users'] = $total_online_users; ! $board_config['record_online_date'] = time(); ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! if ( !$db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); ! } ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '" . $board_config['record_online_date'] . "' ! WHERE config_name = 'record_online_date'"; ! if ( !$db->sql_query($sql) ) ! { ! message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); ! } } ! if ( $total_online_users == 0 ) { ! $l_t_user_s = $lang['Online_users_zero_total']; ! } ! else if ( $total_online_users == 1 ) ! { ! $l_t_user_s = $lang['Online_user_total']; ! } ! else ! { ! $l_t_user_s = $lang['Online_users_total']; } ! if ( $logged_visible_online == 0 ) ! { ! $l_r_user_s = $lang['Reg_users_zero_total']; ! } ! else if ( $logged_visible_online == 1 ) ! { ! $l_r_user_s = $lang['Reg_user_total']; ! } ! else ! { ! $l_r_user_s = $lang['Reg_users_total']; ! } ! if ( $logged_hidden_online == 0 ) ! { ! $l_h_user_s = $lang['Hidden_users_zero_total']; ! } ! else if ( $logged_hidden_online == 1 ) ! { ! $l_h_user_s = $lang['Hidden_user_total']; ! } ! else ! { ! $l_h_user_s = $lang['Hidden_users_total']; ! } ! if ( $guests_online == 0 ) ! { ! $l_g_user_s = $lang['Guest_users_zero_total']; ! } ! else if ( $guests_online == 1 ) ! { ! $l_g_user_s = $lang['Guest_user_total']; ! } ! else ! { ! $l_g_user_s = $lang['Guest_users_total']; ! } ! $l_online_users = sprintf($l_t_user_s, $total_online_users); ! $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); ! $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); ! $l_online_users .= sprintf($l_g_user_s, $guests_online); } // ================================================================================ // The following code is backported from index.php (phpBB 2.0.13) Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core27x/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 26 May 2005 21:54:08 -0000 1.2 --- index.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,46 **** <?php ! /*************************************************************************** ! * mx-portal.php ! * ------------------- ! * begin : Juillet, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $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. ! * ! ***************************************************************************/ ! define('IN_PORTAL', 1); ! $mx_root_path = './'; ! include_once($mx_root_path . 'extension.inc'); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! mx_init_userprefs($userdata); // ! // End session management // ! $view_page = FALSE; // ! // Page selector // ! $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); // --- 1,47 ---- <?php ! /** ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal ! * author : jon ohlsson, marc morisette and the MX-Team ! * credits : 2001 The phpBB Group ! * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System ! * email : jon...@ho... ! * project site : www.mx-system.com ! * ! * description : the main mx-portal file ! * ------------------------------------------------------------------------- ! * ! * $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. ! */ ! ! //define('MX_DEBUG', 1); ! define( 'IN_PORTAL', 1 ); ! $mx_root_path = "./"; ! include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.' . $phpEx); ! $view_page = false; // ! // Page selector // ! $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); // ! // Start session management // ! $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); ! mx_init_userprefs($userdata); + $view_page = FALSE; // Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_login.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_login.php 6 May 2005 06:47:57 -0000 1.1 --- mx_login.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,13 **** <?php ! /*************************************************************************** ! * mx_login.php ! * ------------------- ! * begin : April, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ if ( !defined('IN_PORTAL') ) --- 1,22 ---- <?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. ! */ if ( !defined('IN_PORTAL') ) *************** *** 17,40 **** $template->set_filenames(array( ! "body_login" => 'mx_login.tpl') ); $template->assign_vars(array( ! 'BLOCK_SIZE' => $block_size, ! 'S_LOGIN_ACTION' => append_sid('login.'.$phpEx), ! 'L_USERNAME' => $lang['Username'], ! 'L_PASSWORD' => $lang['Password'], ! 'L_LOGIN' => $lang['Login'], ! 'L_TITLE' => $lang['Login'], ! 'L_LOG_ME_IN' => $lang['Log_me_in'], ! 'L_AUTO_LOGIN' => $lang['Log_me_in'], ! 'L_LOGIN_LOGOUT' => $lang['Login']) ! ); ! //if( !$userdata['session_logged_in'] ) ! //{ ! $template->assign_block_vars('switch_user_logged_out', array()); ! $template->pparse("body_login"); ! //} ?> \ No newline at end of file --- 26,46 ---- $template->set_filenames(array( ! 'body_login' => 'mx_login.tpl') ); $template->assign_vars(array( ! 'BLOCK_SIZE' => $block_size, ! 'S_LOGIN_ACTION' => append_sid(PORTAL_URL . "login.$phpEx"), ! 'L_USERNAME' => $lang['Username'], ! 'L_PASSWORD' => $lang['Password'], ! 'L_LOGIN' => $lang['Login'], ! 'L_TITLE' => $lang['Login'], ! 'L_LOG_ME_IN' => $lang['Log_me_in'], ! 'L_AUTO_LOGIN' => $lang['Log_me_in'], ! 'L_LOGIN_LOGOUT' => $lang['Login'] ! )); ! $template->assign_block_vars('switch_user_logged_out', array()); ! $template->pparse('body_login'); ?> \ No newline at end of file Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core27x/common.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common.php 30 Nov 2005 23:50:44 -0000 1.3 --- common.php 5 Dec 2005 19:25:26 -0000 1.4 *************** *** 1,9 **** <?php ! /*************************************************************************** ! * common.php ! * ------------------- ! * begin : Saturday, Feb 23, 2001 ! * copyright : (C) 2001 The phpBB Group ! * email : su...@ph... * * $Id$ --- 1,12 ---- <?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$ *************** *** 12,23 **** ***************************************************************************/ ! /*************************************************************************** ! * ! * 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') ) --- 15,24 ---- ***************************************************************************/ ! /** ! * 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') ) *************** *** 28,31 **** --- 29,36 ---- define('IN_PHPBB', 1); + // ================================================================================ + // The following code is based on common.php from phpBB 2.0.14 + // ================================================================================ + // error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables *************** *** 83,87 **** unset($input['input']); unset($input['not_unset']); ! while (list($var,) = @each($input)) { --- 88,92 ---- unset($input['input']); unset($input['not_unset']); ! while (list($var,) = @each($input)) { *************** *** 91,95 **** } } ! unset($input); } --- 96,100 ---- } } ! unset($input); } *************** *** 175,182 **** $gen_simple_header = FALSE; ! @include_once($mx_root_path . 'config.'.$phpEx); ! ! if( !defined("MX_INSTALLED") ) { header("Location: ' . $mx_root_path . 'install/mx_install.$phpEx"); --- 180,186 ---- $gen_simple_header = FALSE; + @include_once($mx_root_path . 'config.' . $phpEx); ! if( !defined('MX_INSTALLED') ) { header("Location: ' . $mx_root_path . 'install/mx_install.$phpEx"); *************** *** 185,214 **** str_replace("//", "/", $phpbb_root_path); ! include_once($mx_root_path . 'config.'.$phpEx); ! ! include_once($phpbb_root_path . 'includes/constants.'.$phpEx); ! include_once($mx_root_path . 'includes/template.'.$phpEx); ! include_once($phpbb_root_path . 'includes/sessions.'.$phpEx); ! include_once($phpbb_root_path . 'includes/auth.'.$phpEx); ! include_once($phpbb_root_path . 'includes/functions.'.$phpEx); ! include_once($phpbb_root_path . 'includes/db.'.$phpEx); ! // We do not need this any longer, unset for safety purposes ! unset($dbpasswd); ! include_once($phpbb_root_path . 'includes/functions_selects.'.$phpEx); ! include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! include_once($mx_root_path . 'includes/mx_constants.'.$phpEx); ! include_once($mx_root_path . 'includes/mx_functions.'.$phpEx); include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); include_once($mx_root_path . 'includes/mx_auth.' . $phpEx); include_once($mx_root_path . 'includes/mx_cache.' . $phpEx); ! $portal_config = get_info( PORTAL_TABLE, 'portal_id', 1 ); ! ! define('PHPBB_URL', $portal_config[portal_phpbb_url]); ! define('PORTAL_URL', $portal_config[portal_url]); ! define('PORTAL_VERSION', $portal_config[portal_version]); // --- 189,216 ---- str_replace("//", "/", $phpbb_root_path); ! include_once($mx_root_path . 'config.' . $phpEx); ! include_once($phpbb_root_path . 'includes/constants.' . $phpEx); ! include_once($mx_root_path . 'includes/template.' . $phpEx); ! include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); ! include_once($phpbb_root_path . 'includes/auth.' . $phpEx); ! include_once($phpbb_root_path . 'includes/functions.' . $phpEx); ! include_once($phpbb_root_path . 'includes/db.' . $phpEx); ! include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx); ! include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); ! include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); ! include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); include_once($mx_root_path . 'includes/mx_auth.' . $phpEx); include_once($mx_root_path . 'includes/mx_cache.' . $phpEx); ! // We do not need this any longer, unset for safety purposes ! unset($dbpasswd); ! $portal_config = get_info(PORTAL_TABLE, 'portal_id', 1); ! define('PHPBB_URL', $portal_config['portal_phpbb_url']); ! define('PORTAL_URL', $portal_config['portal_url']); ! define('PORTAL_VERSION', $portal_config['portal_version']); // *************** *** 222,248 **** $mx_cache = new mx_cache(); - // - // Mozilla navigation bar - // Default items that should be valid on all pages. - // Defined here and not in page_header.php so they can be redefined in the code - // - $nav_links['top'] = array ( - 'url' => append_sid( PHPBB_URL ."index.".$phpEx), - 'title' => sprintf($lang['Forum_Index'], $board_config['sitename']) - ); - $nav_links['search'] = array ( - 'url' => append_sid( PHPBB_URL ."search.".$phpEx), - 'title' => $lang['Search'] - ); - $nav_links['help'] = array ( - 'url' => append_sid( PHPBB_URL ."faq.".$phpEx), - 'title' => $lang['FAQ'] - ); - $nav_links['author'] = array ( - 'url' => append_sid( PHPBB_URL ."memberlist.".$phpEx), - 'title' => $lang['Memberlist'] - ); - - // // Obtain and encode users IP // --- 224,227 ---- *************** *** 311,320 **** //-- MX System ! if ( file_exists($phpbb_root_path . 'attach_mod') ) { ! include_once($phpbb_root_path . 'attach_mod/attachment_mod.'.$phpEx); } ! if ( file_exists('install') || file_exists('contrib') ) { mx_message_die(GENERAL_MESSAGE, 'Please ensure both the install/ and contrib/ directories are deleted'); --- 290,299 ---- //-- MX System ! if( file_exists($phpbb_root_path . 'attach_mod') ) { ! include_once($phpbb_root_path . 'attach_mod/attachment_mod.' . $phpEx); } ! if( file_exists('install') || file_exists('contrib') ) { mx_message_die(GENERAL_MESSAGE, 'Please ensure both the install/ and contrib/ directories are deleted'); *************** *** 328,331 **** mx_message_die(GENERAL_MESSAGE, 'Board_disable', 'Information'); } - ?> \ No newline at end of file --- 307,309 ---- Index: mx_google.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_google.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_google.php 6 May 2005 06:47:57 -0000 1.1 --- mx_google.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,14 **** <?php ! /*************************************************************************** ! * mx_google.php ! * ------------------- ! * begin : August, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ ! if ( !defined('IN_PORTAL') ) { --- 1,23 ---- <?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. ! */ ! if ( !defined('IN_PORTAL') ) { *************** *** 17,28 **** $template->set_filenames(array( ! "body_google" => 'mx_google.tpl') ); $template->assign_vars(array( ! 'BLOCK_SIZE' => $block_size, ! 'L_SEARCH' => $lang['Search'], ! 'L_TITLE' => 'Google') ! ); ! $template->pparse("body_google"); ?> \ No newline at end of file --- 26,39 ---- $template->set_filenames(array( ! 'body_google' => 'mx_google.tpl') ); + $template->assign_vars(array( ! 'BLOCK_SIZE' => $block_size, ! 'L_SEARCH' => $lang['Search'], ! 'L_TITLE' => 'Google' ! )); ! ! $template->pparse('body_google'); ?> \ No newline at end of file Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_language.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_language.php 6 May 2005 06:47:57 -0000 1.1 --- mx_language.php 5 Dec 2005 19:25:26 -0000 1.2 *************** *** 1,13 **** <?php ! /*************************************************************************** ! * mx_language.php ! * ------------------- ! * begin : April, 2002 ! * copyright : (C) 2002 MX-System ! * email : su...@mx... ! * ! * $Id$ ! * ! ***************************************************************************/ if ( !defined('IN_PORTAL') ) --- 1,22 ---- <?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. ! */ if ( !defined('IN_PORTAL') ) *************** *** 16,82 **** } ! if( isset($HTTP_POST_VARS['change_default_lang']) && $userdata['user_level'] == ADMIN ) { ! $board_config['default_lang'] = ( isset($HTTP_POST_VARS['default_lang']) ) ? $HTTP_POST_VARS['default_lang'] : $board_config['default_lang']; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '" . str_replace("\'", "''", $board_config['default_lang']) . "' WHERE config_name = 'default_lang'"; ! if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update default language configuration for $config_name", "", __LINE__, __FILE__, $sql); } } ! if( isset($HTTP_POST_VARS['change_user_lang']) && $userdata['session_logged_in'] ) { ! $userdata['user_lang'] = ( isset($HTTP_POST_VARS['user_lang']) ) ? $HTTP_POST_VARS['user_lang'] : $board_config['default_lang']; ! $mx_user_id = $userdata['user_id']; ! $sql = "UPDATE " . USERS_TABLE . " SET ! user_lang = '" . str_replace("\'", "''", $userdata['user_lang']) . "' ! WHERE user_id = '$mx_user_id'"; ! if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update user lang configuration for $config_name", "", __LINE__, __FILE__, $sql); } } $template->set_filenames(array( ! "body_language" => 'mx_language.tpl') ); if ( $userdata['user_level'] == ADMIN ) { ! $template->assign_block_vars("switch_is_admin", array( 'L_CHANGE_NOW' => $lang['Change_default_lang'], ! 'LANG_SELECT' => language_select($board_config['default_lang'], 'default_lang') )); } if ( $userdata['session_logged_in'] ) { ! $template->assign_block_vars("switch_is_user", array( 'L_CHANGE_NOW' => $lang['Change_user_lang'], ! 'LANG_SELECT' => language_select($userdata['user_lang'], 'user_lang') )); } $template->assign_vars(array( ! 'ACTION_URL' => $mx_root_path . "index." . $phpEx . "?page=" . $page_id, ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_SELECT_LANG' => $lang['Board_lang'], 'L_CHANGE_NOW' => $lang['Change'], ! 'L_TITLE' => $lang['Portal_lang'], ! 'L_SUBTITLE' => $lang['SELECTGUILANG']) ! ); ! // // Display only when the user is logged in // ! if( $userdata['session_logged_in'] ) { ! $template->pparse("body_language"); } ?> \ No newline at end of file --- 25,94 ---- } ! $language = $mx_request_vars->post('change_default_lang', MX_TYPE_NO_TAGS, ''); ! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); ! if ( !empty($language) && $userdata['user_level'] == ADMIN ) { ! $board_config['default_lang'] = $language; $sql = "UPDATE " . CONFIG_TABLE . " SET ! config_value = '$language' WHERE config_name = 'default_lang'"; ! if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update default language configuration", '', __LINE__, __FILE__, $sql); } } ! $language = $mx_request_vars->post('change_user_lang', MX_TYPE_NO_TAGS, ''); ! $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); ! if ( !empty($language) && $userdata['session_logged_in'] ) { ! $userdata['user_lang'] = $language; ! $sql = "UPDATE " . USERS_TABLE . " SET ! user_lang = '$language' ! WHERE user_id = '" . $userdata['user_id'] . "'"; ! if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update user lang configuration", '', __LINE__, __FILE__, $sql); } } $template->set_filenames(array( ! 'body_language' => 'mx_language.tpl') ); if ( $userdata['user_level'] == ADMIN ) { ! $template->assign_block_vars('switch_is_admin', array( 'L_CHANGE_NOW' => $lang['Change_default_lang'], ! 'LANG_SELECT' => language_select($board_config['default_lang'], 'default_lang') )); } if ( $userdata['session_logged_in'] ) { ! $template->assign_block_vars('switch_is_user', array( 'L_CHANGE_NOW' => $lang['Change_user_lang'], ! 'LANG_SELECT' => language_select($userdata['user_lang'], 'user_lang') )); } $template->assign_vars(array( ! 'ACTION_URL' => append_sid(PORTAL_URL . "index.$phpEx?page=$page_id"), ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_SELECT_LANG' => $lang['Board_lang'], 'L_CHANGE_NOW' => $lang['Change'], ! 'L_TITLE' => $lang['Portal_lang'], ! 'L_SUBTITLE' => $lang['SELECTGUILANG'] ! )); // // Display only when the user is logged in // ! if ( $userdata['session_logged_in'] ) { ! $template->pparse('body_language'); } + ?> \ No newline at end of file Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core27x/mx_forum.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_forum.php 26 May 2005 21:54:08 -0000 1.2 --- mx_forum.php 5 Dec 2005 19:25:26 -0000 1.3 *************** *** 1,44 **** <?php ! /*************************************************************************** ! * mx-forum.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') ) { define('IN_PORTAL', 1); ! $mx_root_path = "./"; $include_page_tail = 1; include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.'.$phpEx); - // - // Start session management - // $userdata = session_pagestart($user_ip, PAGE_FORUM); ! mx_init_userprefs($userdata); ! // ! // End session management ! // } $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; --- 1,51 ---- <?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 : ! * ------------------------------------------------------------------------- ! * 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') ) { define('IN_PORTAL', 1); ! $mx_root_path = '../../'; $include_page_tail = 1; include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.' . $phpEx); $userdata = session_pagestart($user_ip, PAGE_FORUM); ! mx_init_userprefs($userdata); } + // ================================================================================ + // The following code is based on includes/page_header.php (phpBB 2.0.14) + // ================================================================================ + + $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'])]; + + + // ================================================================================ + // The following code is based on index.php (phpBB 2.0.14) + // ================================================================================ + $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; *************** *** 63,70 **** $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' .append_sid( PORTAL_URL . "index.$phpEx") . '">') ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid( PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); --- 70,77 ---- $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx") . '">' ) ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 88,92 **** $newest_uid = $newest_userdata['user_id']; - if( $total_posts == 0 ) { --- 95,98 ---- *************** *** 120,124 **** // $sql = "SELECT c.cat_id, c.cat_title, c.cat_order ! FROM " . CATEGORIES_TABLE . " c ORDER BY c.cat_order"; if( !($result = $db->sql_query($sql)) ) --- 126,130 ---- // $sql = "SELECT c.cat_id, c.cat_title, c.cat_order ! FROM " . CATEGORIES_TABLE . " c ORDER BY c.cat_order"; if( !($result = $db->sql_query($sql)) ) *************** *** 127,449 **** } while( $category_rows[] = $db->sql_fetchrow($result) ); if( ( $total_categories = count($category_rows) ) ) ! { ! // ! // Define appropriate SQL ! // ! switch(SQL_LAYER) ! { ! case 'postgresql': ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u ! WHERE p.post_id = f.forum_last_post_id ! AND u.user_id = p.poster_id ! UNION ( ! SELECT f.*, NULL, NULL, NULL, NULL ! FROM " . FORUMS_TABLE . " f ! WHERE NOT EXISTS ( ! SELECT p.post_time ! FROM " . POSTS_TABLE . " p ! WHERE p.post_id = f.forum_last_post_id ! ) ! ) ! ORDER BY cat_id, forum_order"; ! break; ! case 'oracle': ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u ! WHERE p.post_id = f.forum_last_post_id(+) ! AND u.user_id = p.poster_id(+) ! ORDER BY f.cat_id, f.forum_order"; ! break; ! default: ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM (( " . FORUMS_TABLE . " f ! LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id ) ! LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id ) ! ORDER BY f.cat_id, f.forum_order"; ! break; ! } ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql); ! } ! $forum_data = array(); ! while( $row = $db->sql_fetchrow($result) ) ! { ! $forum_data[] = $row; ! } ! if ( !($total_forums = count($forum_data)) ) ! { ! mx_message_die(GENERAL_MESSAGE, $lang['No_forums']); ! } ! // ! // Obtain a list of topic ids which contain ! // posts made since user last visited ! // ! if ( $userdata['session_logged_in'] ) ! { ! $sql = "SELECT t.forum_id, t.topic_id, p.post_time ! FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p ! WHERE p.post_id = t.topic_last_post_id ! AND p.post_time > " . $userdata['user_lastvisit'] . " ! AND t.topic_moved_id = 0"; ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); ! } ! $new_topic_data = array(); ! while( $topic_data = $db->sql_fetchrow($result) ) ! { ! $new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time']; ! } ! } ! // ! // Obtain list of moderators of each forum ! // First users, then groups ... broken into two queries ! // ! $sql = "SELECT aa.forum_id, u.user_id, u.username ! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u ! WHERE aa.auth_mod = " . TRUE . " ! AND g.group_single_user = 1 ! AND ug.group_id = aa.group_id ! AND g.group_id = aa.group_id ! AND u.user_id = ug.user_id ! GROUP BY u.user_id, u.username, aa.forum_id ! ORDER BY aa.forum_id, u.user_id"; ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); ! } ! $forum_moderators = array(); ! while( $row = $db->sql_fetchrow($result) ) ! { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>'; ! } ! $sql = "SELECT aa.forum_id, g.group_id, g.group_name ! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g ! WHERE aa.auth_mod = " . TRUE . " ! AND g.group_single_user = 0 ! AND g.group_type <> " . GROUP_HIDDEN . " ! AND ug.group_id = aa.group_id ! AND g.group_id = aa.group_id ! GROUP BY g.group_id, g.group_name, aa.forum_id ! ORDER BY aa.forum_id, g.group_id"; ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); ! } ! while( $row = $db->sql_fetchrow($result) ) ! { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid( PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>'; ! } ! // ! // Find which forums are visible for this user ! // ! $is_auth_ary = array(); ! $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_data); ! // ! // Start output of page ! // ! $template->set_filenames(array( ! 'block_forum' => 'mx_forum.tpl') ! ); ! $template->assign_vars(array( ! 'BLOCK_SIZE' => $block_size, ! //'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), ! //'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! //'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), ! 'FORUM_IMG' => $images['forum'], ! 'FORUM_NEW_IMG' => $images['forum_new'], ! 'FORUM_LOCKED_IMG' => $images['forum_locked'], ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! ! 'L_FORUM' => $lang['Forum'], ! 'L_TOPICS' => $lang['Topics'], ! 'L_REPLIES' => $lang['Replies'], ! 'L_VIEWS' => $lang['Views'], ! 'L_POSTS' => $lang['Posts'], ! 'L_LASTPOST' => $lang['Last_Post'], ! 'L_NO_NEW_POSTS' => $lang['No_new_posts'], ! 'L_NEW_POSTS' => $lang['New_posts'], ! 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], ! 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], ! 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], ! 'L_MODERATOR' => $lang['Moderators'], ! 'L_FORUM_LOCKED' => $lang['Forum_is_locked'], ! 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! 'U_MARK_READ' => append_sid( PORTAL_URL . "mx_forum.$phpEx?mark=forums")) ! ); ! // ! // Okay, let's build the index ! // ! for($i = 0; $i < $total_categories; $i++) ! { ! $cat_id = $category_rows[$i]['cat_id']; ! // ! // Should we display this category/forum set? ! // ! $display_forums = false; ! for($j = 0; $j < $total_forums; $j++) ! { ! if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id ) ! { ! $display_forums = true; ! } ! } ! // ! // Yes, we should, so first dump out the category ! // title, then, if appropriate the forum list ! // ! if ( $display_forums ) ! { ! $template->assign_block_vars('catrow', array( ! 'CAT_ID' => $cat_id, ! 'CAT_DESC' => $category_rows[$i]['cat_title'], ! 'U_VIEWCAT' => append_sid( PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id")) ! ); ! if ( $viewcat == $cat_id || $viewcat == -1 ) ! { ! for($j = 0; $j < $total_forums; $j++) ! { ! if ( $forum_data[$j]['cat_id'] == $cat_id ) ! { ! $forum_id = $forum_data[$j]['forum_id']; ! if ( $is_auth_ary[$forum_id]['auth_view'] ) ! { ! if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED ) ! { ! $folder_image = $images['forum_locked']; ! $folder_alt = $lang['Forum_locked']; ! } ! else ! { ! $unread_topics = false; ! if ( $userdata['session_logged_in'] ) ! { ! if ( !empty($new_topic_data[$forum_id]) ) ! { ! $forum_last_post_time = 0; ! while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) ) ! { ! if ( empty($tracking_topics[$check_topic_id]) ) ! { ! $unread_topics = true; ! $forum_last_post_time = max($check_post_time, $forum_last_post_time); ! } ! else ! { ! if ( $tracking_topics[$check_topic_id] < $check_post_time ) ! { ! $unread_topics = true; ! $forum_last_post_time = max($check_post_time, $forum_last_post_time); ! } ! } ! } ! if ( !empty($tracking_forums[$forum_id]) ) ! { ! if ( $tracking_forums[$forum_id] > $forum_last_post_time ) ! { ! $unread_topics = false; ! } ! } ! if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) ! { ! if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) ! { ! $unread_topics = false; ! } ! } ! } ! } ! $folder_image = ( $unread_topics ) ? $images['forum_new'] : $images['forum']; ! $folder_alt = ( $unread_topics ) ? $lang['New_posts'] : $lang['No_new_posts']; ! } ! $posts = $forum_data[$j]['forum_posts']; ! $topics = $forum_data[$j]['forum_topics']; ! if ( $forum_data[$j]['forum_last_post_id'] ) ! { ! $last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); ! $last_post = $last_post_time . '<br />'; ! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid( PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; ! ! $last_post .= '<a href="' . append_sid( PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . PHPBB_URL . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; ! } ! else ! { ! $last_post = $lang['No_Posts']; ! } ! if ( count($forum_moderators[$forum_id]) > 0 ) ! { ! $l_moderators = ( count($forum_moderators[$forum_id]) == 1 ) ? $lang['Moderator'] : $lang['Moderators']; ! $moderator_list = implode(', ', $forum_moderators[$forum_id]); ! } ! else ! { ! $l_moderators = ' '; ! $moderator_list = ' '; ! } ! $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! $template->assign_block_vars('catrow.forumrow', array( ! 'ROW_COLOR' => '#' . $row_color, ! 'ROW_CLASS' => $row_class, ! 'FORUM_FOLDER_IMG' => $folder_image, ! 'FORUM_NAME' => $forum_data[$j]['forum_name'], ! 'FORUM_DESC' => $forum_data[$j]['forum_desc'], ! 'POSTS' => $forum_data[$j]['forum_posts'], ! 'TOPICS' => $forum_data[$j]['forum_topics'], ! 'LAST_POST' => $last_post, ! 'MODERATORS' => $moderator_list, ! 'L_MODERATOR' => $l_moderators, ! 'L_FORUM_FOLDER_ALT' => $folder_alt, ! 'U_VIEWFORUM' => append_sid( PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ! ); ! } ! } ! } ! } ! } ! } // for ... categories }// if ... total_categories --- 133,465 ---- } + $category_rows = array(); while( $category_rows[] = $db->sql_fetchrow($result) ); + $db->sql_freeresult($result); if( ( $total_categories = count($category_rows) ) ) ! { ! // ! // Define appropriate SQL ! // ! switch(SQL_LAYER) ! { ! case 'postgresql': ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u ! WHERE p.post_id = f.forum_last_post_id ! AND u.user_id = p.poster_id ! UNION ( ! SELECT f.*, NULL, NULL, NULL, NULL ! FROM " . FORUMS_TABLE . " f ! WHERE NOT EXISTS ( ! SELECT p.post_time ! FROM " . POSTS_TABLE . " p ! WHERE p.post_id = f.forum_last_post_id ! ) ! ) ! ORDER BY cat_id, forum_order"; ! break; ! case 'oracle': ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u ! WHERE p.post_id = f.forum_last_post_id(+) ! AND u.user_id = p.poster_id(+) ! ORDER BY f.cat_id, f.forum_order"; ! break; ! default: ! $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id ! FROM (( " . FORUMS_TABLE . " f ! LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id ) ! LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id ) ! ORDER BY f.cat_id, f.forum_order"; ! break; ! } ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql); ! } ! $forum_data = array(); ! while( $row = $db->sql_fetchrow($result) ) ! { ! $forum_data[] = $row; ! } ! $db->sql_freeresult($result); ! if ( !($total_forums = count($forum_data)) ) ! { ! mx_message_die(GENERAL_MESSAGE, $lang['No_forums']); ! } ! // ! // Obtain a list of topic ids which contain ! // posts made since user last visited ! // ! if ( $userdata['session_logged_in'] ) ! { ! $sql = "SELECT t.forum_id, t.topic_id, p.post_time ! FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p ! WHERE p.post_id = t.topic_last_post_id ! AND p.post_time > " . $userdata['user_lastvisit'] . " ! AND t.topic_moved_id = 0"; ! if ( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); ! } ! $new_topic_data = array(); ! while( $topic_data = $db->sql_fetchrow($result) ) ! { ! $new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time']; ! } ! $db->sql_freeresult($result); ! } ! // ! // Obtain list of moderators of each forum ! // First users, then groups ... broken into two queries ! // ! $sql = "SELECT aa.forum_id, u.user_id, u.username ! FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u ! WHERE aa.auth_mod = " . TRUE . " ! AND g.group_single_user = 1 ! AND ug.group_id = aa.group_id ! AND g.group_id = aa.group_id ! AND u.user_id = ug.user_id ! GROUP BY u.user_id, ... [truncated message content] |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-30 23:50:58
|
Update of /cvsroot/mxbb/core27x/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7560/install Modified Files: mx_install.php Log Message: Mostly/all security updates, mostly in accordance with phpBB 2.0.18... we don't use CVS for the 2.7 series (or at least, we haven't) :-P. Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core27x/install/mx_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_install.php 26 May 2005 21:54:08 -0000 1.2 --- mx_install.php 30 Nov 2005 23:50:45 -0000 1.3 *************** *** 87,97 **** // common.php from phpBB 2.0.13 // error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) was contributed by Matt Kavanagh // PHP5 with register_long_arrays off? ! if (!isset($HTTP_POST_VARS) && isset($_POST)) { $HTTP_POST_VARS = $_POST; --- 87,100 ---- // common.php from phpBB 2.0.13 // + // Maybe we need to just include common.php to handle this? Hmm... + error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) ! // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files // PHP5 with register_long_arrays off? ! if (@phpversion() >= '5.0.0' && (!ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { $HTTP_POST_VARS = $_POST; *************** *** 109,135 **** } ! if (@phpversion() < '4.0.0') { ! // PHP3 path; in PHP3, globals are _always_ registered ! ! // We 'flip' the array of variables to test like this so that ! // we can validate later with isset($test[$var]) (no in_array()) ! $test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL, 'phpEx' => NULL, 'phpbb_root_path' => NULL); ! // Loop through each input array ! @reset($test); ! while (list($input,) = @each($test)) ! { ! while (list($var,) = @each($$input)) ! { ! // Validate the variable to be unset ! if (!isset($test[$var]) && $var != 'test' && $var != 'input') ! { ! unset($$var); ! } ! } ! } } ! else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path --- 112,128 ---- } ! // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { ! die("Hacking attempt"); ! } ! // Protect against HTTP_SESSION_VARS tricks ! if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) ! { ! die("Hacking attempt"); } ! ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path *************** *** 139,143 **** // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); --- 132,136 ---- // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-30 23:50:53
|
Update of /cvsroot/mxbb/core27x In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7560 Modified Files: common.php login.php Log Message: Mostly/all security updates, mostly in accordance with phpBB 2.0.18... we don't use CVS for the 2.7 series (or at least, we haven't) :-P. Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core27x/login.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** login.php 6 May 2005 06:47:57 -0000 1.1 --- login.php 30 Nov 2005 23:50:44 -0000 1.2 *************** *** 131,134 **** --- 131,141 ---- else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) { + // session id check + // added in accordance with phpBB 2.0.18 + if ($sid == '' || $sid != $userdata['session_id']) + { + message_die(GENERAL_ERROR, 'Invalid_session'); + } + if( $userdata['session_logged_in'] ) { *************** *** 168,171 **** --- 175,181 ---- ); + // added in accordance with phpBB 2.0.18 + $forward_page = ''; + if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) { *************** *** 179,184 **** if(count($forward_match) > 1) { - $forward_page = ''; - for($i = 1; $i < count($forward_match); $i++) { --- 189,192 ---- *************** *** 200,207 **** } } - else - { - $forward_page = ''; - } $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : ''; --- 208,211 ---- *************** *** 209,213 **** $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id); $template->assign_vars(array( 'USERNAME' => $username, --- 213,217 ---- $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); $template->assign_vars(array( 'USERNAME' => $username, Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core27x/common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** common.php 22 May 2005 21:31:00 -0000 1.2 --- common.php 30 Nov 2005 23:50:44 -0000 1.3 *************** *** 32,39 **** set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) was contributed by Matt Kavanagh // PHP5 with register_long_arrays off? ! if (!isset($HTTP_POST_VARS) && isset($_POST)) { $HTTP_POST_VARS = $_POST; --- 32,40 ---- set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) ! // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files // PHP5 with register_long_arrays off? ! if (@phpversion() >= '5.0.0' && (!ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { $HTTP_POST_VARS = $_POST; *************** *** 51,77 **** } ! if (@phpversion() < '4.0.0') { ! // PHP3 path; in PHP3, globals are _always_ registered ! ! // We 'flip' the array of variables to test like this so that ! // we can validate later with isset($test[$var]) (no in_array()) ! $test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL, 'phpEx' => NULL, 'phpbb_root_path' => NULL, 'mx_root_path' => NULL); ! // Loop through each input array ! @reset($test); ! while (list($input,) = @each($test)) ! { ! while (list($var,) = @each($$input)) ! { ! // Validate the variable to be unset ! if (!isset($test[$var]) && $var != 'test' && $var != 'input') ! { ! unset($$var); ! } ! } ! } } ! else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path --- 52,68 ---- } ! // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { ! die("Hacking attempt"); ! } ! // Protect against HTTP_SESSION_VARS tricks ! if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) ! { ! die("Hacking attempt"); } ! ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path *************** *** 81,85 **** // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); --- 72,76 ---- // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); *************** *** 189,193 **** if( !defined("MX_INSTALLED") ) { ! header("Location: install/mx_install.$phpEx"); exit; } --- 180,184 ---- if( !defined("MX_INSTALLED") ) { ! header("Location: ' . $mx_root_path . 'install/mx_install.$phpEx"); exit; } *************** *** 202,205 **** --- 193,198 ---- include_once($phpbb_root_path . 'includes/functions.'.$phpEx); include_once($phpbb_root_path . 'includes/db.'.$phpEx); + // We do not need this any longer, unset for safety purposes + unset($dbpasswd); include_once($phpbb_root_path . 'includes/functions_selects.'.$phpEx); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-30 23:50:52
|
Update of /cvsroot/mxbb/core27x/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7560/includes Modified Files: page_header.php page_tail.php Log Message: Mostly/all security updates, mostly in accordance with phpBB 2.0.18... we don't use CVS for the 2.7 series (or at least, we haven't) :-P. Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/page_header.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_header.php 6 May 2005 06:47:58 -0000 1.1 --- page_header.php 30 Nov 2005 23:50:45 -0000 1.2 *************** *** 483,486 **** --- 483,497 ---- { $template->assign_block_vars('switch_user_logged_out', array()); + + // + // Allow autologin? + // Added in accordance with phpBB 2.0.18 + // + + if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) + { + $template->assign_block_vars('switch_allow_autologin', array()); + $template->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array()); + } } else Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core27x/includes/page_tail.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_tail.php 6 May 2005 06:47:58 -0000 1.1 --- page_tail.php 30 Nov 2005 23:50:45 -0000 1.2 *************** *** 26,29 **** --- 26,31 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 39,43 **** 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 'ADMIN_LINK' => $admin_link) ); --- 41,45 ---- 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), 'ADMIN_LINK' => $admin_link) ); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-30 23:50:52
|
Update of /cvsroot/mxbb/core27x/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7560/admin Modified Files: page_footer_admin.php Log Message: Mostly/all security updates, mostly in accordance with phpBB 2.0.18... we don't use CVS for the 2.7 series (or at least, we haven't) :-P. Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core27x/admin/page_footer_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** page_footer_admin.php 6 May 2005 06:47:56 -0000 1.1 --- page_footer_admin.php 30 Nov 2005 23:50:44 -0000 1.2 *************** *** 26,29 **** --- 26,31 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 36,40 **** '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' => $lang['TRANSLATION_INFO']) ); --- 38,42 ---- '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'] : '')) ); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-27 02:14:57
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17628/install Modified Files: mx_install.php Log Message: Security updates for the globals et all... perhaps include() for mxBB's common.php would do, in the future.... Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** mx_install.php 25 Nov 2005 03:05:26 -0000 1.54 --- mx_install.php 27 Nov 2005 02:14:47 -0000 1.55 *************** *** 90,97 **** set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) was contributed by Matt Kavanagh // PHP5 with register_long_arrays off? ! if (!isset($HTTP_POST_VARS) && isset($_POST)) { $HTTP_POST_VARS = $_POST; --- 90,98 ---- set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) ! // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files // PHP5 with register_long_arrays off? ! if (@phpversion() >= '5.0.0' && (!ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { $HTTP_POST_VARS = $_POST; *************** *** 109,135 **** } ! if (@phpversion() < '4.0.0') { ! // PHP3 path; in PHP3, globals are _always_ registered ! ! // We 'flip' the array of variables to test like this so that ! // we can validate later with isset($test[$var]) (no in_array()) ! $test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL, 'phpEx' => NULL, 'phpbb_root_path' => NULL); ! // Loop through each input array ! @reset($test); ! while (list($input,) = @each($test)) ! { ! while (list($var,) = @each($$input)) ! { ! // Validate the variable to be unset ! if (!isset($test[$var]) && $var != 'test' && $var != 'input') ! { ! unset($$var); ! } ! } ! } } ! else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path --- 110,126 ---- } ! // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { ! die("Hacking attempt"); ! } ! // Protect against HTTP_SESSION_VARS tricks ! if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) ! { ! die("Hacking attempt"); } ! ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path *************** *** 139,143 **** // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); --- 130,134 ---- // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); *************** *** 158,162 **** } } ! unset($input); } --- 149,153 ---- } } ! unset($input); } |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-26 18:24:19
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28433/language/lang_english Modified Files: lang_admin.php Log Message: Minor tabbing annoyances... Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** lang_admin.php 24 Oct 2005 00:55:40 -0000 1.51 --- lang_admin.php 26 Nov 2005 18:24:08 -0000 1.52 *************** *** 81,98 **** $lang['return_to_page'] = "Back to Portal Page"; ! $lang['AdminCP_status'] = "<b>Progress report</b>"; ! $lang['AdminCP_action'] = "<b>DB Action</b>"; ! $lang['Invalid_action'] = "Error"; ! $lang['was_installed'] = "was installed"; ! $lang['was_uninstalled'] = "was uninstalled"; ! $lang['was_upgraded'] = "was upgraded"; ! $lang['was_exported'] = "was exported"; ! $lang['was_deleted'] = "was deleted"; ! $lang['was_removed'] = "was removed"; ! $lang['was_inserted'] = "was inserted"; ! $lang['was_updated'] = "was updated"; ! $lang['was_added'] = "was added"; ! $lang['was_moved'] = "was moved"; ! $lang['was_synced'] = "was synced"; $lang['error_no_field'] = "There's a missing field. Please fill out all the needed fields..."; --- 81,98 ---- $lang['return_to_page'] = "Back to Portal Page"; ! $lang['AdminCP_status'] = "<b>Progress report</b>"; ! $lang['AdminCP_action'] = "<b>DB Action</b>"; ! $lang['Invalid_action'] = "Error"; ! $lang['was_installed'] = "was installed"; ! $lang['was_uninstalled'] = "was uninstalled"; ! $lang['was_upgraded'] = "was upgraded"; ! $lang['was_exported'] = "was exported"; ! $lang['was_deleted'] = "was deleted"; ! $lang['was_removed'] = "was removed"; ! $lang['was_inserted'] = "was inserted"; ! $lang['was_updated'] = "was updated"; ! $lang['was_added'] = "was added"; ! $lang['was_moved'] = "was moved"; ! $lang['was_synced'] = "was synced"; $lang['error_no_field'] = "There's a missing field. Please fill out all the needed fields..."; |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 22:05:19
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23474/language/lang_english Modified Files: lang_main.php Log Message: Some spelling fixes... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_main.php 3 Nov 2005 12:13:34 -0000 1.4 --- lang_main.php 25 Nov 2005 22:05:11 -0000 1.5 *************** *** 34,39 **** $lang['Add_article'] = 'Submit Article'; $lang['Read_article'] = 'Reading Article'; ! $lang['Article_not_exsist'] = 'Article doesn\'t exsist'; ! $lang['Category_not_exsist'] = 'Category doesn\'t exsist'; $lang['Edit'] = 'Edit'; --- 34,39 ---- $lang['Add_article'] = 'Submit Article'; $lang['Read_article'] = 'Reading Article'; ! $lang['Article_not_exsist'] = 'Article doesn\'t exist'; ! $lang['Category_not_exsist'] = 'Category doesn\'t exist'; $lang['Edit'] = 'Edit'; *************** *** 172,176 **** $lang['KB_Rules_edit_cannot'] = 'You <b>cannot</b> edit your articles in this category'; $lang['KB_Rules_delete_can'] = 'You <b>can</b> delete your articles in this category'; ! $lang['KB_Rules_delete_cannot'] = 'You <b>cannot</b> delete your articles in this category'; $lang['KB_Rules_rate_can'] = 'You <b>can</b> rate articles in this category'; $lang['KB_Rules_rate_cannot'] = 'You <b>cannot</b> rate articles in this category'; --- 172,176 ---- $lang['KB_Rules_edit_cannot'] = 'You <b>cannot</b> edit your articles in this category'; $lang['KB_Rules_delete_can'] = 'You <b>can</b> delete your articles in this category'; ! $lang['KB_Rules_delete_cannot'] = 'You <b>cannot</b> delete eyour articles in this category'; $lang['KB_Rules_rate_can'] = 'You <b>can</b> rate articles in this category'; $lang['KB_Rules_rate_cannot'] = 'You <b>cannot</b> rate articles in this category'; |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 03:05:37
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28731/install Modified Files: mx_install.php Log Message: Dead mailing list news info link... Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** mx_install.php 23 Oct 2005 18:37:06 -0000 1.53 --- mx_install.php 25 Nov 2005 03:05:26 -0000 1.54 *************** *** 69,73 **** // These URLs are used in the last installation/upgrade panels. // ! define('U_MXBB_NEWS_INFO', 'http://www.mx-system.com/forum/viewtopic.php?t=6295'); define('U_MXBB_NEWS_NOW', 'http://lists.sourceforge.net/lists/listinfo/mxbb-news'); --- 69,73 ---- // These URLs are used in the last installation/upgrade panels. // ! define('U_MXBB_NEWS_INFO', 'http://lists.sourceforge.net/lists/listinfo/mxbb-news'); define('U_MXBB_NEWS_NOW', 'http://lists.sourceforge.net/lists/listinfo/mxbb-news'); |
2 messages has been excluded from this view by a project administrator.
