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-07-15 22:05:30
|
Update of /cvsroot/mxbb/core/modules/mx_users/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25034 Modified Files: admin_prune_user_posts.php admin_users.php Log Message: More...of the same Index: admin_prune_user_posts.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_user_posts.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_prune_user_posts.php 9 Feb 2008 12:51:06 -0000 1.3 --- admin_prune_user_posts.php 15 Jul 2008 22:05:25 -0000 1.4 *************** *** 29,35 **** include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); - // Search functions - include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); - // ********************************************************************** // Read language definition --- 29,32 ---- Index: admin_users.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_users.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_users.php 14 Jun 2008 20:41:20 -0000 1.7 --- admin_users.php 15 Jul 2008 22:05:25 -0000 1.8 *************** *** 36,43 **** include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.'.$phpEx); ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions_post.'.$phpEx); ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions_selects.'.$phpEx); ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions_validate.'.$phpEx); $html_entities_match = array('#<#', '#>#'); --- 36,43 ---- include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); ! mx_cache::load_file('bbcode', 'phpbb2'); ! mx_cache::load_file('functions_post', 'phpbb2'); ! mx_cache::load_file('functions_selects', 'phpbb2'); ! mx_cache::load_file('functions_validate', 'phpbb2'); $html_entities_match = array('#<#', '#>#'); |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:05:25
|
Update of /cvsroot/mxbb/mx_import_tools/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25011 Modified Files: functions_mod_user.php Log Message: More.. Index: functions_mod_user.php =================================================================== RCS file: /cvsroot/mxbb/mx_import_tools/includes/functions_mod_user.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** functions_mod_user.php 10 Jul 2008 22:24:40 -0000 1.10 --- functions_mod_user.php 15 Jul 2008 22:05:21 -0000 1.11 *************** *** 17,31 **** if( !function_exists('validate_username') ) { ! mx_cache::load_file('functions_validate'); } if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post'); ! } ! ! if( !function_exists('make_bbcode_uid') ) ! { ! mx_cache::load_file('bbcode'); } --- 17,26 ---- if( !function_exists('validate_username') ) { ! mx_cache::load_file('functions_validate', 'phpbb2'); } if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } *************** *** 48,52 **** function user( $name, $password, $email ) { ! global $board_config; $this->username = $this->sql_escape( $name ); --- 43,47 ---- function user( $name, $password, $email ) { ! global $board_config, $mx_bbcode; $this->username = $this->sql_escape( $name ); *************** *** 68,72 **** $user_fields['user_msnm'] = ''; $this->user_fields['user_sig'] = ''; ! $this->user_fields['user_sig_bbcode_uid'] = ( $board_config['allow_bbcode'] ) ? make_bbcode_uid() : ''; $this->user_fields['user_avatar'] = ''; $this->user_fields['user_avatar_type'] = USER_AVATAR_NONE; --- 63,67 ---- $user_fields['user_msnm'] = ''; $this->user_fields['user_sig'] = ''; ! $this->user_fields['user_sig_bbcode_uid'] = ( $board_config['allow_bbcode'] ) ? $mx_bbcode->make_bbcode_uid() : ''; $this->user_fields['user_avatar'] = ''; $this->user_fields['user_avatar_type'] = USER_AVATAR_NONE; |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:59
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24415 Modified Files: admin_rebuild_mx_search.php admin_rebuild_search.php Log Message: More...of the same Index: admin_rebuild_mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_mx_search.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_rebuild_mx_search.php 12 Feb 2008 10:22:21 -0000 1.13 --- admin_rebuild_mx_search.php 15 Jul 2008 22:04:55 -0000 1.14 *************** *** 30,34 **** $phpEx = substr(strrchr(__FILE__, '.'), 1); require( $mx_root_path . 'admin/pagestart.' . $phpEx ); - require ($phpbb_root_path . 'includes/functions_search.'.$phpEx); // ********************************************************************** --- 30,33 ---- Index: admin_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/admin/admin_rebuild_search.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_rebuild_search.php 9 Feb 2008 20:53:36 -0000 1.11 --- admin_rebuild_search.php 15 Jul 2008 22:04:55 -0000 1.12 *************** *** 28,32 **** $phpEx = substr(strrchr(__FILE__, '.'), 1); require( $mx_root_path . 'admin/pagestart.' . $phpEx ); - require ($phpbb_root_path . 'includes/functions_search.'.$phpEx); // ********************************************************************** --- 28,31 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:40
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24247 Modified Files: mx_search.php Log Message: More...of the same Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mx_search.php 10 Jul 2008 22:20:50 -0000 1.28 --- mx_search.php 15 Jul 2008 22:04:36 -0000 1.29 *************** *** 20,26 **** $title = $mx_block->block_info['block_title']; ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! mx_cache::load_file('functions_search', 'phpbb2'); // --- 20,27 ---- $title = $mx_block->block_info['block_title']; ! if( !function_exists('add_search_words') ) ! { ! mx_cache::load_file('functions_search', 'phpbb2'); ! } // |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:22
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24122 Modified Files: functions_post.php Log Message: More...of the same Index: functions_post.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions_post.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_post.php 9 Sep 2007 16:51:51 -0000 1.1 --- functions_post.php 15 Jul 2008 22:04:18 -0000 1.2 *************** *** 188,192 **** global $userdata, $user_ip; ! include($phpbb_root_path . 'includes/functions_search.'.$phpEx); $current_time = time(); --- 188,195 ---- global $userdata, $user_ip; ! if( !function_exists('add_search_words') ) ! { ! mx_cache::load_file('functions_search', 'phpbb2'); ! } $current_time = time(); *************** *** 460,464 **** if ($mode != 'poll_delete') { ! include($phpbb_root_path . 'includes/functions_search.'.$phpEx); $sql = "DELETE FROM " . POSTS_TABLE . " --- 463,470 ---- if ($mode != 'poll_delete') { ! if( !function_exists('add_search_words') ) ! { ! mx_cache::load_file('functions_search', 'phpbb2'); ! } $sql = "DELETE FROM " . POSTS_TABLE . " |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:08
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23576 Modified Files: cal_functions.php Log Message: More... Index: cal_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** cal_functions.php 10 Jul 2008 22:21:58 -0000 1.14 --- cal_functions.php 15 Jul 2008 22:04:04 -0000 1.15 *************** *** 233,242 **** $id, $day, $month, $year, $userdata, $lang, $config_footer, $footer, $caluser, $cal_version, $block_size, // MX001 ! $endday, $endmonth, $endyear, $bbcode_uid, $homeurl, $db, $template, $mx_page; ! ! if( !function_exists('generate_smilies') ) ! { ! mx_cache::load_file('functions_post'); ! } if ( $caluser >= 4 ) --- 233,237 ---- $id, $day, $month, $year, $userdata, $lang, $config_footer, $footer, $caluser, $cal_version, $block_size, // MX001 ! $endday, $endmonth, $endyear, $bbcode_uid, $homeurl, $db, $template, $mx_page, $mx_bbcode; if ( $caluser >= 4 ) *************** *** 275,279 **** $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! generate_smilies( 'inline', PAGE_POSTING ); $board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) ); --- 270,274 ---- $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! $mx_bbcode->generate_smilies( 'inline', PAGE_POSTING ); $board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) ); *************** *** 403,407 **** $id, $day, $month, $year, $userdata, $lang, $caluser, $lastday, $phpbbheaders, $block_size, ! $endday, $endmonth, $endyear, $bbcode_uid, $db, $template, $homeurl, $HTTP_POST_VARS, $mx_page; if ( $caluser >= 2 ) --- 398,402 ---- $id, $day, $month, $year, $userdata, $lang, $caluser, $lastday, $phpbbheaders, $block_size, ! $endday, $endmonth, $endyear, $bbcode_uid, $db, $template, $homeurl, $HTTP_POST_VARS, $mx_page, $mx_bbcode; if ( $caluser >= 2 ) *************** *** 414,425 **** } - if( !function_exists('generate_smilies') ) - { - mx_cache::load_file('functions_post'); - } - $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! generate_smilies( 'inline', PAGE_POSTING ); $board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) ); --- 409,415 ---- } $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! $mx_bbcode->generate_smilies( 'inline', PAGE_POSTING ); $board_config['smilies_path'] = $smilies_path; $template->assign_vars( array( 'U_MORE_SMILIES' => mx_append_sid( PHPBB_URL . "posting.$phpEx?mode=smilies" ) ) ); *************** *** 603,617 **** if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post'); ! } ! ! if( !function_exists('make_bbcode_uid') ) ! { ! mx_cache::load_file('bbcode'); } if ( !$bbcode_uid ) { ! $bbcode_uid = make_bbcode_uid(); } // PREPARE MESSAGE --- 593,602 ---- if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } if ( !$bbcode_uid ) { ! $bbcode_uid = $mx_bbcode->make_bbcode_uid(); } // PREPARE MESSAGE |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:06
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23076/phpbb2 Modified Files: core.php Added Files: functions.php Log Message: More...of the same --- NEW FILE: functions.php --- <?php /** * * @package Auth * @version $Id: functions.php,v 1.1 2008/07/15 22:03:30 jonohlsson Exp $ * @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 * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } /** * Get 'Poll Select' html select list. * * Quick and handy function to generate a dropdown select list for current phpbb polls * * @param string $default_poll select idfield = id * @param string $select_name select name * @return string (html) */ function poll_select($default_poll, $select_name = 'Poll_Topic_id') { global $db; $style_select = '<select name="' . $select_name . '">'; $selected = ( $default_poll == 0 ) ? ' selected="selected"' : ''; $style_select .= '<option value="0"' . $selected . '>' . 'The most recent' . "</option>\n"; $sql = "SELECT topic_id, vote_text FROM " . VOTE_DESC_TABLE . " ORDER BY vote_text, topic_id"; if( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, "Couldn't query polls table", '', __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) { $selected = ( $row['topic_id'] == $default_poll ) ? ' selected="selected"' : ''; $style_select .= '<option value="' . $row['topic_id'] . '"' . $selected . '>' . $row['vote_text'] . "</option>\n"; } $style_select .= '</select>'; unset($row); $db->sql_freeresult($result); return $style_select; } ?> Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** core.php 13 Jul 2008 21:29:12 -0000 1.10 --- core.php 15 Jul 2008 22:03:29 -0000 1.11 *************** *** 22,29 **** include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); ! include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx); ! include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions /** * Permission/Auth class --- 22,40 ---- include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); ! // ! // Now load some bbcodes, to be extended for this backend (see below) ! // include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions + // + // Finally, load some backend specific functions + // + include_once($mx_root_path . 'includes/sessions/phpbb2/functions.' . $phpEx); + + // + // phpBB Permissions + // + include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx); + /** * Permission/Auth class *************** *** 244,248 **** --- 255,270 ---- $this->sync_configs(); + // + // Dummy include, to make all original phpBB functions available + // include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions... + + // + // Is phpBB File Attachment MOD present? + // + if( file_exists($phpbb_root_path . 'attach_mod') ) + { + include_once($phpbb_root_path . 'attach_mod/attachment_mod.' . $phpEx); + } } *************** *** 900,940 **** } } - - /** - * Get 'Poll Select' html select list. - * - * Quick and handy function to generate a dropdown select list for current phpbb polls - * - * @param string $default_poll select idfield = id - * @param string $select_name select name - * @return string (html) - */ - function poll_select($default_poll, $select_name = 'Poll_Topic_id') - { - global $db; - - $style_select = '<select name="' . $select_name . '">'; - $selected = ( $default_poll == 0 ) ? ' selected="selected"' : ''; - $style_select .= '<option value="0"' . $selected . '>' . 'The most recent' . "</option>\n"; - - $sql = "SELECT topic_id, vote_text - FROM " . VOTE_DESC_TABLE . " - ORDER BY vote_text, topic_id"; - - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't query polls table", '', __LINE__, __FILE__, $sql); - } - - while( $row = $db->sql_fetchrow($result) ) - { - $selected = ( $row['topic_id'] == $default_poll ) ? ' selected="selected"' : ''; - $style_select .= '<option value="' . $row['topic_id'] . '"' . $selected . '>' . $row['vote_text'] . "</option>\n"; - } - $style_select .= '</select>'; - - unset($row); - $db->sql_freeresult($result); - return $style_select; - } ?> \ No newline at end of file --- 922,924 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:04:04
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23076/internal Modified Files: core.php Log Message: More...of the same Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** core.php 13 Jul 2008 20:13:56 -0000 1.8 --- core.php 15 Jul 2008 22:03:28 -0000 1.9 *************** *** 22,29 **** --- 22,33 ---- include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); + // + // Now load some bbcodes, to be extended for this backend (see below) + // include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions /** * Backend specific tasks + * * @package MX-Publisher */ *************** *** 48,52 **** // ! // Define relative path to phpBB, and validate // $phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/'; --- 52,56 ---- // ! // Define relative path to "phpBB", and validate // $phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/'; *************** *** 94,99 **** // $this->sync_configs(); - - include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions... } --- 98,101 ---- *************** *** 238,242 **** * @access private */ ! function dss_rand($force_shared) { global $db, $portal_config, $board_config, $dss_seeded; --- 240,244 ---- * @access private */ ! function dss_rand() { global $db, $portal_config, $board_config, $dss_seeded; |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:59
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23256/admin Modified Files: admin_auth_manage.php admin_cat_manage.php admin_custom_manage.php admin_settings.php admin_types_manage.php Log Message: More... Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_custom_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_custom_manage.php 10 Jul 2008 22:21:39 -0000 1.6 --- admin_custom_manage.php 15 Jul 2008 22:03:47 -0000 1.7 *************** *** 21,29 **** global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; - // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - $this_custom_field = new mx_custom_field(BUGSBT_CUSTOM_TABLE, BUGSBT_CUSTOM_DATA_TABLE); $this_custom_field->init(); --- 21,24 ---- Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_cat_manage.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_cat_manage.php 10 Jul 2008 22:21:39 -0000 1.9 --- admin_cat_manage.php 15 Jul 2008 22:03:47 -0000 1.10 *************** *** 21,29 **** global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config; - // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); --- 21,24 ---- Index: admin_types_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_types_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_types_manage.php 10 Jul 2008 22:21:40 -0000 1.6 --- admin_types_manage.php 15 Jul 2008 22:03:48 -0000 1.7 *************** *** 22,30 **** // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - - // // Load mode // --- 22,25 ---- Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_settings.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_settings.php 10 Jul 2008 22:21:40 -0000 1.8 --- admin_settings.php 15 Jul 2008 22:03:48 -0000 1.9 *************** *** 22,30 **** // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - - // // Pull all config data // --- 22,25 ---- Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_auth_manage.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_auth_manage.php 10 Jul 2008 22:21:39 -0000 1.7 --- admin_auth_manage.php 15 Jul 2008 22:03:46 -0000 1.8 *************** *** 22,30 **** // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - - // // Start adminCP // --- 22,25 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:57
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23256/modules Modified Files: bugsbt_post.php bugsbt_post_comment.php Log Message: More... Index: bugsbt_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/modules/bugsbt_post.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bugsbt_post.php 6 Jul 2008 22:11:31 -0000 1.10 --- bugsbt_post.php 15 Jul 2008 22:03:50 -0000 1.11 *************** *** 31,35 **** global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars, $theme; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! global $page_id, $block_id; // --- 31,35 ---- global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars, $theme; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! global $page_id, $block_id, $mx_bbcode; // *************** *** 208,212 **** if ($smilies_on) { ! $mx_bugsbt_functions->generate_smilies( 'inline', PAGE_POSTING ); } } --- 208,212 ---- if ($smilies_on) { ! $mx_bbcode->generate_smilies( 'inline', PAGE_POSTING ); } } Index: bugsbt_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/modules/bugsbt_post_comment.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bugsbt_post_comment.php 3 Jun 2008 20:07:48 -0000 1.6 --- bugsbt_post_comment.php 15 Jul 2008 22:03:50 -0000 1.7 *************** *** 31,35 **** global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars; global $page_id, $block_id; ! global $mx_block, $theme; // --- 31,35 ---- global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $mx_request_vars; global $page_id, $block_id; ! global $mx_block, $theme, $mx_bbcode; // *************** *** 175,179 **** if ($smilies_on) { ! $mx_bugsbt_functions->generate_smilies( 'inline', PAGE_POSTING ); } } --- 175,179 ---- if ($smilies_on) { ! $mx_bbcode->generate_smilies( 'inline', PAGE_POSTING ); } } |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:56
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23256/includes Modified Files: functions.php Log Message: More... Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** functions.php 6 Jul 2008 22:11:31 -0000 1.11 --- functions.php 15 Jul 2008 22:03:49 -0000 1.12 *************** *** 95,98 **** --- 95,99 ---- * @param unknown_type $page_id */ + /* function generate_smilies( $mode, $page_id ) { *************** *** 110,117 **** if ( $mode == 'window' ) { - /* - $userdata = session_pagestart( $user_ip, $page_id ); - init_userprefs( $userdata ); - */ $mx_user->init($user_ip, PAGE_INDEX); --- 111,114 ---- *************** *** 199,202 **** --- 196,200 ---- } + if ( $mode == 'window' ) { *************** *** 205,208 **** --- 203,207 ---- } } + */ /** |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:38
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23076/phpbb3 Modified Files: core.php Added Files: functions.php Log Message: More...of the same --- NEW FILE: functions.php --- <?php /** * * @package Auth * @version $Id: functions.php,v 1.1 2008/07/15 22:03:31 jonohlsson Exp $ * @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 * */ if ( !defined( 'IN_PORTAL' ) ) { die( "Hacking attempt" ); } /** * Olympus Parse cfg file */ function mx_parse_cfg_file($filename, $lines = false) { $parsed_items = array(); if ($lines === false) { $lines = file($filename); } foreach ($lines as $line) { $line = trim($line); if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) { continue; } // Determine first occurrence, since in values the equal sign is allowed $key = strtolower(trim(substr($line, 0, $delim_pos))); $value = trim(substr($line, $delim_pos + 1)); if (in_array($value, array('off', 'false', '0'))) { $value = false; } else if (in_array($value, array('on', 'true', '1'))) { $value = true; } else if (!trim($value)) { $value = ''; } else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"')) { $value = substr($value, 1, sizeof($value)-2); } $parsed_items[$key] = $value; } return $parsed_items; } /** * Add log event */ function mx_add_log() { global $db, $mx_user; $args = func_get_args(); $mode = array_shift($args); $reportee_id = ($mode == 'user') ? intval(array_shift($args)) : ''; $forum_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; $topic_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; $action = array_shift($args); $data = (!sizeof($args)) ? '' : serialize($args); $sql_ary = array( 'user_id' => (empty($mx_user->data)) ? ANONYMOUS : $mx_user->data['user_id'], 'log_ip' => $mx_user->ip, 'log_time' => time(), 'log_operation' => $action, 'log_data' => $data, ); switch ($mode) { case 'admin': $sql_ary['log_type'] = LOG_ADMIN; break; case 'mod': $sql_ary += array( 'log_type' => LOG_MOD, 'forum_id' => $forum_id, 'topic_id' => $topic_id ); break; case 'user': $sql_ary += array( 'log_type' => LOG_USERS, 'reportee_id' => $reportee_id ); break; case 'critical': $sql_ary['log_type'] = LOG_CRITICAL; break; default: return false; } $db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); return $db->sql_nextid(); } /** * Generate sort selection fields */ function mx_gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param) { global $mx_user; $sort_dir_text = array('a' => $mx_user->lang['ASCENDING'], 'd' => $mx_user->lang['DESCENDING']); // Check if the key is selectable. If not, we reset to the first key found. // This ensures the values are always valid. if (!isset($limit_days[$sort_days])) { @reset($limit_days); $sort_days = key($limit_days); } if (!isset($sort_by_text[$sort_key])) { @reset($sort_by_text); $sort_key = key($sort_by_text); } if (!isset($sort_dir_text[$sort_dir])) { @reset($sort_dir_text); $sort_dir = key($sort_dir_text); } $s_limit_days = '<select name="st">'; foreach ($limit_days as $day => $text) { $selected = ($sort_days == $day) ? ' selected="selected"' : ''; $s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>'; } $s_limit_days .= '</select>'; $s_sort_key = '<select name="sk">'; foreach ($sort_by_text as $key => $text) { $selected = ($sort_key == $key) ? ' selected="selected"' : ''; $s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>'; } $s_sort_key .= '</select>'; $s_sort_dir = '<select name="sd">'; foreach ($sort_dir_text as $key => $value) { $selected = ($sort_dir == $key) ? ' selected="selected"' : ''; $s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; } $s_sort_dir .= '</select>'; $u_sort_param = "st=$sort_days&sk=$sort_key&sd=$sort_dir"; return; } /** * Get username details for placing into templates. * * @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour) or full (for obtaining a html string representing a coloured link to the users profile). * @param int $user_id The users id * @param string $username The users name * @param string $username_colour The users colour * @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then. * @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &u={user_id} * * @return string A string consisting of what is wanted based on $mode. */ function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false) { global $phpbb_root_path, $phpEx, $mx_user, $phpbb_auth; $profile_url = ''; $username_colour = ($username_colour) ? '#' . $username_colour : ''; if ($guest_username === false) { $username = ($username) ? $username : $mx_user->lang['GUEST']; } else { $username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']); } // Only show the link if not anonymous if ($user_id && $user_id != ANONYMOUS) { // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly). // For all others the link leads to a login page or the profile. if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile')) { $profile_url = ''; } else { $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); $profile_url .= '&u=' . (int) $user_id; } } else { $profile_url = ''; } switch ($mode) { case 'profile': return $profile_url; break; case 'username': return $username; break; case 'colour': return $username_colour; break; case 'full': default: $tpl = ''; if (!$profile_url && !$username_colour) { $tpl = '{USERNAME}'; } else if (!$profile_url && $username_colour) { $tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>'; } else if ($profile_url && !$username_colour) { $tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>'; } else if ($profile_url && $username_colour) { $tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>'; } return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl); break; } } /** * For display of custom parsed text on user-facing pages * Expects $text to be the value directly from the database (stored value) */ function mx_generate_text_for_display($text, $uid, $bitfield, $flags) { static $bbcode, $mx_bbcode; if (!$text) { return ''; } $text = phpbb3::censor_text($text); // Parse bbcode if bbcode uid stored and bbcode enabled if ($uid && ($flags & OPTION_FLAG_BBCODE)) { if (!class_exists('bbcode')) { global $phpbb_root_path, $phpEx; mx_cache::load_file('bbcode', 'phpbb3'); } if (empty($bbcode)) { $bbcode = new bbcode($bitfield); } else { $bbcode->bbcode($bitfield); } $bbcode->bbcode_second_pass($text, $uid); } $text = str_replace("\n", '<br />', $text); $text = $mx_bbcode->smilies_pass($text, !($flags & OPTION_FLAG_SMILIES)); return $text; } ?> Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** core.php 13 Jul 2008 20:13:57 -0000 1.8 --- core.php 15 Jul 2008 22:03:31 -0000 1.9 *************** *** 22,29 **** include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions // ! // Switch // include_once($mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx); --- 22,37 ---- include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); + // + // Now load some bbcodes, to be extended for this backend (see below) + // include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions // ! // Finally, load some backend specific functions ! // ! include_once($mx_root_path . 'includes/sessions/phpbb3/functions.' . $phpEx); ! ! // ! // phpBB Permissions // include_once($mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx); *************** *** 245,248 **** --- 253,261 ---- // $this->sync_configs(); + + // + // Dummy include, to make all original phpBB functions available + // + include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions... } *************** *** 399,403 **** * @access private */ ! function dss_rand($force_shared) { global $db, $portal_config, $board_config, $dss_seeded; --- 412,416 ---- * @access private */ ! function dss_rand() { global $db, $portal_config, $board_config, $dss_seeded; *************** *** 1019,1316 **** } } - - /** - * Olympus Parse cfg file - */ - function mx_parse_cfg_file($filename, $lines = false) - { - $parsed_items = array(); - - if ($lines === false) - { - $lines = file($filename); - } - - foreach ($lines as $line) - { - $line = trim($line); - - if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) - { - continue; - } - - // Determine first occurrence, since in values the equal sign is allowed - $key = strtolower(trim(substr($line, 0, $delim_pos))); - $value = trim(substr($line, $delim_pos + 1)); - - if (in_array($value, array('off', 'false', '0'))) - { - $value = false; - } - else if (in_array($value, array('on', 'true', '1'))) - { - $value = true; - } - else if (!trim($value)) - { - $value = ''; - } - else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"')) - { - $value = substr($value, 1, sizeof($value)-2); - } - - $parsed_items[$key] = $value; - } - - return $parsed_items; - } - - /** - * Add log event - */ - function mx_add_log() - { - global $db, $mx_user; - - $args = func_get_args(); - - $mode = array_shift($args); - $reportee_id = ($mode == 'user') ? intval(array_shift($args)) : ''; - $forum_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $topic_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $action = array_shift($args); - $data = (!sizeof($args)) ? '' : serialize($args); - - $sql_ary = array( - 'user_id' => (empty($mx_user->data)) ? ANONYMOUS : $mx_user->data['user_id'], - 'log_ip' => $mx_user->ip, - 'log_time' => time(), - 'log_operation' => $action, - 'log_data' => $data, - ); - - switch ($mode) - { - case 'admin': - $sql_ary['log_type'] = LOG_ADMIN; - break; - - case 'mod': - $sql_ary += array( - 'log_type' => LOG_MOD, - 'forum_id' => $forum_id, - 'topic_id' => $topic_id - ); - break; - - case 'user': - $sql_ary += array( - 'log_type' => LOG_USERS, - 'reportee_id' => $reportee_id - ); - break; - - case 'critical': - $sql_ary['log_type'] = LOG_CRITICAL; - break; - - default: - return false; - } - - $db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - return $db->sql_nextid(); - } - - /** - * Generate sort selection fields - */ - function mx_gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, &$sort_dir, &$s_limit_days, &$s_sort_key, &$s_sort_dir, &$u_sort_param) - { - global $mx_user; - - $sort_dir_text = array('a' => $mx_user->lang['ASCENDING'], 'd' => $mx_user->lang['DESCENDING']); - - // Check if the key is selectable. If not, we reset to the first key found. - // This ensures the values are always valid. - if (!isset($limit_days[$sort_days])) - { - @reset($limit_days); - $sort_days = key($limit_days); - } - - if (!isset($sort_by_text[$sort_key])) - { - @reset($sort_by_text); - $sort_key = key($sort_by_text); - } - - if (!isset($sort_dir_text[$sort_dir])) - { - @reset($sort_dir_text); - $sort_dir = key($sort_dir_text); - } - - $s_limit_days = '<select name="st">'; - foreach ($limit_days as $day => $text) - { - $selected = ($sort_days == $day) ? ' selected="selected"' : ''; - $s_limit_days .= '<option value="' . $day . '"' . $selected . '>' . $text . '</option>'; - } - $s_limit_days .= '</select>'; - - $s_sort_key = '<select name="sk">'; - foreach ($sort_by_text as $key => $text) - { - $selected = ($sort_key == $key) ? ' selected="selected"' : ''; - $s_sort_key .= '<option value="' . $key . '"' . $selected . '>' . $text . '</option>'; - } - $s_sort_key .= '</select>'; - - $s_sort_dir = '<select name="sd">'; - foreach ($sort_dir_text as $key => $value) - { - $selected = ($sort_dir == $key) ? ' selected="selected"' : ''; - $s_sort_dir .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; - } - $s_sort_dir .= '</select>'; - - $u_sort_param = "st=$sort_days&sk=$sort_key&sd=$sort_dir"; - - return; - } - - /** - * Get username details for placing into templates. - * - * @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour) or full (for obtaining a html string representing a coloured link to the users profile). - * @param int $user_id The users id - * @param string $username The users name - * @param string $username_colour The users colour - * @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then. - * @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &u={user_id} - * - * @return string A string consisting of what is wanted based on $mode. - */ - function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false) - { - global $phpbb_root_path, $phpEx, $mx_user, $phpbb_auth; - - $profile_url = ''; - $username_colour = ($username_colour) ? '#' . $username_colour : ''; - - if ($guest_username === false) - { - $username = ($username) ? $username : $mx_user->lang['GUEST']; - } - else - { - $username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']); - } - - // Only show the link if not anonymous - if ($user_id && $user_id != ANONYMOUS) - { - // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly). - // For all others the link leads to a login page or the profile. - if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile')) - { - $profile_url = ''; - } - else - { - $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); - $profile_url .= '&u=' . (int) $user_id; - } - } - else - { - $profile_url = ''; - } - - switch ($mode) - { - case 'profile': - return $profile_url; - break; - - case 'username': - return $username; - break; - - case 'colour': - return $username_colour; - break; - - case 'full': - default: - - $tpl = ''; - if (!$profile_url && !$username_colour) - { - $tpl = '{USERNAME}'; - } - else if (!$profile_url && $username_colour) - { - $tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>'; - } - else if ($profile_url && !$username_colour) - { - $tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>'; - } - else if ($profile_url && $username_colour) - { - $tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>'; - } - - return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl); - break; - } - } - - /** - * For display of custom parsed text on user-facing pages - * Expects $text to be the value directly from the database (stored value) - */ - function mx_generate_text_for_display($text, $uid, $bitfield, $flags) - { - static $bbcode, $mx_bbcode; - - if (!$text) - { - return ''; - } - - $text = phpbb3::censor_text($text); - - // Parse bbcode if bbcode uid stored and bbcode enabled - if ($uid && ($flags & OPTION_FLAG_BBCODE)) - { - if (!class_exists('bbcode')) - { - global $phpbb_root_path, $phpEx; - mx_cache::load_file('bbcode', 'phpbb3'); - } - - if (empty($bbcode)) - { - $bbcode = new bbcode($bitfield); - } - else - { - $bbcode->bbcode($bitfield); - } - - $bbcode->bbcode_second_pass($text, $uid); - } - - $text = str_replace("\n", '<br />', $text); - - $text = $mx_bbcode->smilies_pass($text, !($flags & OPTION_FLAG_SMILIES)); - - return $text; - } ?> \ No newline at end of file --- 1032,1034 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:25
|
Update of /cvsroot/mxbb/mx_act/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22987 Modified Files: act_functions.php Log Message: More... Index: act_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_act/includes/act_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** act_functions.php 10 Jul 2008 22:21:12 -0000 1.11 --- act_functions.php 15 Jul 2008 22:03:21 -0000 1.12 *************** *** 79,83 **** function send_challenge_pm( $dest_user, $subject, $message ) { ! global $db , $phpbb_root_path , $phpEx , $lang, $user_ip, $board_config , $userdata, $mx_page; $dest_user = intval( $dest_user ); --- 79,83 ---- function send_challenge_pm( $dest_user, $subject, $message ) { ! global $db , $phpbb_root_path , $phpEx , $lang, $user_ip, $board_config , $userdata, $mx_page, $mx_bbcode; $dest_user = intval( $dest_user ); *************** *** 89,104 **** $smilies_on = 1; - if( !function_exists('prepare_message') ) - { - mx_cache::load_file('functions_post'); - } - - if( !function_exists('make_bbcode_uid') ) - { - mx_cache::load_file('bbcode'); - } - $privmsg_subject = trim( strip_tags( $subject ) ); ! $bbcode_uid = make_bbcode_uid(); $privmsg_message = trim( strip_tags( $message ) ); // APM compliance --- 89,94 ---- $smilies_on = 1; $privmsg_subject = trim( strip_tags( $subject ) ); ! $bbcode_uid = $mx_bbcode->make_bbcode_uid(); $privmsg_message = trim( strip_tags( $message ) ); // APM compliance |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:03:17
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21915/admin Modified Files: admin_mx_block_cp.php pagestart.php Log Message: More...of the same Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** pagestart.php 13 Jul 2008 21:28:11 -0000 1.38 --- pagestart.php 15 Jul 2008 22:02:43 -0000 1.39 *************** *** 23,31 **** include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); ! if( !function_exists('generate_smilies') ) { mx_cache::load_file('functions_post', 'phpbb2'); } // // Start session, user and style (template + theme) management --- 23,36 ---- include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); ! if( !function_exists('prepare_message') ) { mx_cache::load_file('functions_post', 'phpbb2'); } + if( !function_exists('add_search_words') ) + { + mx_cache::load_file('functions_search', 'phpbb2'); + } + // // Start session, user and style (template + theme) management Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** admin_mx_block_cp.php 13 Jul 2008 21:28:10 -0000 1.24 --- admin_mx_block_cp.php 15 Jul 2008 22:02:42 -0000 1.25 *************** *** 26,36 **** require('./pagestart.' . $phpEx); - if( !function_exists('generate_smilies') ) - { - mx_cache::load_file('functions_post', 'phpbb2'); - } - - mx_cache::load_file('functions_search', 'phpbb2'); - // // Instatiate the mx_admin class --- 26,29 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:02:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21915/includes Modified Files: mx_functions_admincp.php mx_functions_bbcode.php mx_functions_core.php mx_functions_tools.php Log Message: More...of the same Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** mx_functions_core.php 13 Jul 2008 21:28:12 -0000 1.98 --- mx_functions_core.php 15 Jul 2008 22:02:45 -0000 1.99 *************** *** 164,170 **** * Examples * ! * mx_cache::load_file('functions_post'), will include the phpbb version of the file ! * mx_cache::load_file('functions_post', true), will include the shared phpbb version of the file ! * mx_cache::load_file('functions_post', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode * * @param unknown_type $file --- 164,170 ---- * Examples * ! * mx_cache::load_file('functions_x'), will include the phpbb version of the file ! * mx_cache::load_file('functions_x', true), will include the shared phpbb version of the file ! * mx_cache::load_file('functions_x', 'phpbb2'), will include the shared phpbb2 version of the file, even though we are running in internal/phpbb3 mode * * @param unknown_type $file *************** *** 2156,2160 **** function submit_parameters( $block_id = false ) { ! global $mx_request_vars, $db, $mx_cache, $lang, $userdata; $return = false; --- 2156,2160 ---- function submit_parameters( $block_id = false ) { ! global $mx_request_vars, $db, $mx_cache, $lang, $userdata, $mx_bbcode; $return = false; *************** *** 2180,2184 **** break; case 'BBText': ! $bbcode_uid = $parameter_opt = make_bbcode_uid(); $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); break; --- 2180,2184 ---- break; case 'BBText': ! $bbcode_uid = $parameter_opt = $mx_bbcode->make_bbcode_uid(); $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); break; Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** mx_functions_admincp.php 10 Jul 2008 23:02:05 -0000 1.55 --- mx_functions_admincp.php 15 Jul 2008 22:02:44 -0000 1.56 *************** *** 3128,3132 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_cache::load_file('functions_search', 'phpbb2'); $search_match_table = MX_MATCH_TABLE; --- 3128,3135 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! if( !function_exists('add_search_words') ) ! { ! mx_cache::load_file('functions_search', 'phpbb2'); ! } $search_match_table = MX_MATCH_TABLE; Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** mx_functions_tools.php 13 Jul 2008 21:28:13 -0000 1.39 --- mx_functions_tools.php 15 Jul 2008 22:02:45 -0000 1.40 *************** *** 1623,1631 **** // Includes // ! if( !function_exists('generate_smilies') ) { mx_cache::load_file('functions_post', 'phpbb2'); } /** * Class: mx_notification. --- 1623,1636 ---- // Includes // ! if( !function_exists('prepare_message') ) { mx_cache::load_file('functions_post', 'phpbb2'); } + if( !function_exists('add_search_words') ) + { + mx_cache::load_file('functions_search', 'phpbb2'); + } + /** * Class: mx_notification. *************** *** 3123,3131 **** // - // Includes - // - mx_cache::load_file('functions_search', 'phpbb2'); - - // // initialise some variables // --- 3128,3131 ---- *************** *** 3400,3405 **** global $userdata, $user_ip; - include($phpbb_root_path . 'includes/functions_search.'.$phpEx); - $forum_update_sql = "forum_posts = forum_posts - 1"; $topic_update_sql = ''; --- 3400,3403 ---- Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_functions_bbcode.php 13 Jul 2008 19:30:28 -0000 1.11 --- mx_functions_bbcode.php 15 Jul 2008 22:02:45 -0000 1.12 *************** *** 808,821 **** global $mx_page, $board_config, $phpbb_root_path, $phpEx; - if( !function_exists('generate_smilies') ) - { - mx_cache::load_file('functions_post', 'phpbb2'); - } - - if( !function_exists('smilies_pass') ) - { - mx_cache::load_file('bbcode', 'phpbb2'); - } - $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; --- 808,811 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-15 22:02:50
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21915 Modified Files: common.php login.php Log Message: More...of the same Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** login.php 3 Jul 2008 17:51:45 -0000 1.30 --- login.php 15 Jul 2008 22:02:44 -0000 1.31 *************** *** 37,40 **** --- 37,46 ---- $mx_page->init( $page_id ); + // + // Initiate user style (template + theme) management + // - populate $theme, $images and initiate $template. + // + $mx_user->init_style(); + // session id check if (!$mx_request_vars->is_empty_request('sid')) Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** common.php 13 Jul 2008 20:13:56 -0000 1.98 --- common.php 15 Jul 2008 22:02:43 -0000 1.99 *************** *** 173,176 **** --- 173,177 ---- // $board_config = array(); + $portal_config = array(); $userdata = array(); $theme = array(); *************** *** 265,276 **** // - // Is phpBB File Attachment MOD present? - // - if( file_exists($phpbb_root_path . 'attach_mod') ) - { - include_once($phpbb_root_path . 'attach_mod/attachment_mod.' . $phpEx); - } - - // // Remove install and contrib folders // --- 266,269 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-13 21:29:33
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32303 Modified Files: functions_search.php Log Message: load_file update, to ensure we are using shared files. Index: functions_search.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions_search.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_search.php 9 Sep 2007 16:51:51 -0000 1.1 --- functions_search.php 13 Jul 2008 21:29:30 -0000 1.2 *************** *** 19,23 **** * ***************************************************************************/ - function clean_words($mode, &$entry, &$stopword_list, &$synonym_list) { --- 19,22 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-13 21:29:16
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32198 Modified Files: core.php Log Message: load_file update, to ensure we are using shared files. Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** core.php 13 Jul 2008 20:24:50 -0000 1.9 --- core.php 13 Jul 2008 21:29:12 -0000 1.10 *************** *** 375,380 **** if ($force_shared) { ! $backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND; ! switch ($backend) { case 'internal': --- 375,381 ---- if ($force_shared) { ! $shared = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND; ! ! switch ($shared) { case 'internal': *************** *** 391,394 **** --- 392,396 ---- $path = $phpbb_root_path . 'includes/'; } + return $path; } |
|
From: Jon O. <jon...@us...> - 2008-07-13 21:28:45
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31117/admin Modified Files: admin_mx_block_cp.php pagestart.php Log Message: load_file update, to ensure we are using shared files. Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** pagestart.php 10 Jul 2008 23:17:13 -0000 1.37 --- pagestart.php 13 Jul 2008 21:28:11 -0000 1.38 *************** *** 25,29 **** if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post'); } --- 25,29 ---- if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** admin_mx_block_cp.php 10 Jul 2008 23:17:13 -0000 1.23 --- admin_mx_block_cp.php 13 Jul 2008 21:28:10 -0000 1.24 *************** *** 28,34 **** if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post'); } ! mx_cache::load_file('functions_search'); // --- 28,35 ---- if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } ! ! mx_cache::load_file('functions_search', 'phpbb2'); // |
|
From: Jon O. <jon...@us...> - 2008-07-13 21:28:18
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31117/includes Modified Files: mx_functions_core.php mx_functions_tools.php Log Message: load_file update, to ensure we are using shared files. Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** mx_functions_core.php 13 Jul 2008 19:30:28 -0000 1.97 --- mx_functions_core.php 13 Jul 2008 21:28:12 -0000 1.98 *************** *** 174,180 **** function load_file($file = '', $force_shared = false) { ! global $mx_root_path, $phpbb_root_path, $phpEx, $mx_backend; ! $path = $mx_backend->load_file($force_shared); if (file_exists($path . $file.'.'.$phpEx)) --- 174,190 ---- function load_file($file = '', $force_shared = false) { ! global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! // ! // Remember loaded files ! // ! if (in_array(($file . (is_string($force_shared) ? $force_shared : '')), $mx_page->loaded_files)) ! { ! return; ! } ! ! $mx_page->loaded_files[] = $file . (is_string($force_shared) ? $force_shared : ''); ! ! $path = mx_backend::load_file($force_shared); if (file_exists($path . $file.'.'.$phpEx)) *************** *** 2891,2894 **** --- 2901,2906 ---- var $last_updated_by = ''; + var $loaded_files = array(); + // ------------------------------ Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_functions_tools.php 13 Jul 2008 19:30:28 -0000 1.38 --- mx_functions_tools.php 13 Jul 2008 21:28:13 -0000 1.39 *************** *** 1625,1629 **** if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post'); } --- 1625,1629 ---- if( !function_exists('generate_smilies') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } |
|
From: Jon O. <jon...@us...> - 2008-07-13 20:24:53
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2092/sessions/phpbb2 Modified Files: core.php Log Message: update Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** core.php 13 Jul 2008 20:13:57 -0000 1.8 --- core.php 13 Jul 2008 20:24:50 -0000 1.9 *************** *** 400,404 **** * @access private */ ! function dss_rand($force_shared) { global $db, $portal_config, $board_config, $dss_seeded; --- 400,404 ---- * @access private */ ! function dss_rand() { global $db, $portal_config, $board_config, $dss_seeded; |
|
From: Jon O. <jon...@us...> - 2008-07-13 20:24:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2092 Modified Files: mx_functions.php Log Message: update Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** mx_functions.php 12 Jul 2008 20:24:11 -0000 1.85 --- mx_functions.php 13 Jul 2008 20:24:49 -0000 1.86 *************** *** 35,39 **** function mx_message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '') { ! global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path, $module_root_path; global $userdata, $user_ip, $session_length, $mx_backend; global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; --- 35,39 ---- function mx_message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '') { ! global $db, $layouttemplate, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path, $module_root_path; global $userdata, $user_ip, $session_length, $mx_backend; global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; *************** *** 47,50 **** --- 47,51 ---- $msg_history = array(); } + $msg_history[] = array( 'msg_code' => $msg_code, |
|
From: Jon O. <jon...@us...> - 2008-07-13 20:14:02
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28955/includes/sessions/internal Modified Files: core.php Log Message: updated Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** core.php 13 Jul 2008 19:31:07 -0000 1.7 --- core.php 13 Jul 2008 20:13:56 -0000 1.8 *************** *** 631,638 **** } } - - // - // Instantiate the mx_cache class - // - $mx_bbcode = new mx_bbcode(); ?> \ No newline at end of file --- 631,633 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-13 20:14:02
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28955/includes/sessions/phpbb3 Modified Files: core.php Log Message: updated Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** core.php 13 Jul 2008 19:31:07 -0000 1.7 --- core.php 13 Jul 2008 20:13:57 -0000 1.8 *************** *** 1020,1028 **** } - // - // Instantiate the mx_cache class - // - $mx_bbcode = new mx_bbcode(); - /** * Olympus Parse cfg file --- 1020,1023 ---- |
|
From: Jon O. <jon...@us...> - 2008-07-13 20:14:01
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28955/includes/sessions/phpbb2 Modified Files: core.php Log Message: updated Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** core.php 13 Jul 2008 19:31:07 -0000 1.7 --- core.php 13 Jul 2008 20:13:57 -0000 1.8 *************** *** 899,907 **** } - // - // Instantiate the mx_cache class - // - $mx_bbcode = new mx_bbcode(); - /** * Get 'Poll Select' html select list. --- 899,902 ---- |
2 messages has been excluded from this view by a project administrator.
