Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23138/includes Modified Files: mx_functions_admincp.php mx_functions_bbcode.php mx_functions_core.php mx_functions_style.php mx_functions_tools.php Log Message: 2.9.x -> 3.0.0 b1 updated load_file() method new panel admincp (in development), index_jon.php some code cleanup Many updates for phpbb3 backend. Details are given in our current To-DO discussion Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** mx_functions_core.php 27 Apr 2008 18:42:56 -0000 1.88 --- mx_functions_core.php 15 Jun 2008 21:00:01 -0000 1.89 *************** *** 3516,3519 **** --- 3516,3528 ---- * Load additional functions/classes. * + * The $force_shared parameter will ensure we include the mxp shared version of the file. + * If you need to include a shared version from a different backend, pass this info. + * + * Examples + * + * mx_page::load_file('functions_post'), will include the phpbb version of the file + * mx_page::load_file('functions_post', true), will include the shared phpbb version of the file + * mx_page::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 * @param unknown_type $backend *************** *** 3526,3530 **** if (PORTAL_BACKEND == 'internal' || $force_shared) { ! switch (PORTAL_BACKEND) { case 'internal': --- 3535,3540 ---- if (PORTAL_BACKEND == 'internal' || $force_shared) { ! $backend = in_array($force_shared, array('internal', 'phpbb2', 'phpbb3')) ? $force_shared : PORTAL_BACKEND; ! switch ($backend) { case 'internal': *************** *** 3544,3548 **** if (file_exists($path . $file.'.'.$phpEx)) { ! include_once($path . $file.'.'.$phpEx); } } --- 3554,3558 ---- if (file_exists($path . $file.'.'.$phpEx)) { ! @include_once($path . $file.'.'.$phpEx); } } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** mx_functions_style.php 15 Jun 2008 09:15:43 -0000 1.71 --- mx_functions_style.php 15 Jun 2008 21:00:03 -0000 1.72 *************** *** 963,967 **** @include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg'); ! /* Removed since in 2.9.x+ our default template is no style if ( !$mx_template_config ) { --- 963,967 ---- @include($mx_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg'); ! /* Removed since in 3.0.x+ our default template is no style if ( !$mx_template_config ) { Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** mx_functions_admincp.php 9 Mar 2008 23:38:00 -0000 1.53 --- mx_functions_admincp.php 15 Jun 2008 21:00:00 -0000 1.54 *************** *** 3128,3132 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; --- 3128,3133 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $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.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mx_functions_tools.php 22 May 2008 21:08:30 -0000 1.28 --- mx_functions_tools.php 15 Jun 2008 21:00:03 -0000 1.29 *************** *** 3153,3157 **** // Includes // ! include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // --- 3153,3158 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_bbcode.php 11 Jun 2008 21:41:00 -0000 1.2 --- mx_functions_bbcode.php 15 Jun 2008 21:00:01 -0000 1.3 *************** *** 128,132 **** if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post'); } --- 128,132 ---- if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } |