Menu
▾
▴
[mxbb-commits] mx_phpbb db_install.php, 1.14, 1.15 db_uninstall.php, 1.5, 1.6 db_upgrade.php, 1.9, 1.10 mx_phpbb.php, 1.13, 1.14
|
From: OryNider <ory...@us...> - 2008-02-08 04:26:30
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3724 Modified Files: db_install.php db_uninstall.php db_upgrade.php mx_phpbb.php Log Message: some fixes :) Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/db_uninstall.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_uninstall.php 2 May 2006 23:28:18 -0000 1.5 --- db_uninstall.php 8 Feb 2008 04:26:20 -0000 1.6 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * Index: mx_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_phpbb.php 9 Sep 2007 20:19:43 -0000 1.13 --- mx_phpbb.php 8 Feb 2008 04:26:20 -0000 1.14 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 58,64 **** } include_once($mx_root_path . "modules/mx_phpbb/includes/forum_hack.$phpEx"); include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx"); ! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); // Also include phpBB lang keys // --- 58,79 ---- } + $default_lang = ($mx_user->lang['default_lang']) ? $mx_user->lang['default_lang'] : $board_config['default_lang']; + + if ( empty($default_lang) ) + { + // - populate $default_lang + $default_lang= 'english'; + } + include_once($mx_root_path . "modules/mx_phpbb/includes/forum_hack.$phpEx"); include_once($mx_root_path . "modules/mx_phpbb/includes/phpbb_constants.$phpEx"); ! ! if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx") === false) ! { ! if ((@include $mx_root_path . "includes/shared/phpbb2/language/lang_english/lang_main.$phpEx") === false) ! { ! die('Language file ' . $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); ! } ! } // *************** *** 74,78 **** ob_start(); ! $mx_forum->read_file( $mx_forum->phpbb_script ); $phpbb_output = ob_get_contents(); ob_end_clean(); --- 89,93 ---- ob_start(); ! $mx_forum->read_file($mx_forum->phpbb_script); $phpbb_output = ob_get_contents(); ob_end_clean(); *************** *** 84,91 **** { case 'index': ! //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_new_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_new_big.gif', $phpbb_output); ! //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_big.gif', $phpbb_output); ! //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_locked_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_locked_big.gif', $phpbb_output); ! //$phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/whosonline.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/whosonline.gif', $phpbb_output); break; --- 99,106 ---- { case 'index': ! $phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_new_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_new_big.gif', $phpbb_output); ! $phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_big.gif', $phpbb_output); ! $phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/folder_locked_big.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/folder_locked_big.gif', $phpbb_output); ! $phpbb_output = str_replace('"templates/'.$theme['template_name'].'/images/whosonline.gif', '"' . $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/whosonline.gif', $phpbb_output); break; *************** *** 94,99 **** case 'viewtopic': ! //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_output); ! //$phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_output); break; --- 109,114 ---- case 'viewtopic': ! $phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_lcap.gif', $phpbb_output); ! $phpbb_output = str_replace('templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_root_path . 'templates/'.$theme['template_name'].'/images/vote_rcap.gif', $phpbb_output); break; Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/db_install.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** db_install.php 22 Jul 2007 21:06:50 -0000 1.14 --- db_install.php 8 Feb 2008 04:26:20 -0000 1.15 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 34,38 **** $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb.net" target="_blank">Jon</a>'; // If fresh install --- 34,38 ---- $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original Mx-Publisher <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mx-publisher.com" target="_blank">Jon</a>'; // If fresh install Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/db_upgrade.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** db_upgrade.php 22 Jul 2007 21:06:50 -0000 1.9 --- db_upgrade.php 8 Feb 2008 04:26:20 -0000 1.10 *************** *** 2,8 **** /** * ! * @package mxBB Portal Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * --- 2,8 ---- /** * ! * @package Mx-Publisher Module - mx_phpbb * @version $Id$ ! * @copyright (c) 2002-2006 [Markus, Jon Ohlsson] Mx-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * *************** *** 31,35 **** $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb.net" target="_blank">Jon</a>'; $sql = array(); --- 31,35 ---- $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original Mx-Publisher <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mx-publisher.com" target="_blank">Jon</a>'; $sql = array(); |
