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: 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(); |
|
From: OryNider <ory...@us...> - 2008-02-08 04:26:27
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3724/includes Modified Files: forum_hack.php phpbb_constants.php phpbb_defs.php phpbb_footer.php Log Message: some fixes :) Index: phpbb_footer.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_footer.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** phpbb_footer.php 5 Apr 2006 22:36:12 -0000 1.4 --- phpbb_footer.php 8 Feb 2008 04:26:20 -0000 1.5 *************** *** 2,13 **** /** * ! * @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 * */ ! if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); --- 2,13 ---- /** * ! * @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 * */ ! if ( !defined('IN_PORTAL') ) { die( "Hacking attempt" ); Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** forum_hack.php 4 Feb 2008 23:42:18 -0000 1.28 --- forum_hack.php 8 Feb 2008 04:26:20 -0000 1.29 *************** *** 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 * *************** *** 32,36 **** include_once($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx); ! include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx); //Check for cash mod --- 32,53 ---- include_once($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx); ! ! include_once($phpbb_root_path . 'includes/auth.' . $phpEx); ! ! if(!function_exists(create_date)) ! { ! function create_date($format, $gmepoch, $tz) ! { ! return phpBB2::create_date($format, $gmepoch, $tz); ! } ! } ! ! if(!function_exists(get_db_stat)) ! { ! function get_db_stat($mode) ! { ! return phpBB2::get_db_stat($mode); ! } ! } //Check for cash mod *************** *** 419,423 **** // ! // Redirect phpBB login calls to mxBB // if ($script_name == 'login') --- 436,440 ---- // ! // Redirect phpBB login calls to Mx-Publisher // if ($script_name == 'login') *************** *** 646,650 **** $script_vars = array( 'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ), ! 'CURRENT_TIME' => sprintf( $lang['Current_time'], phpBB2::create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ), 'L_SEARCH_NEW' => $lang['Search_new'], 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], --- 663,667 ---- $script_vars = array( 'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ), ! 'CURRENT_TIME' => sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ), 'L_SEARCH_NEW' => $lang['Search_new'], 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], *************** *** 1270,1274 **** 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], --- 1287,1291 ---- 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], *************** *** 1346,1354 **** // Commment out the main includes // ! $cashcode = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $cashcode); ! $cashcode = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $cashcode); // ! // Remove some includes already included by mxBB // $cashcode = preg_replace ("/include(.*)bbcode/", "//", $cashcode); --- 1363,1371 ---- // Commment out the main includes // ! $cashcode = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// Mx-Publisher: Removed include extension.inc' . "\n", $cashcode); ! $cashcode = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// Mx-Publisher: Removed include common.php' . "\n", $cashcode); // ! // Remove some includes already included by Mx-Publisher // $cashcode = preg_replace ("/include(.*)bbcode/", "//", $cashcode); *************** *** 1358,1362 **** // NOTE: This regex will only work if "global" is stated on a new line... // ! //$cashcode = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $phpbb_root_path, \\3', $cashcode); // --- 1375,1379 ---- // NOTE: This regex will only work if "global" is stated on a new line... // ! //$cashcode = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// Mx-Publisher rewrite of global, to instance $this in this function' . "\n " . 'global $phpbb_root_path, \\3', $cashcode); // *************** *** 1385,1389 **** // Remove def of IN_PHPBB // ! $code = preg_replace('#^(.?define).*(IN_PHPBB).*(\r\n?|\n)#m','// mxBB: Removed IN_PHPBB def' . "\n", $code); // --- 1402,1406 ---- // Remove def of IN_PHPBB // ! $code = preg_replace('#^(.?define).*(IN_PHPBB).*(\r\n?|\n)#m','// Mx-Publisher: Removed IN_PHPBB def' . "\n", $code); // *************** *** 1401,1406 **** // Commment out the main includes // ! $code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); ! $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $code); --- 1418,1423 ---- // Commment out the main includes // ! $code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// Mx-Publisher: Removed include extension.inc' . "\n", $code); ! $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// Mx-Publisher: Removed include common.php' . "\n", $code); *************** *** 1408,1413 **** // Commment out the page_header and page_tail includes // ! $code = preg_replace('#^(.?).*(include).*(page_header).*(\r\n?|\n)#m','// mxBB: Removed include page_header.php' . "\n", $code); ! $code = preg_replace('#^(.?).*(include).*(page_tail).*(\r\n?|\n)#m',"// mxBB: Removed include page_tail.php" . "\n" . 'return;' . "\n", $code); --- 1425,1430 ---- // Commment out the page_header and page_tail includes // ! $code = preg_replace('#^(.?).*(include).*(page_header).*(\r\n?|\n)#m','// Mx-Publisher: Removed include page_header.php' . "\n", $code); ! $code = preg_replace('#^(.?).*(include).*(page_tail).*(\r\n?|\n)#m',"// Mx-Publisher: Removed include page_tail.php" . "\n" . 'return;' . "\n", $code); *************** *** 1419,1423 **** // ! // Replace common phpBB functions with mxBB alternatives // $code = str_replace('append_sid(', '$mx_forum->append_sid(', $code); --- 1436,1440 ---- // ! // Replace common phpBB functions with Mx-Publisher alternatives // $code = str_replace('append_sid(', '$mx_forum->append_sid(', $code); *************** *** 1436,1440 **** // ! // Remove some includes already included by mxBB // $code = preg_replace ("/include(.*)functions_select/", "//", $code); --- 1453,1457 ---- // ! // Remove some includes already included by Mx-Publisher // $code = preg_replace ("/include(.*)functions_select/", "//", $code); *************** *** 1447,1451 **** // NOTE: This regex will only work if "global" is stated on a new line... // ! $code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code); // --- 1464,1468 ---- // NOTE: This regex will only work if "global" is stated on a new line... // ! $code = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// Mx-Publisher rewrite of global, to instance $this in this function' . "\n " . 'global $mx_forum, \\3', $code); // *************** *** 1547,1553 **** --- 1564,1573 ---- break; } + + /* //this funtions are now in funtion container $code = str_replace('get_db_stat', 'phpBB2::get_db_stat', $code); $code = str_replace('create_date', 'phpBB2::create_date', $code); + */ // Index: phpbb_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_defs.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** phpbb_defs.php 17 Jun 2006 20:14:00 -0000 1.4 --- phpbb_defs.php 8 Feb 2008 04:26:20 -0000 1.5 *************** *** 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: phpbb_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_constants.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** phpbb_constants.php 9 Sep 2007 20:19:43 -0000 1.6 --- phpbb_constants.php 8 Feb 2008 04:26:20 -0000 1.7 *************** *** 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 * *************** *** 16,20 **** if ( PORTAL_BACKEND != 'phpbb2' ) { ! mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for mxBB with phpBB2 backend, thus not compatible with current setup.'); } --- 16,20 ---- if ( PORTAL_BACKEND != 'phpbb2' ) { ! mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for Mx-Publisher with phpBB2 backend, thus not compatible with current setup.'); } *************** *** 37,41 **** { // ---------- ! $current_template_images = $module_root_path . "templates/" . "subSilver" . "/images" ; // ---------- } --- 37,41 ---- { // ---------- ! $current_template_images = $module_root_path . "templates/" . "_core" . "/images" ; // ---------- } *************** *** 58,62 **** if (is_object($mx_page)) { ! $mx_page->add_copyright( 'mxBB phpBB Module' ); } --- 58,62 ---- if (is_object($mx_page)) { ! $mx_page->add_copyright( 'Mx-Publisher phpBB Module' ); } |
|
From: Culprit <cul...@us...> - 2008-02-07 16:17:04
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24783/core/includes Modified Files: template.php Log Message: Compiling phpBB3 template tags. extra white space Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/template.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** template.php 5 Feb 2008 22:39:43 -0000 1.23 --- template.php 7 Feb 2008 16:16:59 -0000 1.24 *************** *** 1551,1555 **** // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = $pos2 == $pos3 ? '' : substr($line, $pos3 + 1, $pos2 - $pos3 - 1); $code_lines[$i] = substr($line, $pos2 + 4); $i--; --- 1551,1555 ---- // remove keyword $keyword_str = substr($line, $pos1, $pos2 - $pos1 + 4); ! $params_str = $pos2 == $pos3 ? '' : trim(substr($line, $pos3 + 1, $pos2 - $pos3 - 1)); $code_lines[$i] = substr($line, $pos2 + 4); $i--; |
|
From: Culprit <cul...@us...> - 2008-02-07 08:58:46
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5882/core/admin Modified Files: index_new.php Log Message: Functionality fix Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index_new.php 6 Feb 2008 15:13:21 -0000 1.5 --- index_new.php 7 Feb 2008 08:58:39 -0000 1.6 *************** *** 2,10 **** /** * ! * @package MX-Publisher Core * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * @origin This file is borrowed from phpBB, with some modifications */ --- 2,10 ---- /** * ! * @package mx-Publisher Core * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net * @origin This file is borrowed from phpBB, with some modifications */ *************** *** 112,116 **** if ( PORTAL_BACKEND == OLYMPUS_BACKEND) { ! mx_page::load_file( 'auth', 'phpbb3'); mx_page::load_file( 'functions_module', 'phpbb3'); $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : 'adm/'; --- 112,119 ---- if ( PORTAL_BACKEND == OLYMPUS_BACKEND) { ! include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.php'); ! mx_page::load_file( 'acp/auth', 'phpbb3'); ! //mx_page::load_file( 'auth', 'phpbb3'); ! mx_page::load_file( 'functions', 'phpbb3'); mx_page::load_file( 'functions_module', 'phpbb3'); $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : 'adm/'; |
|
From: OryNider <ory...@us...> - 2008-02-07 03:06:25
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22883 Modified Files: mx_install.php Log Message: same fix like in 2.8.1 Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** mx_install.php 7 Feb 2008 01:34:32 -0000 1.85 --- mx_install.php 7 Feb 2008 03:06:15 -0000 1.86 *************** *** 65,69 **** define('INSTALLING', true); $mx_root_path = '../'; ! // // FYI: --- 65,69 ---- define('INSTALLING', true); $mx_root_path = '../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); // // FYI: *************** *** 74,78 **** error_reporting(E_ALL ^ E_NOTICE); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output // ================================================================================ --- 74,78 ---- error_reporting(E_ALL ^ E_NOTICE); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . "modules/mx_shared/ErrorHandler/prepend.$phpEx"); // For nice error output // ================================================================================ *************** *** 124,131 **** if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! //exit; //this will die is php5 save mode } else --- 124,131 ---- if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || ! if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off plus you have save mode restrictions and there is no COOKIE."); } else *************** *** 172,175 **** --- 172,176 ---- } + // The following code (unsetting globals) // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files *************** *** 192,195 **** --- 193,197 ---- } + // 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'])) *************** *** 382,386 **** // HERE BEGINS THE PARTY... // ================================================================================ - $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . "install/includes/functions_install.$phpEx"); --- 384,387 ---- |
|
From: OryNider <ory...@us...> - 2008-02-07 03:03:34
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20600 Modified Files: Tag: core28x mx_install.php Log Message: finished fixing mx_install Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.79.2.2 retrieving revision 1.79.2.3 diff -C2 -d -r1.79.2.2 -r1.79.2.3 *** mx_install.php 7 Feb 2008 01:34:59 -0000 1.79.2.2 --- mx_install.php 7 Feb 2008 03:03:25 -0000 1.79.2.3 *************** *** 74,78 **** error_reporting(E_ALL ^ E_NOTICE); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . 'modules/mx_shared/ErrorHandler/prepend.php'); // For nice error output // ================================================================================ --- 74,78 ---- error_reporting(E_ALL ^ E_NOTICE); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables ! include($mx_root_path . "modules/mx_shared/ErrorHandler/prepend.$phpEx"); // For nice error output // ================================================================================ *************** *** 124,131 **** if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! //exit; //this will die is php5 save mode } else --- 124,131 ---- if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || ! if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off plus you have save mode restrictions and there is no COOKIE."); } else *************** *** 172,178 **** --- 172,180 ---- } + // 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')) *************** *** 192,195 **** --- 194,198 ---- } + // 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'])) *************** *** 204,241 **** } - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') - { - // PHP4+ path - $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx'); - - // Not only will array_merge give a warning if a parameter - // 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(); - } - - // Merge all into one extremely huge array; unset - // this later - // - // Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead - // - $input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); - //$input = $HTTP_GET_VARS + $HTTP_POST_VARS + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES; - - unset($input['input']); - unset($input['not_unset']); - - while (list($var,) = @each($input)) - { - if (in_array($var, $not_unset)) - { - die('Hacking attempt!'); - } - unset($$var); - } - unset($input); - } // --- 207,210 ---- |
|
From: OryNider <ory...@us...> - 2008-02-07 01:40:06
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13848 Modified Files: Tag: core28x common.php Log Message: typo Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67.2.7 retrieving revision 1.67.2.8 diff -C2 -d -r1.67.2.7 -r1.67.2.8 *** common.php 7 Feb 2008 01:34:59 -0000 1.67.2.7 --- common.php 7 Feb 2008 01:39:59 -0000 1.67.2.8 *************** *** 80,84 **** if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off or you have save mode restrictions and there is no COOKIE."); } else --- 80,84 ---- if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off plus you have save mode restrictions and there is no COOKIE."); } else |
|
From: OryNider <ory...@us...> - 2008-02-07 01:39:42
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13823 Modified Files: common.php Log Message: typo Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** common.php 7 Feb 2008 01:34:32 -0000 1.77 --- common.php 7 Feb 2008 01:39:38 -0000 1.78 *************** *** 82,86 **** if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off or you have save mode restrictions and there is no COOKIE."); } else --- 82,86 ---- if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off plus you have save mode restrictions and there is no COOKIE."); } else |
|
From: OryNider <ory...@us...> - 2008-02-07 01:35:05
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12817/install Modified Files: Tag: core28x mx_install.php Log Message: http://www.mx-system.com/forum/viewtopic.php?p=61446#61446 Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.79.2.1 retrieving revision 1.79.2.2 diff -C2 -d -r1.79.2.1 -r1.79.2.2 *** mx_install.php 3 Feb 2008 19:22:19 -0000 1.79.2.1 --- mx_install.php 7 Feb 2008 01:34:59 -0000 1.79.2.2 *************** *** 65,69 **** define('INSTALLING', true); $mx_root_path = '../'; ! // // FYI: --- 65,69 ---- define('INSTALLING', true); $mx_root_path = '../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); // // FYI: *************** *** 79,83 **** // The following code is based on common.php from phpBB // ================================================================================ ! set_magic_quotes_runtime(0); // Disable magic_quotes_runtime // The following code (unsetting globals) --- 79,174 ---- // The following code is based on common.php from phpBB // ================================================================================ ! /* ! * Remove variables created by register_globals from the global scope ! * Thanks to Matt Kavanagh ! */ ! function deregister_globals() ! { ! $not_unset = array( ! 'GLOBALS' => true, ! '_GET' => true, ! '_POST' => true, ! '_COOKIE' => true, ! '_REQUEST' => true, ! '_SERVER' => true, ! '_SESSION' => true, ! '_ENV' => true, ! '_FILES' => true, ! 'phpEx' => true, ! 'phpbb_root_path' => true, ! 'mx_root_path' => true, ! 'module_root_path' => true ! ); ! ! // Not only will array_merge and array_keys give a warning if ! // a parameter is not an array, array_merge will actually fail. ! // So we check if _SESSION has been initialised. ! if (!isset($_SESSION) || !is_array($_SESSION)) ! { ! $_SESSION = array(); ! } ! ! // Merge all into one extremely huge array; unset this later ! $input = array_merge( ! array_keys($_GET), ! array_keys($_POST), ! array_keys($_COOKIE), ! array_keys($_SERVER), ! array_keys($_SESSION), ! array_keys($_ENV), ! array_keys($_FILES) ! ); ! ! foreach ($input as $varname) ! { ! if (isset($not_unset[$varname])) ! { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) ! { ! //exit; //this will die is php5 save mode ! } ! else ! { ! $cookie = &$_COOKIE; ! while (isset($cookie['GLOBALS'])) ! { ! foreach ($cookie['GLOBALS'] as $registered_var => $value) ! { ! if (!isset($not_unset[$registered_var])) ! { ! unset($GLOBALS[$registered_var]); ! } ! } ! $cookie = &$cookie['GLOBALS']; ! } ! } ! } ! ! unset($GLOBALS[$varname]); ! } ! ! unset($input); ! } ! // If we are on PHP >= 6.0.0 we do not need some code ! if (phpversion() >= '6.0.0-dev') ! { ! /** ! * @ignore ! */ ! define('STRIP', false); ! } ! else ! { ! set_magic_quotes_runtime(0); ! ! // Be paranoid with passed vars ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) ! { ! @deregister_globals(); ! } ! ! define('STRIP', (get_magic_quotes_gpc()) ? true : false); ! } // The following code (unsetting globals) |
|
From: OryNider <ory...@us...> - 2008-02-07 01:35:03
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12817 Modified Files: Tag: core28x common.php Log Message: http://www.mx-system.com/forum/viewtopic.php?p=61446#61446 Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67.2.6 retrieving revision 1.67.2.7 diff -C2 -d -r1.67.2.6 -r1.67.2.7 *** common.php 3 Feb 2008 19:22:09 -0000 1.67.2.6 --- common.php 7 Feb 2008 01:34:59 -0000 1.67.2.7 *************** *** 32,36 **** // The following code is based on common.php from phpBB // ================================================================================ ! set_magic_quotes_runtime(0); // Disable magic_quotes_runtime // The following code (unsetting globals) --- 32,127 ---- // The following code is based on common.php from phpBB // ================================================================================ ! /* ! * Remove variables created by register_globals from the global scope ! * Thanks to Matt Kavanagh ! */ ! function deregister_globals() ! { ! $not_unset = array( ! 'GLOBALS' => true, ! '_GET' => true, ! '_POST' => true, ! '_COOKIE' => true, ! '_REQUEST' => true, ! '_SERVER' => true, ! '_SESSION' => true, ! '_ENV' => true, ! '_FILES' => true, ! 'phpEx' => true, ! 'phpbb_root_path' => true, ! 'mx_root_path' => true, ! 'module_root_path' => true ! ); ! ! // Not only will array_merge and array_keys give a warning if ! // a parameter is not an array, array_merge will actually fail. ! // So we check if _SESSION has been initialised. ! if (!isset($_SESSION) || !is_array($_SESSION)) ! { ! $_SESSION = array(); ! } ! ! // Merge all into one extremely huge array; unset this later ! $input = array_merge( ! array_keys($_GET), ! array_keys($_POST), ! array_keys($_COOKIE), ! array_keys($_SERVER), ! array_keys($_SESSION), ! array_keys($_ENV), ! array_keys($_FILES) ! ); ! ! foreach ($input as $varname) ! { ! if (isset($not_unset[$varname])) ! { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) ! { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off or you have save mode restrictions and there is no COOKIE."); ! } ! else ! { ! $cookie = &$_COOKIE; ! while (isset($cookie['GLOBALS'])) ! { ! foreach ($cookie['GLOBALS'] as $registered_var => $value) ! { ! if (!isset($not_unset[$registered_var])) ! { ! unset($GLOBALS[$registered_var]); ! } ! } ! $cookie = &$cookie['GLOBALS']; ! } ! } ! } ! ! unset($GLOBALS[$varname]); ! } ! ! unset($input); ! } ! // If we are on PHP >= 6.0.0 we do not need some code ! if (phpversion() >= '6.0.0-dev') ! { ! /** ! * @ignore ! */ ! define('STRIP', false); ! } ! else ! { ! set_magic_quotes_runtime(0); ! ! // Be paranoid with passed vars ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) ! { ! @deregister_globals(); ! } ! ! define('STRIP', (get_magic_quotes_gpc()) ? true : false); ! } // The following code (unsetting globals) *************** *** 169,263 **** } - /* - * Remove variables created by register_globals from the global scope - * Thanks to Matt Kavanagh - */ - function deregister_globals() - { - $not_unset = array( - 'GLOBALS' => true, - '_GET' => true, - '_POST' => true, - '_COOKIE' => true, - '_REQUEST' => true, - '_SERVER' => true, - '_SESSION' => true, - '_ENV' => true, - '_FILES' => true, - 'phpEx' => true, - 'phpbb_root_path' => true - ); - - // Not only will array_merge and array_keys give a warning if - // a parameter is not an array, array_merge will actually fail. - // So we check if _SESSION has been initialised. - if (!isset($_SESSION) || !is_array($_SESSION)) - { - $_SESSION = array(); - } - - // Merge all into one extremely huge array; unset this later - $input = array_merge( - array_keys($_GET), - array_keys($_POST), - array_keys($_COOKIE), - array_keys($_SERVER), - array_keys($_SESSION), - array_keys($_ENV), - array_keys($_FILES) - ); - - foreach ($input as $varname) - { - if (isset($not_unset[$varname])) - { - // Hacking attempt. No point in continuing unless it's a COOKIE - if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) - { - exit; - } - else - { - $cookie = &$_COOKIE; - while (isset($cookie['GLOBALS'])) - { - foreach ($cookie['GLOBALS'] as $registered_var => $value) - { - if (!isset($not_unset[$registered_var])) - { - unset($GLOBALS[$registered_var]); - } - } - $cookie = &$cookie['GLOBALS']; - } - } - } - - unset($GLOBALS[$varname]); - } - - unset($input); - } - - // If we are on PHP >= 6.0.0 we do not need some code - if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) - { - /** - * @ignore - */ - define('STRIP', false); - } - else - { - set_magic_quotes_runtime(0); - - // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) - { - deregister_globals(); - } - - define('STRIP', (get_magic_quotes_gpc()) ? true : false); - } // --- 260,263 ---- |
|
From: OryNider <ory...@us...> - 2008-02-07 01:34:37
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12785 Modified Files: common.php Log Message: http://www.mx-system.com/forum/viewtopic.php?p=61446#61446 Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** common.php 4 Feb 2008 16:02:59 -0000 1.76 --- common.php 7 Feb 2008 01:34:32 -0000 1.77 *************** *** 34,38 **** // The following code is based on common.php from phpBB // ================================================================================ ! set_magic_quotes_runtime(0); // Disable magic_quotes_runtime // The following code (unsetting globals) --- 34,129 ---- // The following code is based on common.php from phpBB // ================================================================================ ! /* ! * Remove variables created by register_globals from the global scope ! * Thanks to Matt Kavanagh ! */ ! function deregister_globals() ! { ! $not_unset = array( ! 'GLOBALS' => true, ! '_GET' => true, ! '_POST' => true, ! '_COOKIE' => true, ! '_REQUEST' => true, ! '_SERVER' => true, ! '_SESSION' => true, ! '_ENV' => true, ! '_FILES' => true, ! 'phpEx' => true, ! 'phpbb_root_path' => true, ! 'mx_root_path' => true, ! 'module_root_path' => true ! ); ! ! // Not only will array_merge and array_keys give a warning if ! // a parameter is not an array, array_merge will actually fail. ! // So we check if _SESSION has been initialised. ! if (!isset($_SESSION) || !is_array($_SESSION)) ! { ! $_SESSION = array(); ! } ! ! // Merge all into one extremely huge array; unset this later ! $input = array_merge( ! array_keys($_GET), ! array_keys($_POST), ! array_keys($_COOKIE), ! array_keys($_SERVER), ! array_keys($_SESSION), ! array_keys($_ENV), ! array_keys($_FILES) ! ); ! ! foreach ($input as $varname) ! { ! if (isset($not_unset[$varname])) ! { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) ! { ! die("Hacking attempt. No point in continuing couse regiters globals can't be turned off or you have save mode restrictions and there is no COOKIE."); ! } ! else ! { ! $cookie = &$_COOKIE; ! while (isset($cookie['GLOBALS'])) ! { ! foreach ($cookie['GLOBALS'] as $registered_var => $value) ! { ! if (!isset($not_unset[$registered_var])) ! { ! unset($GLOBALS[$registered_var]); ! } ! } ! $cookie = &$cookie['GLOBALS']; ! } ! } ! } ! ! unset($GLOBALS[$varname]); ! } ! ! unset($input); ! } ! // If we are on PHP >= 6.0.0 we do not need some code ! if (phpversion() >= '6.0.0-dev') ! { ! /** ! * @ignore ! */ ! define('STRIP', false); ! } ! else ! { ! set_magic_quotes_runtime(0); ! ! // Be paranoid with passed vars ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) ! { ! @deregister_globals(); ! } ! ! define('STRIP', (get_magic_quotes_gpc()) ? true : false); ! } // The following code (unsetting globals) *************** *** 172,267 **** } - /* - * Remove variables created by register_globals from the global scope - * Thanks to Matt Kavanagh - */ - function deregister_globals() - { - $not_unset = array( - 'GLOBALS' => true, - '_GET' => true, - '_POST' => true, - '_COOKIE' => true, - '_REQUEST' => true, - '_SERVER' => true, - '_SESSION' => true, - '_ENV' => true, - '_FILES' => true, - 'phpEx' => true, - 'phpbb_root_path' => true - ); - - // Not only will array_merge and array_keys give a warning if - // a parameter is not an array, array_merge will actually fail. - // So we check if _SESSION has been initialised. - if (!isset($_SESSION) || !is_array($_SESSION)) - { - $_SESSION = array(); - } - - // Merge all into one extremely huge array; unset this later - $input = array_merge( - array_keys($_GET), - array_keys($_POST), - array_keys($_COOKIE), - array_keys($_SERVER), - array_keys($_SESSION), - array_keys($_ENV), - array_keys($_FILES) - ); - - foreach ($input as $varname) - { - if (isset($not_unset[$varname])) - { - // Hacking attempt. No point in continuing unless it's a COOKIE - if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) - { - exit; - } - else - { - $cookie = &$_COOKIE; - while (isset($cookie['GLOBALS'])) - { - foreach ($cookie['GLOBALS'] as $registered_var => $value) - { - if (!isset($not_unset[$registered_var])) - { - unset($GLOBALS[$registered_var]); - } - } - $cookie = &$cookie['GLOBALS']; - } - } - } - - unset($GLOBALS[$varname]); - } - - unset($input); - } - - // If we are on PHP >= 6.0.0 we do not need some code - if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) - { - /** - * @ignore - */ - define('STRIP', false); - } - else - { - set_magic_quotes_runtime(0); - - // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) - { - deregister_globals(); - } - - define('STRIP', (get_magic_quotes_gpc()) ? true : false); - } - // // Define some basic configuration arrays this also prevents --- 263,266 ---- |
|
From: OryNider <ory...@us...> - 2008-02-07 01:34:37
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12785/install Modified Files: mx_install.php Log Message: http://www.mx-system.com/forum/viewtopic.php?p=61446#61446 Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** mx_install.php 5 Feb 2008 14:51:28 -0000 1.84 --- mx_install.php 7 Feb 2008 01:34:32 -0000 1.85 *************** *** 79,83 **** // The following code is based on common.php from phpBB // ================================================================================ ! set_magic_quotes_runtime(0); // Disable magic_quotes_runtime // The following code (unsetting globals) --- 79,174 ---- // The following code is based on common.php from phpBB // ================================================================================ ! /* ! * Remove variables created by register_globals from the global scope ! * Thanks to Matt Kavanagh ! */ ! function deregister_globals() ! { ! $not_unset = array( ! 'GLOBALS' => true, ! '_GET' => true, ! '_POST' => true, ! '_COOKIE' => true, ! '_REQUEST' => true, ! '_SERVER' => true, ! '_SESSION' => true, ! '_ENV' => true, ! '_FILES' => true, ! 'phpEx' => true, ! 'phpbb_root_path' => true, ! 'mx_root_path' => true, ! 'module_root_path' => true ! ); ! ! // Not only will array_merge and array_keys give a warning if ! // a parameter is not an array, array_merge will actually fail. ! // So we check if _SESSION has been initialised. ! if (!isset($_SESSION) || !is_array($_SESSION)) ! { ! $_SESSION = array(); ! } ! ! // Merge all into one extremely huge array; unset this later ! $input = array_merge( ! array_keys($_GET), ! array_keys($_POST), ! array_keys($_COOKIE), ! array_keys($_SERVER), ! array_keys($_SESSION), ! array_keys($_ENV), ! array_keys($_FILES) ! ); ! ! foreach ($input as $varname) ! { ! if (isset($not_unset[$varname])) ! { ! // Hacking attempt. No point in continuing unless it's a COOKIE ! if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) ! { ! //exit; //this will die is php5 save mode ! } ! else ! { ! $cookie = &$_COOKIE; ! while (isset($cookie['GLOBALS'])) ! { ! foreach ($cookie['GLOBALS'] as $registered_var => $value) ! { ! if (!isset($not_unset[$registered_var])) ! { ! unset($GLOBALS[$registered_var]); ! } ! } ! $cookie = &$cookie['GLOBALS']; ! } ! } ! } ! ! unset($GLOBALS[$varname]); ! } ! ! unset($input); ! } ! // If we are on PHP >= 6.0.0 we do not need some code ! if (phpversion() >= '6.0.0-dev') ! { ! /** ! * @ignore ! */ ! define('STRIP', false); ! } ! else ! { ! set_magic_quotes_runtime(0); ! ! // Be paranoid with passed vars ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) ! { ! @deregister_globals(); ! } ! ! define('STRIP', (get_magic_quotes_gpc()) ? true : false); ! } // The following code (unsetting globals) *************** *** 216,310 **** } - /* - * Remove variables created by register_globals from the global scope - * Thanks to Matt Kavanagh - */ - function deregister_globals() - { - $not_unset = array( - 'GLOBALS' => true, - '_GET' => true, - '_POST' => true, - '_COOKIE' => true, - '_REQUEST' => true, - '_SERVER' => true, - '_SESSION' => true, - '_ENV' => true, - '_FILES' => true, - 'phpEx' => true, - 'phpbb_root_path' => true - ); - - // Not only will array_merge and array_keys give a warning if - // a parameter is not an array, array_merge will actually fail. - // So we check if _SESSION has been initialised. - if (!isset($_SESSION) || !is_array($_SESSION)) - { - $_SESSION = array(); - } - - // Merge all into one extremely huge array; unset this later - $input = array_merge( - array_keys($_GET), - array_keys($_POST), - array_keys($_COOKIE), - array_keys($_SERVER), - array_keys($_SESSION), - array_keys($_ENV), - array_keys($_FILES) - ); - - foreach ($input as $varname) - { - if (isset($not_unset[$varname])) - { - // Hacking attempt. No point in continuing unless it's a COOKIE - if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) - { - exit; - } - else - { - $cookie = &$_COOKIE; - while (isset($cookie['GLOBALS'])) - { - foreach ($cookie['GLOBALS'] as $registered_var => $value) - { - if (!isset($not_unset[$registered_var])) - { - unset($GLOBALS[$registered_var]); - } - } - $cookie = &$cookie['GLOBALS']; - } - } - } - - unset($GLOBALS[$varname]); - } - - unset($input); - } - - // If we are on PHP >= 6.0.0 we do not need some code - if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) - { - /** - * @ignore - */ - define('STRIP', false); - } - else - { - set_magic_quotes_runtime(0); - - // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) - { - deregister_globals(); - } - - define('STRIP', (get_magic_quotes_gpc()) ? true : false); - } // --- 307,310 ---- |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:25
|
Update of /cvsroot/mxbb/core/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14168 Modified Files: login_body.html overall_noheader.html prosilver.cfg prosilver.css Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu Index: overall_noheader.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_noheader.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_noheader.html 4 Feb 2008 16:01:14 -0000 1.2 --- overall_noheader.html 6 Feb 2008 23:44:18 -0000 1.3 *************** *** 10,14 **** <!-- 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_PHPBB_STYLESHEET}" type="text/css" > ! <!-- Then load MX-Publisher template *.css definition for mx, located in the the portal template folder --> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" > <!-- Optionally, redefine some defintions for gecko browsers --> --- 10,14 ---- <!-- 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_PHPBB_STYLESHEET}" type="text/css" > ! <!-- Then load mxBB template *.css definition for mx, located in the the portal template folder --> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" > <!-- Optionally, redefine some defintions for gecko browsers --> Index: login_body.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/login_body.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** login_body.html 15 Dec 2007 00:08:15 -0000 1.2 --- login_body.html 6 Feb 2008 23:44:17 -0000 1.3 *************** *** 1,29 **** - <div class="navbar"> - <div class="inner"><span class="corners-top"><span></span></span> - <ul class="linklist navlinks"> - <li><a class="icon-home" href="{U_INDEX}">{L_INDEX}</a></li> - <li class="rightside"></li> - </ul> - <ul class="linklist"> - <!-- BEGIN switch_user_logged_in --> - <li> - <a href="{U_PROFILE}" title="{L_PROFILE}" class="icon-ucp">{L_PROFILE}</a> - (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>) • - <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> - </li> - <!-- END switch_user_logged_in --> - <li class="rightside"> - <a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}" class="icon-faq">{L_FAQ}</a> - <a href="{U_SEARCH}" title="{L_SEARCH}" class="icon-search">{L_SEARCH}</a> - <a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" class="icon-members">{L_MEMBERLIST}</a> - <!-- BEGIN switch_user_logged_out --> - <a href="{U_REGISTER}" class="icon-register">{L_REGISTER}</a> - <!-- END switch_user_logged_out --> - <a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" class="icon-logout">{L_LOGIN_LOGOUT}</a> - </li> - </ul> - <span class="corners-bottom"><span></span></span></div> - </div> - <p></p> <form action="{S_LOGIN_ACTION}" method="post" id="login"> <div class="panel"> --- 1,2 ---- *************** *** 55,67 **** </div> </form> ! {JUMPBOX} ! <div class="navbar"> ! <div class="inner"><span class="corners-top"><span></span></span> ! <ul class="linklist"> ! <li> ! <a class="icon-home" href="{U_INDEX}">{L_INDEX}</a> ! </li> ! <li class="rightside"><a href="{U_GROUP_CP}">{L_USERGROUPS}</a> • {S_TIMEZONE}</li> ! </ul> ! <span class="corners-bottom"><span></span></span></div> ! </div> \ No newline at end of file --- 28,30 ---- </div> </form> ! {JUMPBOX} \ No newline at end of file Index: prosilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.cfg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** prosilver.cfg 4 Feb 2008 16:01:14 -0000 1.5 --- prosilver.cfg 6 Feb 2008 23:44:18 -0000 1.6 *************** *** 18,24 **** */ ! /** Adapted for MX-Publisher by: * ! * The MX-Publisher Development Team * Version: 1.0 * Requirements: mxBB Core 2.8.x --- 18,24 ---- */ ! /** Adapted for mxBB by: * ! * The mxBB Development Team * Version: 1.0 * Requirements: mxBB Core 2.8.x *************** *** 40,44 **** // // Credits, copyrights etc ! $mx_template_settings['template_copy'] = 'Original subSilver theme for phpBB by <a href="http://www.subSky.com/phpBB2/">subBlue design</a> :: Adapted for MX-Publisher by <a href="http://www.mx-publisher.com">The MX-Publisher Development Team</a>'; // --- 40,44 ---- // // Credits, copyrights etc ! $mx_template_settings['template_copy'] = 'Original subSilver theme for phpBB by <a href="http://www.subSky.com/phpBB2/">subBlue design</a> :: Adapted for mxBB by <a href="http://www.mxbb.net">The mxBB Development Team</a>'; // *************** *** 58,62 **** /********************************************************************************\ | Define what graphics bundles to use ! | - these are very handy paths to ALL kind of phpBB/MX-Publisher graphics \********************************************************************************/ $mx_images['mx_graphics']['general'] = file_exists( $mx_root_path . $current_template_path . "/images/logo.gif" ) ? $current_template_path . "/images" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/logo.gif" ) ? $cloned_template_path . "/images" : $default_template_path . "/images" ); --- 58,62 ---- /********************************************************************************\ | Define what graphics bundles to use ! | - these are very handy paths to ALL kind of phpBB/mxBB graphics \********************************************************************************/ $mx_images['mx_graphics']['general'] = file_exists( $mx_root_path . $current_template_path . "/images/logo.gif" ) ? $current_template_path . "/images" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/logo.gif" ) ? $cloned_template_path . "/images" : $default_template_path . "/images" ); *************** *** 74,78 **** $current_template_block_images = PORTAL_URL . $mx_images['mx_graphics']['block_icons']; // Used by userCP block buttons $current_template_menu_images = PORTAL_URL . $mx_images['mx_graphics']['menu_icons']; // Used by adminCP - Navigation Menu ! $current_template_admin_images = PORTAL_URL . $mx_images['mx_graphics']['admin_icons']; // Internal graphics for the MX-Publisher adminCP $current_template_phpbb_images = PHPBB_URL . $mx_images['mx_graphics']['phpbb_icons']; // phpBB graphics template $current_template_theme_images = PORTAL_URL . $current_template_path . '/theme/images'; --- 74,78 ---- $current_template_block_images = PORTAL_URL . $mx_images['mx_graphics']['block_icons']; // Used by userCP block buttons $current_template_menu_images = PORTAL_URL . $mx_images['mx_graphics']['menu_icons']; // Used by adminCP - Navigation Menu ! $current_template_admin_images = PORTAL_URL . $mx_images['mx_graphics']['admin_icons']; // Internal graphics for the mxBB adminCP $current_template_phpbb_images = PHPBB_URL . $mx_images['mx_graphics']['phpbb_icons']; // phpBB graphics template $current_template_theme_images = PORTAL_URL . $current_template_path . '/theme/images'; *************** *** 103,107 **** \********************************************************************************/ // ! // Use MX-Publisher graphics - normally the menu_icons bundle // $mx_images['mx_nav_home'] = "$current_template_menu_images/icon_home.gif"; // {NAV_IMAGES_HOME} --- 103,107 ---- \********************************************************************************/ // ! // Use mxBB graphics - normally the menu_icons bundle // $mx_images['mx_nav_home'] = "$current_template_menu_images/icon_home.gif"; // {NAV_IMAGES_HOME} *************** *** 150,160 **** // ! // phpBB Graphics - redefined for MX-Publisher // - Uncomment and redefine phpBB graphics // // If you need to redefine some phpBB graphics, look within the phpBB/templates folder for the template_name.cfg file and ! // redefine those $image['xxx'] you want. Note: Many phpBB images are reused all over MX-Publisher (eg see below), thus if you redefine ! // common phpBB images, this will have immedaite effect for all MX-Publisher pages. // --- 150,160 ---- // ! // phpBB Graphics - redefined for mxBB // - Uncomment and redefine phpBB graphics // // If you need to redefine some phpBB graphics, look within the phpBB/templates folder for the template_name.cfg file and ! // redefine those $image['xxx'] you want. Note: Many phpBB images are reused all over mxBB (eg see below), thus if you redefine ! // common phpBB images, this will have immedaite effect for all mxBB pages. // Index: prosilver.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.css,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** prosilver.css 4 Feb 2008 16:01:14 -0000 1.10 --- prosilver.css 6 Feb 2008 23:44:18 -0000 1.11 *************** *** 1,9 **** ! /* MX-Publisher 3.0 Style Sheet -------------------------------------------------------------- Style name: proSilver Based on style: proSilver (this is the default phpBB 3 style) Original author: subBlue ( http://www.subBlue.com/ ) ! Modified by: MX-Publisher Project Team ! Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) -------------------------------------------------------------- --- 1,9 ---- ! /* mxBB 3.0 Style Sheet -------------------------------------------------------------- Style name: proSilver Based on style: proSilver (this is the default phpBB 3 style) Original author: subBlue ( http://www.subBlue.com/ ) ! Modified by: mxBB Project Team ! Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) -------------------------------------------------------------- *************** *** 28,32 **** background-repeat: no-repeat; background-position: 100% 0; ! } .textbody { padding: 0; --- 28,32 ---- background-repeat: no-repeat; background-position: 100% 0; ! } .textbody { padding: 0; *************** *** 142,148 **** .blockcp fieldset dl { margin-bottom: 10px; ! font-size: 0.85em; ! } --- 142,148 ---- .blockcp fieldset dl { margin-bottom: 10px; ! font-size: 0.85em; ! } *************** *** 202,206 **** margin-bottom: 0.5em; padding-bottom: 0.5em; ! } --- 202,206 ---- margin-bottom: 0.5em; padding-bottom: 0.5em; ! } *************** *** 285,289 **** margin-right: 5px; margin-bottom: 1px; ! display: block; float: right; text-align: right; --- 285,289 ---- margin-right: 5px; margin-bottom: 1px; ! display: block; float: right; text-align: right; *************** *** 320,330 **** vertical-align: middle; margin-right: 3px; - } - - /* TinyMCE specific rules */ - body.mceContentBody { - text-align: left; - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #000; - background: #FFF; } \ No newline at end of file --- 320,322 ---- |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:24
|
Update of /cvsroot/mxbb/core/templates/prosilver/theme/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14168/theme/images Added Files: icon_help.gif sitebar_bg.gif Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu --- NEW FILE: sitebar_bg.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_help.gif --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:12
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13754/includes Modified Files: navmenu_functions.php Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** navmenu_functions.php 4 Feb 2008 16:52:02 -0000 1.10 --- navmenu_functions.php 6 Feb 2008 23:44:02 -0000 1.11 *************** *** 4,8 **** * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com --- 4,8 ---- * @package MX-Publisher Module - mx_navmenu * @version $Id$ ! * @copyright (c) 2002-2008 [Martin, Markus, Jon Ohlsson] MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:09
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13754 Modified Files: mx_menu_nav.php mx_site_nav.php Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_menu_nav.php 4 Feb 2008 16:52:02 -0000 1.27 --- mx_menu_nav.php 6 Feb 2008 23:44:03 -0000 1.28 *************** *** 357,361 **** 'CAT_WIDTH' => $cat_width, ! //+ MX-Publisher 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, --- 357,361 ---- 'CAT_WIDTH' => $cat_width, ! //+ mxBB 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_site_nav.php 4 Feb 2008 16:52:02 -0000 1.5 --- mx_site_nav.php 6 Feb 2008 23:44:03 -0000 1.6 *************** *** 99,103 **** 'CAT_WIDTH' => $cat_width, ! //+ MX-Publisher 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, --- 99,103 ---- 'CAT_WIDTH' => $cat_width, ! //+ mxBB 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:09
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13754/admin Modified Files: mx_module_defs.php Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mx_module_defs.php 4 Feb 2008 16:52:02 -0000 1.30 --- mx_module_defs.php 6 Feb 2008 23:44:02 -0000 1.31 *************** *** 1438,1443 **** } - break; - case MX_MENU_PAGE_TYPE: --- 1438,1441 ---- |
|
From: OryNider <ory...@us...> - 2008-02-06 23:44:00
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13727 Modified Files: functions.php functions_module.php Log Message: phpBB3 backend stuff, culpit I need a working blockCP with nav menu Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** functions_module.php 6 Feb 2008 15:13:40 -0000 1.8 --- functions_module.php 6 Feb 2008 23:43:43 -0000 1.9 *************** *** 19,23 **** // // Common global functions ! // Fixes for mxBB: // $config -> $board_config // $cache -> $mx_cache --- 19,23 ---- // // Common global functions ! // Fixes for MX-Publisher: // $config -> $board_config // $cache -> $mx_cache *************** *** 71,75 **** ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) --- 71,75 ---- ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) *************** *** 206,210 **** $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, --- 206,210 ---- $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, *************** *** 426,432 **** $func_array = array( ! 'request_var', 'add_form_key', 'generate_text_for_display', 'censor_text' ); - $preg_array = array( '#^<\?(php)?|\?>$#si' => '', --- 426,431 ---- $func_array = array( ! 'request_var', 'add_form_key', 'generate_text_for_display' ); $preg_array = array( '#^<\?(php)?|\?>$#si' => '', *************** *** 437,448 **** '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', '#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(', ); ! $modulecode = preg_replace( array_keys( $preg_array), array_values( $preg_array), $modulecode); ! ! $mx_user = new mx_user(); eval($modulecode); --- 436,457 ---- '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', + '#\$mx_acp->template->assign_vars#si' => 'foreach( $mx_user->lang as $key => $value) + { + $mx_acp->template->assign_var( \'L_\' . $key, $value); + } + $mx_acp->template->assign_vars', '#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(', ); + + $modulecode = preg_replace( array_keys( $preg_array), $preg_array, $modulecode); ! //print_r( $mx_user); ! //$mx_user = new mx_user(); ! //$mx_user->add_lang('acp/groups'); ! //print_r( $mx_user->lang); ! //print '<pre style="font:10pt normal;font-family:Courier New">' .preg_replace( array("#\n#esi", "#\t#si"), array("'\n' . sprintf('%4d ', \$i++)", ' '), htmlentities( $modulecode ) ); ! //die(); eval($modulecode); *************** *** 506,510 **** $this->module->main($this->p_name, $this->p_mode); } ! return; } --- 515,519 ---- $this->module->main($this->p_name, $this->p_mode); } ! return; } *************** *** 807,811 **** function display($page_title, $display_online_list = true) { ! global $template, $mx_user; // Generate the page --- 816,820 ---- function display($page_title, $display_online_list = true) { ! global $template, $mx_acp; $mx_user; // Generate the page *************** *** 819,823 **** } ! $template->set_filenames(array( 'body' => $this->get_tpl_name()) ); --- 828,832 ---- } ! $mx_acp->template->set_filenames(array( 'body' => $this->get_tpl_name()) ); |
Update of /cvsroot/mxbb/mx_xs/templates/tpl In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23308 Removed Files: Tag: core28x _xs_test.tpl cache.tpl clone.tpl clone2.tpl config.tpl downloads.tpl edit.tpl edit_data.tpl edit_data_list.tpl edit_file.tpl export.tpl export2.tpl export_data.tpl export_data2.tpl frame_top.tpl frameset.tpl ftp.tpl import.tpl import2.tpl index.tpl install.tpl message.tpl style_config.tpl styles.tpl uninstall.tpl update.tpl update2.tpl xs_footer.tpl xs_header.tpl Log Message: --- clone2.tpl DELETED --- --- update.tpl DELETED --- --- install.tpl DELETED --- --- xs_header.tpl DELETED --- --- uninstall.tpl DELETED --- --- import.tpl DELETED --- --- export.tpl DELETED --- --- clone.tpl DELETED --- --- import2.tpl DELETED --- --- export2.tpl DELETED --- --- styles.tpl DELETED --- --- ftp.tpl DELETED --- --- edit_file.tpl DELETED --- --- config.tpl DELETED --- --- update2.tpl DELETED --- --- cache.tpl DELETED --- --- edit_data.tpl DELETED --- --- downloads.tpl DELETED --- --- index.tpl DELETED --- --- message.tpl DELETED --- --- edit_data_list.tpl DELETED --- --- edit.tpl DELETED --- --- frame_top.tpl DELETED --- --- frameset.tpl DELETED --- --- xs_footer.tpl DELETED --- --- export_data2.tpl DELETED --- --- export_data.tpl DELETED --- --- _xs_test.tpl DELETED --- --- style_config.tpl DELETED --- |
|
From: OryNider <ory...@us...> - 2008-02-06 15:14:23
|
Update of /cvsroot/mxbb/core/templates/prosilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19096 Modified Files: index_navigate.html mainpage_body.html mainpage_footer.html page_footer.html Log Message: new acp releated Index: mainpage_footer.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/mainpage_footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mainpage_footer.html 4 Feb 2008 16:01:14 -0000 1.2 --- mainpage_footer.html 6 Feb 2008 15:14:15 -0000 1.3 *************** *** 1,3 **** ! <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher</a> {MX_VERSION} © 2001-2008 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> --- 1,3 ---- ! <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</a> {MX_VERSION} © 2001-2008 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> Index: page_footer.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/page_footer.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** page_footer.html 4 Feb 2008 16:01:14 -0000 1.5 --- page_footer.html 6 Feb 2008 15:14:15 -0000 1.6 *************** *** 5,9 **** </div> </div> ! <div id="page-footer">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher</a> {MX_VERSION} © 2001-2008 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> --- 5,9 ---- </div> </div> ! <div id="page-footer">{POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</a> {MX_VERSION} © 2001-2008 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> Index: mainpage_body.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/mainpage_body.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mainpage_body.html 21 Jan 2008 01:03:22 -0000 1.1 --- mainpage_body.html 6 Feb 2008 15:14:15 -0000 1.2 *************** *** 59,63 **** <ul> <!-- BEGIN tab --> ! <li{tab.ACTIVE_TAB}><a href="{U_PORTAL_ADMIN_INDEX}&cat={tab.CATEGORY}{tab.PARAMS}"><span>{tab.L_TAB}</span></a></li> <!-- END tab --> </ul> --- 59,63 ---- <ul> <!-- BEGIN tab --> ! <li id="{tab.ACTIVE_TAB}"><a href="{U_PORTAL_ADMIN_INDEX}&cat={tab.CATEGORY}{tab.PARAMS}"><span>{tab.L_TAB}</span></a></li> <!-- END tab --> </ul> *************** *** 76,80 **** <li class="header"><div>{category.ADMIN_CATEGORY}</div></li> <!-- BEGIN panel --> ! <li{category.panel.A_PANEL}><a href="{category.panel.U_PANEL}"><span>{category.panel.L_PANEL}</span></a></li> <!-- END panel --> <!-- END category --> --- 76,80 ---- <li class="header"><div>{category.ADMIN_CATEGORY}</div></li> <!-- BEGIN panel --> ! <li id="{category.panel.A_PANEL}"><a href="{category.panel.U_PANEL}"><span>{category.panel.L_PANEL}</span></a></li> <!-- END panel --> <!-- END category --> *************** *** 83,87 **** <div id="main"> <!-- iframe src="" name="main" id="main_frame" width="100%" SCROLLING="no" style="border:none;margin:0px;padding:0px;"></iframe--> ! <div>{ACTION_SCRIPT}</div> {CONTENT_ACP} --- 83,87 ---- <div id="main"> <!-- iframe src="" name="main" id="main_frame" width="100%" SCROLLING="no" style="border:none;margin:0px;padding:0px;"></iframe--> ! <!--div>{ACTION_SCRIPT}</div--> {CONTENT_ACP} Index: index_navigate.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/index_navigate.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index_navigate.html 5 Feb 2008 14:51:28 -0000 1.4 --- index_navigate.html 6 Feb 2008 15:14:15 -0000 1.5 *************** *** 13,17 **** * Enjoy! ;-) * ! * This MOD is adapted for MX-Publisher adminCP, by Jon *************************************************************/ --- 13,17 ---- * Enjoy! ;-) * ! * This MOD is adapted for mxBB adminCP, by Jon *************************************************************/ |
|
From: OryNider <ory...@us...> - 2008-02-06 15:13:44
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18668 Modified Files: functions.php functions_hook.php functions_module.php Log Message: new acp releated Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions.php 4 Feb 2008 15:56:44 -0000 1.7 --- functions.php 6 Feb 2008 15:13:40 -0000 1.8 *************** *** 11,15 **** // // Common global functions ! // Fixes for MX-Publisher: // $config -> $board_config // $cache -> $mx_cache --- 11,15 ---- // // Common global functions ! // Fixes for mxBB: // $config -> $board_config // $cache -> $mx_cache *************** *** 291,295 **** $random = substr($random, 0, $count); } ! $hash = self::_hash_crypt_private($password, self::_hash_gensalt_private($random, $itoa64), $itoa64); --- 291,295 ---- $random = substr($random, 0, $count); } ! $hash = self::_hash_crypt_private($password, self::_hash_gensalt_private($random, $itoa64), $itoa64); *************** *** 364,368 **** $output .= $itoa64[($value >> 12) & 0x3f]; ! if ($i++ >= $count) { --- 364,368 ---- $output .= $itoa64[($value >> 12) & 0x3f]; ! if ($i++ >= $count) { *************** *** 2781,2785 **** } ! $text = censor_text($text); // Parse bbcode if bbcode uid stored and bbcode enabled --- 2781,2785 ---- } ! $text = phpBB3::censor_text($text); // Parse bbcode if bbcode uid stored and bbcode enabled *************** *** 2807,2811 **** $text = str_replace("\n", '<br />', $text); ! $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); return $text; --- 2807,2811 ---- $text = str_replace("\n", '<br />', $text); ! $text = phpBB3::smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); return $text; *************** *** 3053,3059 **** function smiley_text($text, $force_option = false) { ! global $board_config, $user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); --- 3053,3059 ---- function smiley_text($text, $force_option = false) { ! global $board_config, $mx_user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$mx_user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions_hook.php 4 Feb 2008 15:56:44 -0000 1.6 --- functions_hook.php 6 Feb 2008 15:13:40 -0000 1.7 *************** *** 32,38 **** var $p_master = null; ! ! function mx_phpbb3_admin() { } --- 32,42 ---- var $p_master = null; ! var $mx_master = null; ! function mx_phpbb3_admin( $mx_master = null) { + if ( $mx_master != null) + { + $this->mx_master = $mx_master; + } } *************** *** 207,350 **** { //$html = preg_replace( '#.*\<div id="page-body"\>#si', '', $html); ! ! $html = trim(preg_replace('#(.*\<div id="page-body"\>|</div>[^<]*?<div id="page-footer">.*)#si', '', $html)); ! return $html; ! } ! ! /** ! * OLD HOOK ! */ ! function admin_menu( $part ) ! { ! if ( $this->main_part != 'admin' ) ! { ! return false; ! } ! ! global $db, $lang, $template, $mx_user, $phpEx; ! $sql = "SELECT m1.module_langname AS m1_langname, m2.module_langname AS m2_langname, m2.module_basename AS m2_basename, m2.module_mode AS m2_mode ! FROM " . MODULES_TABLE . " AS m1 RIGHT OUTER JOIN phpbb3_modules AS m2 ON m1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1 ! WHERE m1.parent_id = '$part' AND m1.module_class = 'acp' ! ORDER BY m1.left_id ! "; ! if ( !( $rs = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Could not obtain menu data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql ); ! } ! $header = ''; ! $menu_ary = array(); ! while ( $row = $db->sql_fetchrow( $rs ) ) { ! if ( $header != $row['m1_langname'] ) ! { ! $header = $row['m1_langname']; ! $menu_ary[$header] = array(); ! } ! $menu_ary[$header][$row['m2_langname']] = $row['m2_basename'] ; } ! ! return $menu_ary; } ! function admin_tabs( $curr_tab ) { ! if ( $this->main_part != 'admin' ) ! { ! return false; ! } ! ! global $db, $lang, $template, $mx_user, $phpEx; ! ! $this->current_tab = $curr_tab; ! // This sintax is not correct ! $sql = "SELECT m1.*, count(m2.module_id) AS subcount ! FROM " . MODULES_TABLE . " AS m1 LEFT OUTER JOIN phpbb3_modules AS m2 ON m1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1 ! WHERE m1.parent_id = 0 AND m1.module_class = 'acp' ! GROUP BY m1.module_id ! HAVING count(m2.module_id) > 0 ! ORDER BY m1.left_id ! "; ! ! /* ! $sql = 'SELECT DISTINCT * ! FROM ' . MODULES_TABLE . " ! WHERE module_enabled = 1 ! AND module_display = 1 ! AND parent_id = 0 ! GROUP BY module_id ! ORDER BY left_id ASC"; ! */ ! /* ! $sql_array = array(); ! $sql_array['SELECT'] = 'm1.*, count(m2.module_id) AS subcount'; ! $sql_array['FROM'][MODULES_TABLE] = 'AS m1'; ! $sql_array['LEFT_JOIN'][] = array( ! 'FROM' => array( MODULES_TABLE => 'AS m2' ), ! 'ON' => 'm1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1', ! ); ! $sql_array['GROUP_BY'] = 'm1.module_id'; ! $sql_array['WHERE'] = "m1.parent_id = 0 AND m1.module_class = 'acp'"; ! $sql_array['ORDER_BY'] = 'm1.left_id ASC'; ! $sql = $db->sql_build_query( 'SELECT', $sql_array ); ! */ ! if ( !( $rs = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Could not obtain tabs data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql ); ! } ! $return_category = ''; ! while ( $row = $db->sql_fetchrow( $rs ) ) { } ! return $return_category; ! } ! ! function admin_panel( $acp_panel, $mode = '' ) ! { ! global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $mx_user, $mx_cache, $cache, $template; ! global $phpbb_auth, $auth; ! $phpbb_admin_html = "<h1>In Progress</h1><p>Still not done.</p>"; ! ! $phpbb_admin_html .= "<p>ACP Panel: <strong>$acp_panel</strong></p>"; ! ! include_once( $phpbb_root_path . 'includes/acp/acp_' . $acp_panel . '.' . $phpEx ); ! ! $cache = $mx_cache; ! $user = $mx_user; ! $auth = $phpbb_auth; ! $auth->acl( $user->data ); ! $user->setup( 'acp/common' ); ! ! $module_id = $acp_panel; ! ! $user->theme['template_storedb'] = false; ! // $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); ! // Instantiate new module ! $module = new p_master(); ! // Instantiate module system and generate list of available modules ! $module->list_modules( 'acp' ); ! $module->p_name = $acp_panel; ! // Select the active module ! $module->set_active( $acp_panel, $mode ); ! // Assign data to the template engine for the list of modules ! // We do this before loading the active module for correct menu display in trigger_error ! $module->assign_tpl_vars( append_sid( "{$phpbb_admin_path}index.$phpEx" ) ); ! // Load and execute the relevant module ! $module->load_active(); ! ! ob_start(); ! adm_page_header( $module->get_page_title() ); ! $template->set_filenames( array( 'body' => $phpbb_root_path . 'adm/style/acp_' . $acp_panel . '.html', ! ) ); ! adm_page_footer(); ! $phpbb_admin_html .= ob_get_contents(); ! ob_end_clean(); ! ! return $phpbb_admin_html; } } --- 211,268 ---- { //$html = preg_replace( '#.*\<div id="page-body"\>#si', '', $html); ! global $phpbb_root_path, $phpbb_admin_path; ! $html = trim(preg_replace('#<!-- INCLUDE overall_(header|footer)\.html -->#si', '', $html)); ! //$match_img_count = preg_match_all( '#img src="(adm\/[^"]*)"#s', $html, $match_img); ! // REPLACE IMAGES_PATHs ! $preg_array = array( ! '#img src="((adm|..)\/[^"]*)"#si' => 'img src="'.$phpbb_root_path.'\1"', ! '#img src="(images\/[^"]*)"#si' => 'img src="'.$phpbb_root_path . $phpbb_admin_path.'\1"', ! ); ! $html = preg_replace( array_keys( $preg_array), $preg_array, $html); ! // REPLACE LINK PATHs ! $html = $this->_convert_links( $html); ! if ( 0 ) { ! print '<pre>'; ! print htmlentities( $html); ! print_r( $match_link); ! die( ); } ! return $html; } ! function _convert_links( $html ) { ! global $phpEx, $mx_request_vars; ! $panel_i = $mx_request_vars->request( 'i', ''); ! $menu_action = $this->mx_master->menu_actions; ! $admin_path = $mx_root_path. 'acp/'; ! $match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?]*)\??([^\'"]*?))[\'"]#si', $html, $match_link); ! $preg_array = array(); ! for( $i=0; $i<$match_link_cnt; $i++) { + $params = str_replace( '&', '&', $match_link[4][$i]); + $p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params , $link_parts); + $link_compare_ary = array_combine( $link_parts[1], $link_parts[2]); + $eregi = 'adm/index.' . $phpEx . '?i=' . $panel_i . '&panel=' . $link_compare_ary['i'] . '&mode=' . $link_compare_ary['mode']; + $panel = $menu_action[$eregi]; + $link = 'index.' . $phpEx . '?cat=' . OLYMPUS_CATEGORY . '&i=' . $panel_i . '&panel=' . $menu_action[$eregi] . '&mode=' . $link_compare_ary['mode']; + unset( $link_compare_ary['i']); + unset( $link_compare_ary['mode']); + ksort( $link_compare_ary); + foreach( $link_compare_ary as $key => $value) + { + $link .= '&' . $key . '=' . $value; + } + $link_orig = preg_replace( '#([./\[\]\(\)?\\\\]{1})#si', "\\\\\\1", $match_link[2][$i]); + $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => $link)); } ! return preg_replace( array_keys( $preg_array), $preg_array, $html); } } Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions_module.php 5 Feb 2008 14:51:27 -0000 1.7 --- functions_module.php 6 Feb 2008 15:13:40 -0000 1.8 *************** *** 19,23 **** // // Common global functions ! // Fixes for MX-Publisher: // $config -> $board_config // $cache -> $mx_cache --- 19,23 ---- // // Common global functions ! // Fixes for mxBB: // $config -> $board_config // $cache -> $mx_cache *************** *** 71,75 **** ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) --- 71,75 ---- ORDER BY left_id ASC"; $result = $db->sql_query($sql); ! $rows = array(); while ($row = $db->sql_fetchrow($result)) *************** *** 206,210 **** $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, --- 206,210 ---- $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; ! $module_row = array( 'depth' => $depth, *************** *** 426,432 **** $func_array = array( ! 'request_var', 'add_form_key', 'generate_text_for_display' ); ! $preg_array = array( '#^<\?(php)?|\?>$#si' => '', --- 426,432 ---- $func_array = array( ! 'request_var', 'add_form_key', 'generate_text_for_display', 'censor_text' ); ! $preg_array = array( '#^<\?(php)?|\?>$#si' => '', *************** *** 437,447 **** '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', '#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(', ); ! ! $modulecode = preg_replace( array_keys( $preg_array), array_values( $preg_array), $modulecode); ! $mx_user = new mx_user(); eval($modulecode); --- 437,447 ---- '#append_sid\(#si' => 'mx3_append_sid(', '#get_username_string\(#si' => 'mx_get_username_string(', ! '#global#si' => 'global $mx_acp,', '#\$template-#si' => '$mx_acp->template-', '#(' . implode( '|', $func_array) . ')\(#si' => 'phpBB3::\1(', ); ! ! $modulecode = preg_replace( array_keys( $preg_array), array_values( $preg_array), $modulecode); ! $mx_user = new mx_user(); eval($modulecode); |
|
From: OryNider <ory...@us...> - 2008-02-06 15:13:34
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18644 Modified Files: index_new.php Log Message: new acp releated Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index_new.php 6 Feb 2008 11:37:53 -0000 1.4 --- index_new.php 6 Feb 2008 15:13:21 -0000 1.5 *************** *** 156,160 **** { include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); ! $this->phpbb3_hook = new mx_phpbb3_admin(); $this->phpbb3_hook->hook( 'admin' ); } --- 156,160 ---- { include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); ! $this->phpbb3_hook = new mx_phpbb3_admin( $this); $this->phpbb3_hook->hook( 'admin' ); } *************** *** 514,545 **** $preg_array = array( ! '#^<\?(php)?#' => '', ! '#\?>$#' => '', ! "#define\('IN_PORTAL', 1\);#si" => '', ! '#\$mx_root_path = [^;]*;#si' => '', ! '#([^_]{1})append_sid#si' => '\1mx_append_sid', ! '#([^_]{1})mx_message_die#si' => '\1$mx_acp->mx_message_die_acp', ! '#([^_]{1})message_die#si' => '\1$mx_acp->mx_message_die_acp', ! '#\$phpEx = [^;]*;#' => '', ! '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#' => '', ! "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#" => '$module_root_path = "' . $mx_root_path . $module_root_path . '";', ! '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si' => 'if ( 1==1', ! '#\$db->sql_close\(\);#si' => '', ! '#->assign_vars\([^(]*\(#si' => '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,", ! // '#if.*setmodules.*return[^\}]*\}#' => '', ! '#\$phpbb_root_path =[^;]*;#si' => '// \0 //<= has been allready defined $phpbb_root_path', ! '#require[^;]*;#si' => '// \0', ); $preg_array = array_merge( $preg_array, array( // # "#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE', ! "#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE', ! //$preg_replace[] = "\n" . '\1'; )); // PHPBB2 FUNCTIONS REPLACE $functions_ary = array( //# ! 'get_userdata', 'phpbb_clean_username', phpbb_realpath ); $preg_array = array_merge( $preg_array, array( // # ! '#(' . implode( '|', $functions_ary) . ')\(#si' => 'phpBB2::\1(', )); --- 514,543 ---- $preg_array = array( ! '#^<\?(php)?#' => '', ! '#\?>$#' => '', ! "#define\('IN_PORTAL', 1\);#si" => '', ! '#\$mx_root_path = [^;]*;#si' => '', ! '#([^_]{1})append_sid#si' => '\1mx_append_sid', ! '#([^_]{1})mx_message_die#si' => '\1$mx_acp->mx_message_die_acp', ! '#([^_]{1})message_die#si' => '\1$mx_acp->mx_message_die_acp', ! '#\$phpEx = [^;]*;#' => '', ! '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#' => '', ! "#\\\$module_root_path = ['\\\"]([^']*)['\\\"];#" => '$module_root_path = "' . $mx_root_path . $module_root_path . '";', ! '#.*(\$HTTP_GET_VARS\[\'pane\'\] == \'right\')#si' => 'if ( 1==1', ! '#\$db->sql_close\(\);#si' => '', ! '#->assign_vars\([^(]*\(#si' => '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,", ! '#\$phpbb_root_path =[^;]*;#si' => '// \0 //<= has been allready defined $phpbb_root_path', ! '#require[^;]*;#si' => '// \0', ); $preg_array = array_merge( $preg_array, array( // # "#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE', ! "#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE', )); // PHPBB2 FUNCTIONS REPLACE $functions_ary = array( //# ! 'get_userdata', 'phpbb_clean_username', phpbb_realpath ); $preg_array = array_merge( $preg_array, array( // # ! '#(' . implode( '|', $functions_ary) . ')\(#si' => 'phpBB2::\1(', )); *************** *** 646,650 **** case OLYMPUS_CATEGORY: $acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html); ! $acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html; break; } // switch --- 644,648 ---- case OLYMPUS_CATEGORY: $acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html); ! //$acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html; break; } // switch *************** *** 770,774 **** 'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx), 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! //'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], --- 768,772 ---- 'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx), 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! //'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], |
|
From: MW <jo...@us...> - 2008-02-06 11:38:02
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31484/admin Modified Files: index_new.php Log Message: restoring overwritten comments in previous commit. Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index_new.php 6 Feb 2008 08:20:11 -0000 1.3 --- index_new.php 6 Feb 2008 11:37:53 -0000 1.4 *************** *** 2,10 **** /** * ! * @package mxBB Portal Core * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net * @origin This file is borrowed from phpBB, with some modifications */ --- 2,10 ---- /** * ! * @package MX-Publisher Core * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * @origin This file is borrowed from phpBB, with some modifications */ |
|
From: OryNider <ory...@us...> - 2008-02-06 08:20:20
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7291 Modified Files: index_new.php Log Message: upgrade Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index_new.php 4 Feb 2008 15:44:45 -0000 1.2 --- index_new.php 6 Feb 2008 08:20:11 -0000 1.3 *************** *** 1,12 **** <?php /** ! * ! * @package MX-Publisher Core ! * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * @origin This file is borrowed from phpBB, with some modifications ! */ // Security and Page header --- 1,12 ---- <?php /** ! * ! * @package mxBB Portal Core ! * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net * @origin This file is borrowed from phpBB, with some modifications ! */ // Security and Page header *************** *** 41,44 **** --- 41,48 ---- return false; } + function inarray_dec_( $needle, $haystack ) + { + return inarray( $needle, $haystack ); + } /** *************** *** 68,71 **** --- 72,77 ---- return $module; } + + // End functions // ------------- *************** *** 84,87 **** --- 90,94 ---- define( 'OLYMPUS_CATEGORY', 'phpbb3' ); + define('IN_ADMIN', true); if ( (empty( $_SID) || $_SID == 'sid=' ) ) *************** *** 96,101 **** if ( PORTAL_BACKEND == PHPBB2X_BACKEND) { ! mx_page::load_file( 'functions_selects', 'phpbb2'); } //mx_page::load_file( 'functions_'); class mx_acp --- 103,120 ---- if ( PORTAL_BACKEND == PHPBB2X_BACKEND) { ! //mx_page::load_file( 'functions', 'phpbb2'); ! //mx_page::load_file( 'functions_selects', 'phpbb2'); // LOAD phpbb2 file functions_selects for 2.9x ! //mx_page::load_file( 'functions_validate', 'phpbb2'); ! include_once( $phpbb_root_path . 'includes/functions_selects.' . $phpEx); // LOAD phpbb2 file functions_select for 2.8.0 ! include_once( $phpbb_root_path . 'includes/functions.php'); ! include_once( $phpbb_root_path . 'includes/functions_validate.php'); ! } ! if ( PORTAL_BACKEND == OLYMPUS_BACKEND) ! { ! mx_page::load_file( 'auth', 'phpbb3'); ! mx_page::load_file( 'functions_module', 'phpbb3'); ! $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : 'adm/'; } + //mx_page::load_file( 'functions_'); class mx_acp *************** *** 142,146 **** } ! /* * Parsing params for display * @param string $params query string --- 161,165 ---- } ! /** * Parsing params for display * @param string $params query string *************** *** 175,179 **** } ! /* * get current tabs */ --- 194,198 ---- } ! /** * get current tabs */ *************** *** 184,188 **** $this->tabs = array(); $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == MAIN_CATEGORY )?' id="activetab"':'', 'CATEGORY' => MAIN_CATEGORY, 'PARAMS' => '', --- 203,207 ---- $this->tabs = array(); $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == MAIN_CATEGORY )?'activetab':'', 'CATEGORY' => MAIN_CATEGORY, 'PARAMS' => '', *************** *** 191,195 **** // MX PORTAL MODULE CATEGORY $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == MODULE_CATEGORY )?' id="activetab"':'', 'CATEGORY' => MODULE_CATEGORY, 'PARAMS' => '', --- 210,214 ---- // MX PORTAL MODULE CATEGORY $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == MODULE_CATEGORY )?'activetab':'', 'CATEGORY' => MODULE_CATEGORY, 'PARAMS' => '', *************** *** 201,205 **** case PHPBB2X_BACKEND: // phpBB2 Backend TABS $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == PHPBB2X_CATEGORY )?' id="activetab"':'', 'CATEGORY' => PHPBB2X_CATEGORY, 'PARAMS' => '', --- 220,224 ---- case PHPBB2X_BACKEND: // phpBB2 Backend TABS $this->tabs[] = array( // # ! 'ACTIVE_TAB' => ( $this->category == PHPBB2X_CATEGORY )?'activetab':'', 'CATEGORY' => PHPBB2X_CATEGORY, 'PARAMS' => '', *************** *** 235,239 **** case MODULE_CATEGORY: case PHPBB2X_CATEGORY: - $cat_keys = array_keys( $menu_array); for( $i = 0; $i< count($menu_array); $i++) --- 254,257 ---- *************** *** 245,249 **** } - break; case OLYMPUS_CATEGORY: --- 263,266 ---- *************** *** 320,323 **** --- 337,341 ---- $menu_array = array_merge_recursive( $menu_array, read_admin( $module_path_admin ) ); } + $this->menu_complete[MODULE_CATEGORY] = $menu_array; $this->_read_menu_actions( $this->menu_complete[MODULE_CATEGORY], MODULE_CATEGORY); *************** *** 371,374 **** --- 389,398 ---- $allow_menu_sort = false; $menu_array = $this->phpbb3_hook->get_menu( $this->phpbb3_i ); + if ( empty( $this->panel)) + { + $menu_keys = array_keys( $menu_array); + $p_keys = array_keys($menu_array[$menu_keys[0]]); + $this->panel = $p_keys[0]; + } break; } *************** *** 405,408 **** --- 429,433 ---- while ( list( $panel, $file ) = each( $action_array ) ) { + $lang_menu = isset( $mx_user->lang[$panel] )?$mx_user->lang[$panel]:( !empty( $lang[$panel] ) ? $lang[$panel] : preg_replace( "/_/", " ", $panel ) ); $file_part = explode( '?', $file ); *************** *** 417,421 **** } ! $menu_link_params = str_replace( '?', '', '&cat=' . $this->category . '&panel=' . $panel . '&' . $file_part[1] ); $menu_link_params = explode( '&', $menu_link_params ); --- 442,456 ---- } ! switch( $this->category) ! { ! case OLYMPUS_CATEGORY: ! $menu_link_params = preg_replace( '#panel=[^&]*#', '&cat=' . $this->category . '&panel='.$panel, $file_part[1]); ! break; ! case PHPBB2X_CATEGORY: ! case MODULE_CATEGORY: ! case MAIN_CATEGORY: ! $menu_link_params = str_replace( '?', '', '&cat=' . $this->category . '&panel=' . $panel . '&' . $file_part[1] ); ! break; ! } $menu_link_params = explode( '&', $menu_link_params ); *************** *** 439,443 **** "L_PANEL" => $lang_menu, 'U_PANEL' => $menu_link, ! 'A_PANEL' => $this->panel == $panel?' id="activemenu"':'', ) ); $row_count++; --- 474,478 ---- "L_PANEL" => $lang_menu, 'U_PANEL' => $menu_link, ! 'A_PANEL' => $this->panel == $panel?'activemenu':'', ) ); $row_count++; *************** *** 447,450 **** --- 482,486 ---- // -MOD: DHTML Menufor ACP } + $this->menu_actions = array_merge( array($this->action_script => $this->menu_actions[$this->action_script]), $this->menu_actions); } *************** *** 453,460 **** if ( empty( $this->action_script ) ) { ! return ''; } ! global $mx_root_path, $phpbb_root_path; --- 489,496 ---- if ( empty( $this->action_script ) ) { ! mx_message_die( GENERAL_INFO, 'No action script to place in panel'); } ! global $mx_root_path, $phpbb_root_path, $phpEx; *************** *** 478,487 **** $preg_array = array( ! '#^<\?(php)?#' => '', ! '#\?>$#' => '', ! "#define\('IN_PORTAL', 1\);#si" => '', ! '#\$mx_root_path = [^;]*;#si' => '', ! '#([^_]{1})append_sid#si' => '\1mx_append_sid', ! '#([^_]{1})message_die#si' => '\1mx_message_die', '#\$phpEx = [^;]*;#' => '', '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#' => '', --- 514,524 ---- $preg_array = array( ! '#^<\?(php)?#' => '', ! '#\?>$#' => '', ! "#define\('IN_PORTAL', 1\);#si" => '', ! '#\$mx_root_path = [^;]*;#si' => '', ! '#([^_]{1})append_sid#si' => '\1mx_append_sid', ! '#([^_]{1})mx_message_die#si' => '\1$mx_acp->mx_message_die_acp', ! '#([^_]{1})message_die#si' => '\1$mx_acp->mx_message_die_acp', '#\$phpEx = [^;]*;#' => '', '#(include|require)(_once)?.*(pagestart|footer|header)(_admin)?[^;]*;#' => '', *************** *** 491,524 **** '#->assign_vars\([^(]*\(#si' => '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,", // '#if.*setmodules.*return[^\}]*\}#' => '', ! '#\$phpbb_root_path =[^;]*;#si' => '// \0 <= has been allready defined', '#require[^;]*;#si' => '// \0', ); ! if ( $this->category == PHPBB2X_CATEGORY) ! { ! $preg_array = array_merge( $preg_array, array( // # ! "#\n(@?(include|require)[^;]*;)#si" => "\n" . '// \1 <= has been allready defined', ! '#phpbb_realpath#si' => 'phpbb2::phpbb_realpath', ! //$preg_replace[] = "\n" . '\1'; ! )); ! $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match); ! for( $i = 0; $i<$func_cnt; $i++) { ! if ( function_exists( $func_match[1][$i])) ! { ! $preg_array = array_merge( $preg_array, array( // # ! "#\nfunction ".$func_match[1][$i]. '#si' => "\nfunction ".$func_match[1][$i].'_defined', ! )); ! } } - } - $script = preg_replace( array_keys($preg_array), array_values($preg_array), $script ); break; case OLYMPUS_BACKEND: ! $script = trim( file_get_contents( $phpbb_root_path . $this->action_script ) ); break; } // switch --- 528,566 ---- '#->assign_vars\([^(]*\(#si' => '\0 ' . "'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,'U_PORTAL_ROOT_PATH' => PORTAL_URL,", // '#if.*setmodules.*return[^\}]*\}#' => '', ! '#\$phpbb_root_path =[^;]*;#si' => '// \0 //<= has been allready defined $phpbb_root_path', '#require[^;]*;#si' => '// \0', ); ! $preg_array = array_merge( $preg_array, array( // # ! "#([\n\t ](@?(include|require)\\(\\\$phpbb_root_path[^;]*;))#si" => '// \2 // <<== PHPBB2 INCLUDE', ! "#([\n\t ](@?(include|require)[^(lang)]*;))#si" => "\n" . '// \2 //<= has been allready defined INCLUDE', ! //$preg_replace[] = "\n" . '\1'; ! )); ! // PHPBB2 FUNCTIONS REPLACE ! $functions_ary = array( //# ! 'get_userdata', 'phpbb_clean_username', phpbb_realpath ! ); ! $preg_array = array_merge( $preg_array, array( // # ! '#(' . implode( '|', $functions_ary) . ')\(#si' => 'phpBB2::\1(', ! )); ! // ! // REPLACE FUNCTIONS that ARE ALLREADY DECLARED ! $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match); ! for( $i = 0; $i<$func_cnt; $i++) ! { ! if ( function_exists( $func_match[1][$i])) { ! $preg_array = array_merge( $preg_array, array( // # ! "#".$func_match[1][$i]. '([^)]*?\()#si' => "".$func_match[1][$i].'_dec_\1', ! )); } } $script = preg_replace( array_keys($preg_array), array_values($preg_array), $script ); + $script = str_replace( 'phpBB2::phpBB2::', 'PHPBB2::', $script); break; case OLYMPUS_BACKEND: ! $script = $this->phpbb3_hook->prepare_action_script( $this->panel); break; } // switch *************** *** 528,535 **** function display() { - // print_r( $this->template->files);die(); $this->_template_assign_vars(); $this->template->pparse( 'adm_header' ); - // $this->template->assign_var( 'CONTENT_ACP', $this->panel_html ); $this->template->pparse( 'adm_body' ); $this->template->pparse( 'adm_footer' ); --- 570,575 ---- *************** *** 544,547 **** --- 584,628 ---- } + function _convert_links( &$text, $match_links = array()) + { + global $phpEx, $mx_root_path; + $match_count = count( $match_links['LINK']); + $values = array_keys( $this->menu_actions); + $values_cnt = count( $values); + $admin_path = substr(str_replace( dirname( realpath($mx_root_path . 'index.' . $phpEx)) , '', dirname( __FILE__)), 1) . '/'; + for( $i=0; $i < $match_count; $i++) + { + if ( eregi( 'javascript:', $match_links['LINK'][$i]) || empty($match_links['SCRIPT'][$i]) || eregi( $mx_root_path . 'index.' . $phpEx, $match_links['LINK'][$i] )|| eregi( $admin_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) ) + { + continue; + } + if ( eregi( 'index.php', $match_links['LINK'][$i])) + { + $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text); + continue; + } // if END + for( $j = 0; $j < $values_cnt; $j++) + { + + if ( strpos( $values[$j], $match_links['SCRIPT'][$i]) !== false ) + { + $text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . 'index.'. $phpEx . '?cat=' . $this->category . '&' . $this->menu_actions[$values[$j]] . '&' . $match_links['PARAMS'][$i], $text); + break; + } // if END + } // for END + } // for END + } + + function mx_message_die_acp( $error_type, $message, $title = '', $line = '', $file = '', $sql = '') + { + $match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $message, $match_links ); + $matched_links['LINK'] = $match_links[2]; + $matched_links['SCRIPT'] = $match_links[8]; + $matched_links['PARAMS'] = $match_links[9]; + $this->_convert_links( $message, $matched_links); + mx_message_die( $error_type, $message, $title, $line, $file, $sql); + } + + function assign_content_acp( $acp_html ) { *************** *** 555,603 **** case PHPBB2X_CATEGORY: default: - $match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $acp_html, $match_links ); ! for( $i=0; $i < $match_count; $i++) ! { ! if ( eregi( 'javascript:', $match_links[2][$i]) || empty($match_links[8][$i]) || eregi( './../index.php', $match_links[2][$i] ) ) ! { ! continue; ! } ! //print $match_links[2][$i] . ' • ' . $match_links[8][$i]. '<br/>'; ! ! for( $j = 0;$j <= $menu_array_normal_count;$j++ ) ! { ! //print $menu_array_normal[$menu_array_normal_keys[$j]] . '<br/>'; ! if ( strpos( $menu_array_normal[$menu_array_normal_keys[$j]], $match_links[8][$i] ) !== false ) ! { ! ! $action_file = $menu_array_normal_keys[$j]; ! $query_string = ''; ! if ( $match_links[9][$i] != '' ) ! { ! $query_string = '&' . $match_links[9][$i]; ! } ! $acp_html = str_replace( $match_links[2][$i], mx_append_sid( "index.$phpEx?cat=" . $this->category . "&panel=$action_file$query_string" ), $acp_html ); ! break; ! } ! } ! //print '<p> </p><hr/>'; ! ! ! } ! ! break; case OLYMPUS_CATEGORY: break; } // switch $forms_cnt = preg_match_all( "#<form([^>]*)>#si", $acp_html, $forms); ! // print '<pre font-size="12px">'; for( $f_i = 0; $f_i < $forms_cnt; $f_i++) { $form_cnt = preg_match_all( "#([^=]*)=[\"']([^\"']*)[\"']#si", $forms[1][$f_i], $form); - //print $f_i . ' • ' . $forms[1][$f_i] . '<br/>'; - //print_r( $form); $form_action = ''; $form_method = ''; --- 636,658 ---- case PHPBB2X_CATEGORY: default: $match_count = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/|adm/)?([^"?]*)?))\??([^"]*?))"#si', $acp_html, $match_links ); + $menu_actions = $this->menu_actions; + $matched_links['LINK'] = $match_links[2]; + $matched_links['SCRIPT'] = $match_links[8]; + $matched_links['PARAMS'] = $match_links[9]; ! $this->_convert_links( $acp_html, $matched_links); break; case OLYMPUS_CATEGORY: + $acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html); + $acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html; break; } // switch $forms_cnt = preg_match_all( "#<form([^>]*)>#si", $acp_html, $forms); ! for( $f_i = 0; $f_i < $forms_cnt; $f_i++) { $form_cnt = preg_match_all( "#([^=]*)=[\"']([^\"']*)[\"']#si", $forms[1][$f_i], $form); $form_action = ''; $form_method = ''; *************** *** 626,634 **** } } - //print htmlentities( $forms[1][$f_i]) . '><br/>'; - //print htmlentities( $forms[1][$f_i] . '>'. $html_add) . '<br/>'; $acp_html = str_replace( $forms[1][$f_i] . '>', $forms[1][$f_i] .'>'. $html_add, $acp_html); } - //print '</pre>'; $this->template->assign_var( 'CONTENT_ACP', $acp_html ); --- 681,686 ---- *************** *** 638,642 **** { global $board_config, $userdata, $lang, $mx_user, $admincp_nav_icon_url; ! global $theme, $images; $l_timezone = explode('.', $board_config['board_timezone']); --- 690,694 ---- { global $board_config, $userdata, $lang, $mx_user, $admincp_nav_icon_url; ! global $theme, $images, $mx_starttime, $db, $phpEx; $l_timezone = explode('.', $board_config['board_timezone']); *************** *** 654,663 **** case 'internal': case 'phpbb2': ! $current_phpbb_version = '2' . $board_config['version']; ! break; case 'phpbb3': ! $current_phpbb_version = $board_config['version']; ! break; } --- 706,715 ---- case 'internal': case 'phpbb2': ! $current_phpbb_version = '2' . $board_config['version']; ! break; case 'phpbb3': ! $current_phpbb_version = $board_config['version']; ! break; } *************** *** 681,685 **** 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], ! 'LOGO' => !empty($images['mx_logo_acp']) ? $images['mx_logo_acp']: $images['mx_logo'], "U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ), --- 733,737 ---- 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], ! 'LOGO' => !empty($images['mx_logo_acp']) ? @$images['mx_logo_acp']: @$images['mx_logo'], "U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ), *************** *** 698,702 **** "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! 'L_LOGOUT' => $lang['Log_out'], "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], --- 750,754 ---- "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! 'L_LOGOUT' => @$lang['Log_out'], "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], *************** *** 718,721 **** --- 770,774 ---- 'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx), 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), + //'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], *************** *** 743,757 **** $script = $mx_acp->prepare_action_script(); switch ( 0 ) { ! case 0; ! ob_start(); ! eval( $script ); ! $panel_html = ob_get_contents(); ! ob_end_clean(); ! break; case 1: - $panel_html = preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", ' '), str_replace( "\n", "<br/>\n", htmlentities( $script ) )); break; --- 796,817 ---- $script = $mx_acp->prepare_action_script(); + //error_reporting( E_ALL ^E_NOTICE); + //ini_set( 'display_errors', '1' ); + $i = 1; + + // VERSION mx v2.8 + //$script = str_replace( 'phpBB2::', '', $script); + // VERSION mx v2.9 + $script = str_replace( 'mx_phpBB2::', 'phpBB2::', $script); switch ( 0 ) { ! case 0: ! ob_start(); ! eval( $script ); ! $panel_html = ob_get_contents(); ! ob_end_clean(); ! break; case 1: $panel_html = preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", ' '), str_replace( "\n", "<br/>\n", htmlentities( $script ) )); break; *************** *** 768,837 **** $panel_html = ob_get_contents(); ob_end_clean(); ! $panel_html .= preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", ' '), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ));; break; } $mx_acp->assign_content_acp( $panel_html ); $mx_acp->display(); - die(); - - if ( !$is_phpbb || PORTAL_BACKEND == 'phpbb2' ) - { - while ( list( $cat, $menu_list ) = each( $menu_array ) ) - { - while ( list( $menu_id, $menu_link ) = each( $menu_list ) ) - { - $menu_array_normal[$menu_id] = $menu_link; - $menu_array_revert[$menu_link] = $menu_id; - } - } - - $d = preg_match_all( '#(href|action)="(((' . PORTAL_URL . '|' . PHPBB_URL . ')?((' . $mx_root_path . ')?(admin/)?([^"?]*)?))\??([^"]*?))"#si', $admin_html, $matches_links ); - - $menu_array_normal_keys = array_keys( $menu_array_normal ); - $menu_array_normal_count = count( $menu_array_normal ); - - for( $i = 0; $i < count( $matches_links[0] ); $i++ ) - { - if ( strpos( $matches_links[2][$i], 'javascript:' ) !== false || $matches_links[8][$i] == '' || strpos( $matches_links[2][$i], './../index.php' ) !== false ) - { - continue; - } - for( $j = 0;$j < $menu_array_normal_count;$j++ ) - { - if ( strpos( $menu_array_normal[$menu_array_normal_keys[$j]], $matches_links[8][$i] ) !== false ) - { - $action_file = $menu_array_normal_keys[$j]; - $query_string = ''; - if ( $matches_links[9][$i] != '' ) - { - $query_string = '&' . $matches_links[9][$i]; - } - $admin_html = str_replace( $matches_links[2][$i], mx_append_sid( "index.$phpEx?cat=$category&action_file=$action_file$query_string" ), $admin_html ); - break; - } - } - } - } - - $template->assign_block_vars( 'module_portal', array( 'ACTIVETAB' => $is_portal?' id="activetab"':'', - ) ); - $template->assign_block_vars( 'module_mx', array( 'ACTIVETAB' => $is_module?' id="activetab"':'', - ) ); - // error_reporting( E_ALL); - $menu_params = ''; - - $template->assign_var( 'L_ADMIN_CATEGORY', $lang_category ); - - display_tab_menu( $menu_array, $action_file_id, $allow_menu_sort, $menu_params ); - $template->pparse( 'adm_header' ); - - $template->assign_var( 'CONTENT_ACP', $admin_html ); - - $template->pparse( 'adm_body' ); - $template->pparse( 'adm_footer' ); - // print '<pre>'; - // print_r( $lang); - // print '</pre>'; - ?> \ No newline at end of file --- 828,838 ---- $panel_html = ob_get_contents(); ob_end_clean(); ! $panel_html = preg_replace( array("#\n#esi", "#\t#si"), array("sprintf('%4d', \$i++) . '\n'", ' '), str_replace( "\n", "<br/>\n", htmlentities( $panel_html ) ));; break; + case 4: + eval( $script); } $mx_acp->assign_content_acp( $panel_html ); $mx_acp->display(); ?> \ No newline at end of file |
|
From: Culprit <cul...@us...> - 2008-02-05 22:39:48
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24782/includes Modified Files: template.php Log Message: Fix for IF compiling tag ".forums" eg. Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/template.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** template.php 4 Feb 2008 15:56:43 -0000 1.22 --- template.php 5 Feb 2008 22:39:43 -0000 1.23 *************** *** 2027,2033 **** $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[3]) . '[\'' . $varrefs[4] . '\']' : (($varrefs[3]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[4] . '\']' : '$this->vars[\'' . $varrefs[4] . '\']'); } ! if ( $token[0] == '.' ) { ! $token = '$' . substr( $token, 1); } break; --- 2027,2033 ---- $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[3]) . '[\'' . $varrefs[4] . '\']' : (($varrefs[3]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[4] . '\']' : '$this->vars[\'' . $varrefs[4] . '\']'); } ! else if ( $token[0] == '.' ) { ! $token = 'sizeOf( $this->_tpldata[\'' . substr( $token, 1) . '.\'])'; } break; |
2 messages has been excluded from this view by a project administrator.
