Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php, 1.48, 1.49 mx_functions_core.php, 1.71, 1.72
|
From: Jon O. <jon...@us...> - 2008-02-10 21:32:35
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13117 Modified Files: mx_functions_admincp.php mx_functions_core.php Log Message: A few bugfixes are recommited :( Updated bbcode tpl syntax (from phpbb 2.0.22) Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** mx_functions_core.php 10 Feb 2008 21:00:06 -0000 1.71 --- mx_functions_core.php 10 Feb 2008 21:32:31 -0000 1.72 *************** *** 2939,2943 **** { // ! // Keep phpBB2/phpBB3 cookies, but overwrite internal // case 'cookie_domain': --- 2939,2943 ---- { // ! // Keep phpBB cookies/sessions // case 'cookie_domain': *************** *** 2946,2949 **** --- 2946,2954 ---- case 'cookie_secure': case 'session_length': + case 'allow_autologin': + case 'max_autologin_time': + case 'max_login_attempts': + case 'login_reset_time': + if (PORTAL_BACKEND != 'internal') { *************** *** 2952,2961 **** break; ! case 'portal_id': ! case 'portal_status': ! case 'disabled_message': case 'default_style': case 'override_user_style': case 'default_lang': case 'script_path': case 'mx_use_cache': --- 2957,3024 ---- break; ! // ! // Keep phpBB stats ! // ! case 'record_online_users': ! case 'record_online_date': ! ! if (PORTAL_BACKEND != 'internal') ! { ! $do = false; ! } ! break; ! ! // ! // Keep portal settings ! // case 'default_style': case 'override_user_style': case 'default_lang': + + $do = false; + break; + + // + // Keep portal settings + // + case 'allow_html': + case 'allow_html_tags': + case 'allow_bbcode': + case 'allow_smilies': + case 'smilies_path': + + $do = false; + break; + + // + // Keep portal settings + // + case 'board_email': + case 'board_email_sig': + case 'smtp_delivery': + case 'smtp_host': + case 'smtp_username': + case 'smtp_password': + case 'smtp_auth_method': + + $do = false; + break; + + // + // Keep portal settings + // + case 'default_dateformat': + case 'board_timezone': + case 'gzip_compress': + + $do = false; + break; + + // + // Keep portal settings + // + case 'portal_id': + case 'portal_status': + case 'disabled_message': case 'script_path': case 'mx_use_cache': *************** *** 2967,2971 **** case 'navigation_block': case 'top_phpbb_links': - //case 'smilies_path': case 'portal_version': case 'portal_recached': --- 3030,3033 ---- *************** *** 2973,2994 **** case 'portal_startdate': case 'rand_seed': $do = false; break; ! case 'record_online_users': ! case 'record_online_date': ! if (PORTAL_BACKEND != 'internal') ! { ! $do = false; ! } ! break; case 'portal_name': $key = 'sitename'; break; case 'portal_desc': - $key = 'site_desc'; - break; - case 'portal_desc': $key = 'site_desc'; break; --- 3035,3051 ---- case 'portal_startdate': case 'rand_seed': + $do = false; break; ! ! // Rename config keys and get internal sitename/sitedesc ! // case 'portal_name': + $key = 'sitename'; break; case 'portal_desc': $key = 'site_desc'; break; Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** mx_functions_admincp.php 9 Feb 2008 12:37:24 -0000 1.48 --- mx_functions_admincp.php 10 Feb 2008 21:32:31 -0000 1.49 *************** *** 3031,3035 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_page::load('functions_seach', 'phpbb2'); $search_match_table = MX_MATCH_TABLE; --- 3031,3035 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; |
