Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2008-02-23 19:38:28
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv939 Modified Files: Tag: core28x common.php Log Message: Custom module default style update for panel parameters blockCP stays in current page Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67.2.8 retrieving revision 1.67.2.9 diff -C2 -d -r1.67.2.8 -r1.67.2.9 *** common.php 7 Feb 2008 01:39:59 -0000 1.67.2.8 --- common.php 23 Feb 2008 19:38:24 -0000 1.67.2.9 *************** *** 103,107 **** unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') --- 103,107 ---- unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') *************** *** 329,333 **** define('PORTAL_URL', $portal_config['portal_url']); define('PORTAL_VERSION', $portal_config['portal_version']); ! define('PORTAL_BACKEND', $portal_config['portal_backend']); // --- 329,333 ---- define('PORTAL_URL', $portal_config['portal_url']); define('PORTAL_VERSION', $portal_config['portal_version']); ! define('PORTAL_BACKEND', 'phpbb2'); // |
|
From: Jon O. <jon...@us...> - 2008-02-23 19:36:16
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32560 Modified Files: mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php Log Message: Custom module default style update for panel parameters blockCP stays in current page Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** mx_functions_core.php 22 Feb 2008 23:02:49 -0000 1.82 --- mx_functions_core.php 23 Feb 2008 19:36:11 -0000 1.83 *************** *** 2123,2127 **** ob_start(); $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/' . $theme['template_name']); switch ( $parameter_data['parameter_type'] ) --- 2123,2127 ---- ob_start(); $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path); switch ( $parameter_data['parameter_type'] ) *************** *** 2166,2170 **** --- 2166,2172 ---- break; default: + $module_root_path = $mx_root_path . $this->module_root_path; $this->is_panel = $this->_get_custom_module_parameters($parameter_data, $block_id); + $module_root_path = ''; break; } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** mx_functions_style.php 17 Feb 2008 22:10:24 -0000 1.52 --- mx_functions_style.php 23 Feb 2008 19:36:12 -0000 1.53 *************** *** 300,304 **** { // ! // Then check Cloned template // $filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename; --- 300,304 ---- { // ! // Then check Default template // $filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename; *************** *** 1590,1593 **** --- 1590,1595 ---- function extend($lang_mode = MX_LANG_MAIN, $image_mode = MX_IMAGES) { + global $mx_block; + if (defined('IN_ADMIN')) { *************** *** 1595,1598 **** --- 1597,1607 ---- } + if (!empty($this->loaded_default_styles[$mx_block->module_root_path])) + { + $this->default_module_style = $this->loaded_default_styles[$mx_block->module_root_path]; + $this->default_template_name = $this->default_module_style; + $this->default_current_template_path = 'templates/' . $this->default_template_name; + } + if ($lang_mode != MX_LANG_NONE) { *************** *** 1610,1614 **** if (!empty($this->default_module_style)) { ! $this->default_template_name = '_core'; $this->default_current_template_path = 'templates/' . $this->default_template_name; $this->default_module_style = ''; --- 1619,1623 ---- if (!empty($this->default_module_style)) { ! $this->default_template_name = 'subSilver'; $this->default_current_template_path = 'templates/' . $this->default_template_name; $this->default_module_style = ''; *************** *** 1620,1634 **** global $mx_block; ! if (!empty($default_module_style)) ! { ! $this->default_module_style = $default_module_style; ! $this->default_template_name = $this->default_module_style; ! $this->default_current_template_path = 'templates/' . $this->default_template_name; ! } ! ! if (!defined('IN_ADMIN')) ! { ! $this->loaded_default_styles[$mx_block->module_root_path] = $this->default_module_style; ! } } } // class mx_user --- 1629,1633 ---- global $mx_block; ! $this->loaded_default_styles[$mx_block->module_root_path] = $default_module_style; } } // class mx_user Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** mx_functions_phpbb.php 23 Feb 2008 15:52:46 -0000 1.49 --- mx_functions_phpbb.php 23 Feb 2008 19:36:12 -0000 1.50 *************** *** 439,443 **** } ! if ( empty($page_id) ) { $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); --- 439,447 ---- } ! if ( empty($page_id) && $mx_request_vars->is_request('portalpage') ) ! { ! $page_id = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); ! } ! else if ( empty($page_id) ) { $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); |
|
From: Jon O. <jon...@us...> - 2008-02-23 19:33:19
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31688 Modified Files: mx_blockcp.php Log Message: Custom module default style update for panel parameters blockCP stays in current page Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_blockcp.php 9 Feb 2008 19:46:29 -0000 1.22 --- mx_blockcp.php 23 Feb 2008 19:33:14 -0000 1.23 *************** *** 19,25 **** // // Start session management // ! $mx_user->init($user_ip, '-999'); // // End session management --- 19,30 ---- // + // Page selector + // + $page_id = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); + + // // Start session management // ! $mx_user->init($user_ip, $page_id, false); // // End session management *************** *** 27,30 **** --- 32,46 ---- // + // Load and instatiate CORE (page) and block classes + // + $mx_page->init( $page_id ); + + // + // Initiate user style (template + theme) management + // - populate $theme, $images and initiate $template. + // + $mx_user->init_style(); + + // // ********************************************************************** // Read language definition |
|
From: OryNider <ory...@us...> - 2008-02-23 16:11:07
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7464 Modified Files: forum_hack.php Log Message: Check for mx_smartor fap version Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** forum_hack.php 22 Feb 2008 23:53:15 -0000 1.49 --- forum_hack.php 23 Feb 2008 16:10:52 -0000 1.50 *************** *** 58,62 **** } ! /* //Check for mx_smartor fap version // We need to check the DB too, since we can have the files there but not installed !! --- 58,62 ---- } ! //Check for mx_smartor fap version // We need to check the DB too, since we can have the files there but not installed !! *************** *** 70,74 **** $db->sql_freeresult($result); } ! */ // --- 70,74 ---- $db->sql_freeresult($result); } ! // |
|
From: OryNider <ory...@us...> - 2008-02-23 15:58:21
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2321 Modified Files: album_bbcode.php Log Message: Index: album_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_bbcode.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** album_bbcode.php 7 Jun 2007 20:13:17 -0000 1.1 --- album_bbcode.php 23 Feb 2008 15:58:15 -0000 1.2 *************** *** 1,4 **** <?php ! // CTracker_Ignore: File Checked By Human // Tell the Security Scanner that reachable code in this file is not a security issue --- 1,11 ---- <?php ! /** ! * ! * @package Mx-Publisher Module - mx_smartor ! * @version $Id$ ! * @copyright (c) 2002-2006 [OryNider, ory...@rd...] mxBB Development Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * ! */ // CTracker_Ignore: File Checked By Human // Tell the Security Scanner that reachable code in this file is not a security issue *************** *** 3007,3010 **** --- 3014,3034 ---- if ( defined('SMILIES_TABLE') ) { + switch (PORTAL_BACKEND) + { + case 'internal': + $smiley_path_url = PORTAL_URL; + $smiley_url = 'smile_url'; + break; + case 'phpbb2': + $smiley_path_url = PHPBB_URL; + $smiley_url = 'smile_url'; + break; + case 'phpbb3': + $smiley_path_url = PHPBB_URL; + $smiley_url = 'smiley_url'; + $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); + break; + } + $sql = "SELECT * FROM " . SMILIES_TABLE; if(($result = $db->sql_query($sql)) !== false) *************** *** 3016,3020 **** $arr = array( 'code' => $smilies[$i]['code'], ! 'replace' => '<img src="http://' . $_SERVER['HTTP_HOST'] . $board_config['script_path'] . 'images/smiles/' . $smilies[$i]['smile_url'] . '" alt="' . htmlspecialchars($smilies[$i]['emotion']) . '" />' ); $bbcode->allowed_smilies[] = $arr; --- 3040,3044 ---- $arr = array( 'code' => $smilies[$i]['code'], ! 'replace' => '<img src="' . $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url] . '" alt="' . htmlspecialchars($smilies[$i]['emotion']) . '" />' ); $bbcode->allowed_smilies[] = $arr; |
|
From: OryNider <ory...@us...> - 2008-02-23 15:53:05
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32198 Modified Files: mx_functions_phpbb.php Log Message: function mx_smilies_pass fix, nothing serious yet, but we should make one more change when droping shared folder. Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** mx_functions_phpbb.php 22 Feb 2008 23:02:49 -0000 1.48 --- mx_functions_phpbb.php 23 Feb 2008 15:52:46 -0000 1.49 *************** *** 185,192 **** --- 185,197 ---- { case 'internal': + $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed + $smiley_url = 'smile_url'; + break; case 'phpbb2': + $smiley_path_url = PHPBB_URL; $smiley_url = 'smile_url'; break; case 'phpbb3': + $smiley_path_url = PHPBB_URL; $smiley_url = 'smiley_url'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); *************** *** 195,199 **** $smilies_path = $board_config['smilies_path']; ! $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; if (!isset($orig)) --- 200,204 ---- $smilies_path = $board_config['smilies_path']; ! $board_config['smilies_path'] = $smiley_path_url . $board_config['smilies_path']; if (!isset($orig)) |
|
From: OryNider <ory...@us...> - 2008-02-22 23:53:20
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2402 Modified Files: forum_hack.php Log Message: merging was bad, this will fix it. Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** forum_hack.php 22 Feb 2008 23:44:10 -0000 1.48 --- forum_hack.php 22 Feb 2008 23:53:15 -0000 1.49 *************** *** 1672,1675 **** --- 1672,1676 ---- include_once($phpbb_root_path . 'includes/functions_cash.'.$phpEx); + $template = new Template_plus($phpbb_root_path . 'templates/'. $theme['template_name']); } *************** *** 1843,1847 **** $code = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $code); $code = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $code); - $template = new Template_plus($phpbb_root_path . 'templates/'. $theme['template_name']); break; --- 1844,1847 ---- |
|
From: OryNider <ory...@us...> - 2008-02-22 23:44:15
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31157 Modified Files: forum_hack.php Log Message: cash mod fixes Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** forum_hack.php 22 Feb 2008 20:43:46 -0000 1.47 --- forum_hack.php 22 Feb 2008 23:44:10 -0000 1.48 *************** *** 652,655 **** --- 652,662 ---- } break; + case 'cash': + $mode = $this->_get_mode( $url, $by_http_vars ); + if ( $mode == 'modedited' ) + { + return ''; + } + break; } *************** *** 1636,1654 **** { case 'memberlist': ! define('CM_MEMBERLIST', true); global $cm_memberlist; break; case 'posting': ! define('CM_POSTING', true); global $cm_posting; break; case 'viewtopic': ! define('CM_VIEWTOPIC', true); global $cm_viewtopic; break; case 'viewprofile': ! define('CM_VIEWPROFILE', true); global $cm_viewprofile; break; } --- 1643,1672 ---- { case 'memberlist': ! @define('CM_MEMBERLIST', true); global $cm_memberlist; break; case 'posting': ! @define('CM_POSTING', true); global $cm_posting; break; case 'viewtopic': ! @define('CM_VIEWTOPIC', true); global $cm_viewtopic; break; case 'viewprofile': ! @define('CM_VIEWPROFILE', true); global $cm_viewprofile; break; + default: + @define('CM_EVENT', true); + } + + //Include cash mod language file + if ((@include $phpbb_root_path . "language/lang_" . $default_lang . "/lang_cash.$phpEx") === false) + { + if ((@include $phpbb_root_path . "language/lang_english/lang_cash.$phpEx") === false) + { + mx_message_die(CRITICAL_ERROR, 'Language file ' . $module_root_path . "language/lang_" . $default_lang . "/lang_cash.$phpEx" . ' couldn\'t be opened.'); + } } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:41:13
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29575 Modified Files: Tag: core28x mx_blockcp_admin_body.tpl Log Message: Little security update for blockCP, and e tpl bugfix Index: mx_blockcp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/Attic/mx_blockcp_admin_body.tpl,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** mx_blockcp_admin_body.tpl 26 Aug 2007 19:07:09 -0000 1.9.2.1 --- mx_blockcp_admin_body.tpl 22 Feb 2008 23:41:09 -0000 1.9.2.2 *************** *** 230,235 **** <td width="10%" class="topictitle" colspan="2">{L_FUNCTION}:</td> <td width="10%" class="topictitle" colspan="2">{L_BLOCK}:</td> ! <td width="10%"> </td> ! <td width="70%"> </td> </tr> <tr> --- 230,235 ---- <td width="10%" class="topictitle" colspan="2">{L_FUNCTION}:</td> <td width="10%" class="topictitle" colspan="2">{L_BLOCK}:</td> ! <td width="5%"> </td> ! <td width="65%"> </td> </tr> <tr> *************** *** 386,390 **** <td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td> </tr> ! <!-- BEGIN is_auth --> <tr> <td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td> --- 386,390 ---- <td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td> </tr> ! <!-- BEGIN is_mod --> <tr> <td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td> *************** *** 401,412 **** <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! <!-- ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_FUNCTION}</b></td> ! <td class="row1">{S_FUNCTION_LIST}</td> ! </tr> ! --> ! <!-- END is_auth --> ! <tr> <td class="row1" width="50%" align="right"> --- 401,405 ---- <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! <!-- END is_mod --> <tr> <td class="row1" width="50%" align="right"> |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:40:53
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29554 Modified Files: Tag: core28x mx_functions_blockcp.php Log Message: Little security update for blockCP, and e tpl bugfix Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -C2 -d -r1.18.2.2 -r1.18.2.3 *** mx_functions_blockcp.php 10 Feb 2008 21:17:54 -0000 1.18.2.2 --- mx_functions_blockcp.php 22 Feb 2008 23:40:48 -0000 1.18.2.3 *************** *** 361,365 **** // Activate BlockCP SubPanels, based on auth // ! if (!$new_block) { $blockcptemplate->assign_block_vars('blockcp_general', array( --- 361,365 ---- // Activate BlockCP SubPanels, based on auth // ! if (($this->auth_mod || $is_admin) && !$new_block) { $blockcptemplate->assign_block_vars('blockcp_general', array( *************** *** 368,374 **** 'S_SUBMIT' => $buttonvalue )); } ! if ( ($this->auth_mod || $is_admin ) || $new_block) { $blockcptemplate->assign_block_vars('blockcp_general_adds', array( --- 368,379 ---- 'S_SUBMIT' => $buttonvalue )); + + // + // Some general blockcp settings are moderator only + // + $blockcptemplate->assign_block_vars('blockcp_general.is_mod', array()); } ! if ( ($is_admin ) || $new_block) { $blockcptemplate->assign_block_vars('blockcp_general_adds', array( *************** *** 530,534 **** } ! if ( $is_admin && !$new_block) { $blockcptemplate->assign_block_vars('blockcp_delete', array( --- 535,539 ---- } ! if ( $is_admin && !$new_block && $this->blockcp_mode != 'mx_blockcp') // Do not allow deleting blocks in blockcp mode { $blockcptemplate->assign_block_vars('blockcp_delete', array( |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:23:55
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21977 Modified Files: Tag: core28x mx_functions_core.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52.2.8 retrieving revision 1.52.2.9 diff -C2 -d -r1.52.2.8 -r1.52.2.9 *** mx_functions_core.php 17 Feb 2008 19:37:15 -0000 1.52.2.8 --- mx_functions_core.php 22 Feb 2008 23:23:48 -0000 1.52.2.9 *************** *** 3043,3046 **** --- 3043,3068 ---- /** + * Load file. + * + * Load additional functions/classes. + * + * @param unknown_type $file + * @param unknown_type $backend + * @param unknown_type $force_shared + */ + function load_file($file = '', $force_shared = false) + { + global $mx_root_path, $phpbb_root_path, $phpEx; + + $path = PORTAL_BACKEND == 'internal' || $force_shared ? $mx_root_path . 'includes/shared/' . PORTAL_BACKEND . '/includes/' : $phpbb_root_path . 'includes/'; + + + if (file_exists($path . $file.'.'.$phpEx)) + { + @include_once($path . $file.'.'.$phpEx); + } + } + + /** * editcp_exists. * |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:14:01
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17161/includes Modified Files: phpbb_constants.php Log Message: backend switch Index: phpbb_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_constants.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** phpbb_constants.php 22 Feb 2008 20:43:46 -0000 1.8 --- phpbb_constants.php 22 Feb 2008 23:13:55 -0000 1.9 *************** *** 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.'); } --- 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.'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:14:00
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17161 Modified Files: mx_phpbb.php Log Message: backend switch Index: mx_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_phpbb.php 22 Feb 2008 20:43:46 -0000 1.19 --- mx_phpbb.php 22 Feb 2008 23:13:55 -0000 1.20 *************** *** 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.'); } --- 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.'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:11:03
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15674 Modified Files: functions.php functions_admin.php functions_auth.php functions_mx.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: functions_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_auth.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_auth.php 1 Aug 2006 21:02:19 -0000 1.3 --- functions_auth.php 22 Feb 2008 23:10:57 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBBmodule_mx_kb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package mxBBmodule_mx_linkdb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** functions.php 15 Feb 2008 22:44:55 -0000 1.23 --- functions.php 22 Feb 2008 23:10:56 -0000 1.24 *************** *** 340,349 **** 'S_TIMEZONE' => sprintf( $lang['All_times'], $lang[number_format( $board_config['board_timezone'] )] ), ! //'S_AUTH_LIST' => $mx_kb->modules[$mx_kb->module_name]->auth_can_list, //'L_MODULE_VERSION' => $kb_module_version, //'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, //'L_MODULE_AUTHOR' => $kb_module_author, ! //'DEBUG' => !empty($debug_message) && $mx_kb->debug ? '<div style="overflow:auto; height:100px;"><span class="gensmall">' . $debug_message . '<br/> -::-</span></div>': '', ) ); --- 340,349 ---- 'S_TIMEZONE' => sprintf( $lang['All_times'], $lang[number_format( $board_config['board_timezone'] )] ), ! //'S_AUTH_LIST' => $mx_linkdb->modules[$mx_linkdb->module_name]->auth_can_list, //'L_MODULE_VERSION' => $kb_module_version, //'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, //'L_MODULE_AUTHOR' => $kb_module_author, ! //'DEBUG' => !empty($debug_message) && $mx_linkdb->debug ? '<div style="overflow:auto; height:100px;"><span class="gensmall">' . $debug_message . '<br/> -::-</span></div>': '', ) ); Index: functions_mx.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_mx.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_mx.php 15 Feb 2008 22:44:55 -0000 1.3 --- functions_mx.php 22 Feb 2008 23:10:57 -0000 1.4 *************** *** 2,6 **** /** * ! * @package mxBBmodule_mx_kb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package mxBBmodule_mx_linkdb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team Index: functions_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_admin.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** functions_admin.php 9 Sep 2007 20:09:01 -0000 1.5 --- functions_admin.php 22 Feb 2008 23:10:57 -0000 1.6 *************** *** 2,6 **** /** * ! * @package mxBBmodule_mx_kb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team --- 2,6 ---- /** * ! * @package mxBBmodule_mx_linkdb * @version $Id$ * @copyright (c) 2002-2006 [wGEric, Jon Ohlsson] mxBB Project Team |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:09:13
|
Update of /cvsroot/mxbb/mx_import_tools/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14854 Modified Files: functions_mod_user.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: functions_mod_user.php =================================================================== RCS file: /cvsroot/mxbb/mx_import_tools/includes/functions_mod_user.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** functions_mod_user.php 9 Sep 2007 20:01:27 -0000 1.8 --- functions_mod_user.php 22 Feb 2008 23:09:09 -0000 1.9 *************** *** 17,31 **** if( !function_exists('validate_username') ) { ! mx_page::load_file('functions_validate', 'phpbb2'); } if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode', 'phpbb2'); } --- 17,31 ---- if( !function_exists('validate_username') ) { ! mx_page::load_file('functions_validate'); } if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:07:09
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13360 Modified Files: cal_functions.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** cal_functions.php 9 Sep 2007 19:48:44 -0000 1.11 --- cal_functions.php 22 Feb 2008 23:07:03 -0000 1.12 *************** *** 237,241 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } --- 237,241 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } *************** *** 416,420 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } --- 416,420 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } *************** *** 603,612 **** if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode', 'phpbb2'); } --- 603,612 ---- if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:05:54
|
Update of /cvsroot/mxbb/mx_act/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12744 Modified Files: act_functions.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: act_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_functions.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** act_functions.php 9 Sep 2007 19:30:57 -0000 1.8 --- act_functions.php 22 Feb 2008 23:05:49 -0000 1.9 *************** *** 91,100 **** if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode', 'phpbb2'); } --- 91,100 ---- if( !function_exists('prepare_message') ) { ! mx_page::load_file('functions_post'); } if( !function_exists('make_bbcode_uid') ) { ! mx_page::load_file('bbcode'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:04:28
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12188 Modified Files: mx_search.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_search.php 9 Feb 2008 12:48:51 -0000 1.24 --- mx_search.php 22 Feb 2008 23:04:25 -0000 1.25 *************** *** 22,26 **** //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! mx_page::load_file('functions_search', 'phpbb2'); // --- 22,26 ---- //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! mx_page::load_file('functions_search'); // |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:03:59
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11722 Modified Files: functions.php functions_hook.php message_parser.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** functions.php 12 Feb 2008 10:54:05 -0000 1.13 --- functions.php 22 Feb 2008 23:03:55 -0000 1.14 *************** *** 10,14 **** /** ! * @ignore */ if (!defined('IN_PORTAL')) --- 10,14 ---- /** ! * @ignore */ if (!defined('IN_PORTAL')) *************** *** 827,831 **** return ( sizeof( $error ) ) ? $error : false; } ! } // Compatibility functions --- 827,831 ---- return ( sizeof( $error ) ) ? $error : false; } ! } // Compatibility functions *************** *** 3003,3008 **** { global $phpbb_root_path, $phpEx; ! mx_page::load_file( 'bbcode', 'phpbb3'); ! //include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } --- 3003,3007 ---- { global $phpbb_root_path, $phpEx; ! mx_page::load_file( 'bbcode'); } Index: message_parser.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** message_parser.php 12 Feb 2008 10:54:05 -0000 1.2 --- message_parser.php 22 Feb 2008 23:03:55 -0000 1.3 *************** *** 10,14 **** /** ! * @ignore */ if (!defined('IN_PORTAL')) --- 10,14 ---- /** ! * @ignore */ if (!defined('IN_PORTAL')) *************** *** 19,23 **** if (!class_exists('bbcode')) { ! mx_page::load_file( 'bbcode', 'phpbb3'); } --- 19,23 ---- if (!class_exists('bbcode')) { ! mx_page::load_file( 'bbcode'); } Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions_hook.php 12 Feb 2008 10:54:05 -0000 1.11 --- functions_hook.php 22 Feb 2008 23:03:55 -0000 1.12 *************** *** 10,14 **** /** ! * @ignore */ if (!defined('IN_PORTAL')) --- 10,14 ---- /** ! * @ignore */ if (!defined('IN_PORTAL')) *************** *** 17,23 **** } ! mx_page::load_file( 'functions', 'phpbb3'); ! mx_page::load_file( 'functions_module', 'phpbb3'); ! mx_page::load_file( 'message_parser', 'phpbb3'); class mx_phpbb3_admin --- 17,23 ---- } ! mx_page::load_file( 'functions'); ! mx_page::load_file( 'functions_module'); ! mx_page::load_file( 'message_parser'); class mx_phpbb3_admin *************** *** 32,36 **** var $p_master = null; var $mx_master = null; ! /** * Constructor --- 32,36 ---- var $p_master = null; var $mx_master = null; ! /** * Constructor *************** *** 168,172 **** $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match ); ! mx_page::load_file( 'utf/utf_tools', 'phpbb3'); for( $i = 0; $i < $func_cnt; $i++ ) { --- 168,172 ---- $func_cnt = preg_match_all( "#\nfunction ([^(]*)\\(#si", $script, $func_match ); ! mx_page::load_file( 'utf/utf_tools'); for( $i = 0; $i < $func_cnt; $i++ ) { *************** *** 266,270 **** die(); } ! return preg_replace( array_keys( $preg_array), $preg_array, $html); } --- 266,270 ---- die(); } ! return preg_replace( array_keys( $preg_array), $preg_array, $html); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:02:54
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10854/admin Modified Files: admin_mx_block_cp.php index_new.php pagestart.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** pagestart.php 9 Feb 2008 19:45:34 -0000 1.31 --- pagestart.php 22 Feb 2008 23:02:49 -0000 1.32 *************** *** 25,35 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } ! mx_page::load_file('functions_admin', !(PORTAL_BACKEND == 'internal') ? PORTAL_BACKEND : 'phpbb2'); if (PORTAL_BACKEND == 'phpbb3') { ! mx_page::load_file('functions_module', 'phpbb3'); } --- 25,35 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } ! mx_page::load_file('functions_admin'); if (PORTAL_BACKEND == 'phpbb3') { ! mx_page::load_file('functions_module'); } Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index_new.php 11 Feb 2008 11:13:16 -0000 1.9 --- index_new.php 22 Feb 2008 23:02:49 -0000 1.10 *************** *** 100,118 **** 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.' . $phpEx ); } if ( PORTAL_BACKEND == OLYMPUS_BACKEND ) { include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); ! mx_page::load_file( 'acp/auth', 'phpbb3' ); ! // mx_page::load_file( 'auth', 'phpbb3'); ! mx_page::load_file( 'functions', 'phpbb3' ); ! mx_page::load_file( 'functions', 'phpbb2' ); ! mx_page::load_file( 'functions_module', 'phpbb3' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; } --- 100,116 ---- if ( PORTAL_BACKEND == PHPBB2X_BACKEND ) { ! mx_page::load_file( 'functions' ); ! mx_page::load_file( 'functions_selects' ); ! mx_page::load_file( 'functions_validate' ); } if ( PORTAL_BACKEND == OLYMPUS_BACKEND ) { include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); ! mx_page::load_file( 'acp/auth' ); ! // mx_page::load_file( 'auth'); ! mx_page::load_file( 'functions' ); ! // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. ! mx_page::load_file( 'functions_module' ); ! $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; } Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_mx_block_cp.php 9 Feb 2008 19:45:34 -0000 1.20 --- admin_mx_block_cp.php 22 Feb 2008 23:02:49 -0000 1.21 *************** *** 28,34 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } ! mx_page::load_file('functions_search', 'phpbb2'); // --- 28,34 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } ! mx_page::load_file('functions_search'); // |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:02:54
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10854 Modified Files: common.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** common.php 18 Feb 2008 19:48:38 -0000 1.86 --- common.php 22 Feb 2008 23:02:49 -0000 1.87 *************** *** 26,30 **** //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. ! error_reporting(E_ALL & ~E_NOTICE); @ini_set( 'display_errors', '1' ); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables --- 26,30 ---- //define( 'DEBUG', 1 ); // [Admin Option] Show Footer debug stats - Actually set in phpBB/includes/constants.php //define( 'DEBUG_EXTRA', 1 ); // [Admin Option] Show memory usage. Show link to full SQL debug report in footer. Beware, this makes the page slow to load. For debugging only. ! //error_reporting(E_ALL & ~E_NOTICE); @ini_set( 'display_errors', '1' ); error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables |
|
From: Jon O. <jon...@us...> - 2008-02-22 23:02:54
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10854/includes Modified Files: mx_functions_core.php mx_functions_phpbb.php mx_functions_tools.php Log Message: Updated load_file() method. Bugfix. The wrong file was included. Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** mx_functions_core.php 17 Feb 2008 20:14:26 -0000 1.81 --- mx_functions_core.php 22 Feb 2008 23:02:49 -0000 1.82 *************** *** 3318,3339 **** * Load additional functions/classes. * ! * @access public ! * @param string $text ! * @param boolean $read_file */ ! function load_file($file = '', $backend = '', $ext = '') { global $mx_root_path, $phpbb_root_path, $phpEx; ! $backend = !empty($backend) ? 'shared/' . $backend . '/includes/' : ''; ! $ext = !empty($ext) ? $ext : $phpEx; ! if (file_exists($mx_root_path . 'includes/'.$backend.$file.'.'.$ext)) ! { ! @include_once($mx_root_path . 'includes/'.$backend.$file.'.'.$ext); ! } ! else { ! @include_once($phpbb_root_path . 'includes/'.$file.'.'.$ext); } } --- 3318,3334 ---- * Load additional functions/classes. * ! * @param unknown_type $file ! * @param unknown_type $backend ! * @param unknown_type $force_shared */ ! function load_file($file = '', $force_shared = false) { global $mx_root_path, $phpbb_root_path, $phpEx; ! $path = PORTAL_BACKEND == 'internal' || $force_shared ? $mx_root_path . 'includes/shared/' . PORTAL_BACKEND . '/includes/' : $phpbb_root_path . 'includes/'; ! if (file_exists($path . $file.'.'.$phpEx)) { ! include_once($path . $file.'.'.$phpEx); } } Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** mx_functions_phpbb.php 17 Feb 2008 20:14:26 -0000 1.47 --- mx_functions_phpbb.php 22 Feb 2008 23:02:49 -0000 1.48 *************** *** 152,156 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } --- 152,156 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } *************** *** 247,251 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } --- 247,251 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } *************** *** 275,279 **** if( !function_exists('bbencode_second_pass') ) { ! mx_page::load_file('bbcode', 'phpbb2'); } --- 275,279 ---- if( !function_exists('bbencode_second_pass') ) { ! mx_page::load_file('bbcode'); } Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_functions_tools.php 18 Feb 2008 20:19:32 -0000 1.22 --- mx_functions_tools.php 22 Feb 2008 23:02:49 -0000 1.23 *************** *** 20,24 **** if( !function_exists('bbencode_second_pass') ) { ! mx_page::load_file('bbcode', 'phpbb2'); } --- 20,24 ---- if( !function_exists('bbencode_second_pass') ) { ! mx_page::load_file('bbcode'); } *************** *** 1600,1604 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } --- 1600,1604 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 20:43:53
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18564 Modified Files: mx_phpbb.php Log Message: Updates, for cash Index: mx_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_phpbb.php 21 Feb 2008 19:57:49 -0000 1.18 --- mx_phpbb.php 22 Feb 2008 20:43:46 -0000 1.19 *************** *** 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.'); } --- 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.'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 20:43:52
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18564/includes Modified Files: forum_hack.php phpbb_constants.php Log Message: Updates, for cash Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** forum_hack.php 22 Feb 2008 19:21:08 -0000 1.46 --- forum_hack.php 22 Feb 2008 20:43:46 -0000 1.47 *************** *** 84,87 **** --- 84,92 ---- //Check for cash mod // + if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) + { + define('IN_CASHMOD', true); + } + /* if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) *************** *** 1647,1650 **** --- 1652,1657 ---- break; } + + include_once($phpbb_root_path . 'includes/functions_cash.'.$phpEx); } *************** *** 1671,1683 **** // $code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); ! ! if (!defined('IN_CASHMOD')) ! { ! $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $code); ! } ! else ! { ! $code = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','$mx_forum->read_file(\'includes/functions_cash\', true);' . "\n", $code); ! } // --- 1678,1682 ---- // $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); // *************** *** 1716,1723 **** // $code = preg_replace ("/include(.*)functions\./", "//", $code); ! $code = preg_replace ("/include(.*)functions_select\./", "//", $code); ! $code = preg_replace ("/include(.*)functions_post\./", "//", $code); ! $code = preg_replace ("/include(.*)bbcode\./", "//", $code); ! $code = preg_replace ("/include(.*)auth\./", "//", $code); // --- 1715,1722 ---- // $code = preg_replace ("/include(.*)functions\./", "//", $code); ! $code = preg_replace ("/include(.*)functions_select./", "//", $code); ! $code = preg_replace ("/include(.*)functions_post./", "//", $code); ! $code = preg_replace ("/include(.*)bbcode./", "//", $code); ! $code = preg_replace ("/include(.*)auth./", "//", $code); // *************** *** 1826,1830 **** $code = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $code); $code = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $code); ! $template = new mx_Template($phpbb_root_path . 'templates/'. $theme['template_name']); break; --- 1825,1829 ---- $code = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $code); $code = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $code); ! $template = new Template_plus($phpbb_root_path . 'templates/'. $theme['template_name']); break; Index: phpbb_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/phpbb_constants.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** phpbb_constants.php 8 Feb 2008 04:26:20 -0000 1.7 --- phpbb_constants.php 22 Feb 2008 20:43:46 -0000 1.8 *************** *** 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.'); } --- 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.'); } |
|
From: Jon O. <jon...@us...> - 2008-02-22 19:21:24
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16982 Modified Files: forum_hack.php Log Message: Here we go again. I'm debugging this over at your place ;) Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** forum_hack.php 22 Feb 2008 11:36:34 -0000 1.45 --- forum_hack.php 22 Feb 2008 19:21:08 -0000 1.46 *************** *** 37,40 **** --- 37,41 ---- include_once($phpbb_root_path . 'includes/auth.' . $phpEx); } + if(!function_exists('get_db_stat')) { *************** *** 52,69 **** } - /* - // Cannot be loaded here, since its functions load other includes - if(!function_exists('clean_words')) - { - include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); - } - */ - if(!function_exists('smilies_pass')) { ! include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); //This never work and youtube tag is parsed since bbcode is vannila } ! //Check for mx_smartor fap version // We need to check the DB too, since we can have the files there but not installed !! --- 53,62 ---- } if(!function_exists('smilies_pass')) { ! include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); } ! /* //Check for mx_smartor fap version // We need to check the DB too, since we can have the files there but not installed !! *************** *** 77,80 **** --- 70,74 ---- $db->sql_freeresult($result); } + */ // *************** *** 106,110 **** */ - // -------------------------------------------------------------------------------- // Class: mx_forum --- 100,103 ---- *************** *** 1621,1625 **** // Main method // ! function read_file($phpbb_file, $sub_call = false) { global $phpbb_root_path, $mx_root_path, $phpEx, $template, $HTTP_POST_VARS, $HTTP_POST_FILES, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $db, $userdata, $mode, $theme, $lang, $table_prefix, $mx_table_prefix, $board_config, $portal_config; --- 1614,1618 ---- // Main method // ! function read_file( $phpbb_file, $sub_call = false ) { global $phpbb_root_path, $mx_root_path, $phpEx, $template, $HTTP_POST_VARS, $HTTP_POST_FILES, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $db, $userdata, $mode, $theme, $lang, $table_prefix, $mx_table_prefix, $board_config, $portal_config; *************** *** 1635,1639 **** global $cash, $cm_groups; // allways used globally by cash mod ! switch ($phpbb_file) { case 'memberlist': --- 1628,1632 ---- global $cash, $cm_groups; // allways used globally by cash mod ! switch ( $phpbb_file ) { case 'memberlist': *************** *** 1654,1664 **** break; } - - //From phpBB2 common.php - // - // [Remove?] No! since we don't include phpBB2 common.php :) - // This code is already present below for subcalls of includes. - // - //$this->read_file('functions_cash', true); } --- 1647,1650 ---- *************** *** 1685,1689 **** // $code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); ! if (!defined('IN_CASHMOD')) { --- 1671,1675 ---- // $code = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $code); ! if (!defined('IN_CASHMOD')) { *************** *** 1730,1741 **** // $code = preg_replace ("/include(.*)functions\./", "//", $code); ! //$code = preg_replace ("/include(.*)functions_select\./", "//", $code); //This does not work and profile/register will be blank again ! //$code = preg_replace ("/include(.*)functions_post\./", "//", $code); //This does not work and profile/register will be blank again ! //$code = preg_replace ("/include(.*)bbcode\./", "//", $code); //This does not work and profile/register will be blank again ! //$code = preg_replace ("/include(.*)auth\./", "//", $code); //This does not work and profile/register will be blank again ! $code = preg_replace ("/include(.*)functions_select/", "//", $code); ! $code = preg_replace ("/include(.*)functions_post/", "//", $code); ! $code = preg_replace ("/include(.*)bbcode/", "//", $code); ! $code = preg_replace ("/include(.*)auth/", "//", $code); // --- 1716,1723 ---- // $code = preg_replace ("/include(.*)functions\./", "//", $code); ! $code = preg_replace ("/include(.*)functions_select\./", "//", $code); ! $code = preg_replace ("/include(.*)functions_post\./", "//", $code); ! $code = preg_replace ("/include(.*)bbcode\./", "//", $code); ! $code = preg_replace ("/include(.*)auth\./", "//", $code); // |
2 messages has been excluded from this view by a project administrator.
