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: MW <jo...@us...> - 2008-02-10 22:37:34
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10013/admin Modified Files: index.php Log Message: no need to check isset twice, wrapper deal with that Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** index.php 9 Feb 2008 12:44:32 -0000 1.41 --- index.php 10 Feb 2008 22:37:30 -0000 1.42 *************** *** 87,91 **** // Generate relevant output // ! if ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { include('./page_header_admin.'.$phpEx); --- 87,91 ---- // Generate relevant output // ! if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { include('./page_header_admin.'.$phpEx); *************** *** 356,360 **** include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { --- 356,360 ---- include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { |
|
From: Jon O. <jon...@us...> - 2008-02-10 22:09:40
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29729 Modified Files: admin_mx_styles.php Log Message: bug, from using the wrapper. not really sure why... Index: admin_mx_styles.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_styles.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_styles.php 9 Feb 2008 12:44:32 -0000 1.3 --- admin_mx_styles.php 10 Feb 2008 22:09:34 -0000 1.4 *************** *** 69,73 **** $style_name = $mx_request_vars->is_get('style') ? urldecode($mx_request_vars->get('style', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('style', MX_TYPE_NO_TAGS); ! if( isset($install_to) ) { include($mx_root_path. "templates/" . basename($install_to) . "/". basename($install_to). ".cfg"); --- 69,73 ---- $style_name = $mx_request_vars->is_get('style') ? urldecode($mx_request_vars->get('style', MX_TYPE_NO_TAGS)) : $mx_request_vars->post('style', MX_TYPE_NO_TAGS); ! if( !empty($install_to) ) { include($mx_root_path. "templates/" . basename($install_to) . "/". basename($install_to). ".cfg"); |
|
From: MW <jo...@us...> - 2008-02-10 22:05:23
|
Update of /cvsroot/mxbb/core/templates/_core/images In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27356/templates/_core/images Modified Files: index.php Log Message: no need to check isset twice, wrapper deal with that Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/images/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 9 Feb 2008 12:51:55 -0000 1.3 --- index.php 10 Feb 2008 22:05:19 -0000 1.4 *************** *** 72,76 **** // Generate relevant output // ! if ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { include('./page_header_admin.'.$phpEx); --- 72,76 ---- // Generate relevant output // ! if ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'left' ) { include('./page_header_admin.'.$phpEx); *************** *** 305,309 **** include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->is_get('pane') && $mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { --- 305,309 ---- include('./page_footer_admin.'.$phpEx); } ! elseif ($mx_request_vars->get('pane', MX_TYPE_NO_TAGS) == 'right' ) { |
|
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; |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:32:34
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13117/shared/phpbb2/language/lang_english Modified Files: lang_admin.php Log Message: A few bugfixes are recommited :( Updated bbcode tpl syntax (from phpbb 2.0.22) Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_english/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 9 Sep 2007 16:52:07 -0000 1.1 --- lang_admin.php 10 Feb 2008 21:32:31 -0000 1.2 *************** *** 323,328 **** $lang['Savebox_limits'] = 'Max posts in Savebox'; ! $lang['Cookie_settings'] = 'Cookie settings'; ! $lang['Cookie_settings_explain'] = 'These details define how cookies are sent to your users\' browsers. In most cases the default values for the cookie settings should be sufficient, but if you need to change them do so with care -- incorrect settings can prevent users from logging in'; $lang['Cookie_domain'] = 'Cookie domain'; $lang['Cookie_name'] = 'Cookie name'; --- 323,329 ---- $lang['Savebox_limits'] = 'Max posts in Savebox'; ! $lang['Cookie_settings'] = 'Cookie/session settings'; ! $lang['Cookie_settings_explain'] = 'These details define how cookies/sessions are sent to your users\' browsers. In most cases the default values for the cookie settings should be sufficient, but if you need to change them do so with care -- incorrect settings can prevent users from logging in.'; ! $lang['Cookie_settings_explain_mxp'] = 'Note: If you are using a phpBB backend, these internal mode settings are disabled.'; $lang['Cookie_domain'] = 'Cookie domain'; $lang['Cookie_name'] = 'Cookie name'; |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:27:37
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11462 Modified Files: mx_textblock_edit.tpl Log Message: A few bugfixes are recommited :( Updated bbcode tpl syntax (from phpbb 2.0.22) Index: mx_textblock_edit.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core/mx_textblock_edit.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_textblock_edit.tpl 9 Sep 2007 16:54:09 -0000 1.1 --- mx_textblock_edit.tpl 10 Feb 2008 21:27:33 -0000 1.2 *************** *** 338,342 **** <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> {L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> --- 338,343 ---- <option style="color:white; background-color: {T_TD_COLOR1}" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: {T_TD_COLOR1}" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> {L_FONT_SIZE}:<select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.selectedIndex=0;" onMouseOver="helpline('f')"> ! <option value="0" class="genmed">{L_FONT_SIZE}</option> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:27:21
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11257 Modified Files: mx_module_defs.php Log Message: A few bugfixes are recommited :( Updated bbcode tpl syntax (from phpbb 2.0.22) Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mx_module_defs.php 9 Feb 2008 19:46:55 -0000 1.33 --- mx_module_defs.php 10 Feb 2008 21:27:17 -0000 1.34 *************** *** 1438,1441 **** --- 1438,1443 ---- } + break; + case MX_MENU_PAGE_TYPE: |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:24:37
|
Update of /cvsroot/mxbb/core/templates/prosilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10161 Modified Files: admin_mx_portal.html Log Message: In the adminCP, we more clear what configs are internal and not phpbb... Index: admin_mx_portal.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/admin_mx_portal.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_portal.html 8 Jan 2008 18:01:21 -0000 1.3 --- admin_mx_portal.html 10 Feb 2008 21:24:33 -0000 1.4 *************** *** 79,83 **** <fieldset> <legend>{L_COOKIE_SETTINGS}</legend> ! <div class="explain">{L_COOKIE_SETTINGS_EXPLAIN}</div> <dl> <dt><label for="cookie_domain">{L_COOKIE_DOMAIN}</label></dt> --- 79,83 ---- <fieldset> <legend>{L_COOKIE_SETTINGS}</legend> ! <div class="explain">{L_COOKIE_SETTINGS_EXPLAIN}<br /><b>{L_COOKIE_SETTINGS_EXPLAIN_MXP}</b></div> <dl> <dt><label for="cookie_domain">{L_COOKIE_DOMAIN}</label></dt> |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:24:07
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9768 Modified Files: admin_mx_portal.tpl Log Message: In the adminCP, we more clear what configs are internal and not phpbb... Index: admin_mx_portal.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/admin_mx_portal.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_portal.tpl 9 Sep 2007 16:54:26 -0000 1.1 --- admin_mx_portal.tpl 10 Feb 2008 21:24:03 -0000 1.2 *************** *** 70,74 **** </tr> <tr> ! <td class="row2" colspan="2"><span class="gensmall">{L_COOKIE_SETTINGS_EXPLAIN}</span></td> </tr> <tr> --- 70,74 ---- </tr> <tr> ! <td class="row2" colspan="2"><span class="gensmall">{L_COOKIE_SETTINGS_EXPLAIN}</span><br /><span class="gensmall"><b>{L_COOKIE_SETTINGS_EXPLAIN_MXP}</b></span></td> </tr> <tr> |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:23:26
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9745 Modified Files: admin_mx_portal.php Log Message: In the adminCP, we more clear what configs are internal and not phpbb... Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** admin_mx_portal.php 9 Feb 2008 12:44:32 -0000 1.39 --- admin_mx_portal.php 10 Feb 2008 21:23:20 -0000 1.40 *************** *** 235,238 **** --- 235,239 ---- "L_COOKIE_SETTINGS" => $lang['Cookie_settings'], "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], + "L_COOKIE_SETTINGS_EXPLAIN_MXP" => $lang['Cookie_settings_explain_mxp'], "L_COOKIE_DOMAIN" => $lang['Cookie_domain'], |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:21:30
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8898 Modified Files: Tag: core28x lang_admin.php Log Message: not sure ;) Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.77.2.2 retrieving revision 1.77.2.3 diff -C2 -d -r1.77.2.2 -r1.77.2.3 *** lang_admin.php 4 Feb 2008 18:10:38 -0000 1.77.2.2 --- lang_admin.php 10 Feb 2008 21:21:24 -0000 1.77.2.3 *************** *** 379,440 **** // - // Install Process - // - $lang['Welcome_install'] = 'Welcome to the mxBB Portal Installation Wizard'; - $lang['Install_Instruction'] = 'Please fill out the details requested below. This installation program will create your personalized config.php (in the Portal root directory) and the Portal database with default settings. Once this is done, you\'ll see a report of all the steps taken (please note mxBB Portal does not modify your phpBB database in any way). You should then login to your board with your administrator username and password and go to the Administration Control Panel to configure your portal with your own preferences. Please note mxBB Portal will not work by itself, phpBB must already be installed and configured. Thank you for choosing mxBB Portal.'; - $lang['Upgrade_Instruction'] = 'mxBB Portal is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note mxBB Portal does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; - $lang['Install_moreinfo'] = '%sRelease Notes%s | %sWelcome Pack%s | %sOnline FAQ%s | %sSupport Forums%s | %sTerms Of Use%s'; - $lang['Install_settings'] = 'Installation Settings'; - $lang['Choose_lang_explain'] = 'Please use the form below to select the language you wish to use throughout the installation process.'; - $lang['Choose_lang'] = 'Choose Language'; - $lang['Language'] = 'Language'; - $lang['Phpbb_path'] = 'phpBB relative path'; - $lang['Phpbb_path_explain'] = 'Relative path to phpBB, ex. phpBB/ or ../phpBB/<br />Note the slashes "/", they are important!'; - $lang['Phpbb_url'] = 'Full phpBB URL'; - $lang['Phpbb_url_explain'] = 'Full phpBB URL, ex. <br />http://www.example.com/phpBB/'; - $lang['Portal_url'] = 'Full Portal URL'; - $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/'; - $lang['Database_settings'] = 'Database Settings'; - $lang['dbms'] = 'Database Type'; - $lang['DB_Host'] = 'Database Server Hostname/DSN'; - $lang['DB_Name'] = 'Your Database Name'; - $lang['DB_Username'] = 'Database Username'; - $lang['DB_Password'] = 'Database Password'; - $lang['Table_Prefix'] = 'phpBB Prefix in DB'; - $lang['MX_Table_Prefix'] = 'mxBB Portal Prefix in DB'; - $lang['Start_Install'] = 'Start mxBB Installation'; - $lang['Start_Upgrade'] = 'Yes, I have already done a backup and wish to upgrade my mxBB Portal now.'; - $lang['Portal_intalled'] = 'mxBB Portal has been installed !'; - $lang['Portal_upgraded'] = 'mxBB Portal has been upgraded !'; - $lang['Unwriteable_config'] = 'Your mxBB config file (config.php) is currently un-writeable.<br /><br />A copy of the config file will be downloaded to you when you click the button below. You should upload this file to your mxBB root directory: %s <br /><br />Once this is done, please %sREFRESH%s this window to proceed with the next installation step.<br /><br />Thank you for choosing mxBB Portal.<br />'; - $lang['Send_file'] = 'Just send the file to me and I\'ll FTP it manually'; - $lang['phpBB_nfnd_retry'] = 'Sorry, but we could not find your phpBB installation. Please press the %sBACK%s button of your browser and retry.'; - $lang['Installation_error'] = 'An error has occurred during the installation'; - $lang['Debug_Information'] = 'DEBUG INFORMATION'; - $lang['Install_phpbb_not_found'] = 'Sorry, we could not find any phpBB board installed on this server.<br />Please install phpBB BEFORE installing mxBB Portal.<br />\n<br />\n'; - $lang['Install_phpbb_db_failed'] = 'Sorry, we could not connect to the phpBB database.<br />Please check that your phpBB is correctly installed and up and running BEFORE installing mxBB Portal.<br />\n<br />\n'; - $lang['Install_phpbb_unsupported'] = 'Unfortunately, the phpBB board installed on this server is not supported by mxBB Portal.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; - $lang['Install_noscript_warning'] = 'Sorry, this installation requires a JavaScript enabled browser. It might not work on your browser.'; - $lang['Upgrade_are_you_sure'] = 'This upgrade procedure will make modifications to your database. Are you sure you wish to proceed?'; - $lang['Writing_config'] = 'Writing config.php file'; - $lang['Processing_schema'] = 'Processing SQL Schema \'%s\''; - $lang['Portal_intalling'] = 'Installing mxBB Portal version %s'; - $lang['Portal_upgrading'] = 'Upgrading mxBB Portal version %s'; - $lang['Install_warning'] = 'There was 1 warning updating the database'; - $lang['Install_warnings'] = 'There were %d warnings updating the database'; - $lang['Subscribe_mxBB_News_now'] = 'We recommend that you subscribe to the %smxBB-News Mailing List%s to receive information about important news and release announcements.<br /> <br />%sSubscribe to mxBB-News, now!%s'; - $lang['Portal_install_done'][0] = 'At this point your basic installation is complete.'; - $lang['Portal_install_done'][1] = 'Please delete the /install/ and /contrib/ folders BEFORE proceeding!!!'; - $lang['Portal_install_done'][2] = 'Remember to make backups as often as possible ;-)'; - $lang['Portal_install_done'][3] = 'Press the button below and use your Administrator username and password to login to the system.'; - $lang['Portal_install_done'][4] = 'Enter the Admin Control Panel - Management, and upgrade ALL modules - one by one!'; - $lang['Portal_install_done'][5] = 'Please be sure to check the Portal Configurations and make any required changes.'; - $lang['Go_to_admincp'] = 'Now visit the Admin Control Panel and upgrade your modules'; - $lang['Thanks_for_choosing'] = 'Thank you for choosing mxBB Portal!'; - $lang['Critical_Error'] = 'CRITICAL ERROR'; - $lang['Error_loading_config'] = 'Sorry, could not load mxBB Portal config.php'; - $lang['Error_database_down'] = 'Sorry, could not connect to the database.'; - - // // Cache // --- 379,382 ---- |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:19:59
|
Update of /cvsroot/mxbb/core/install/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8022 Removed Files: Tag: core28x db2.php index.htm msaccess.php mssql-odbc.php mssql.php mysql.php mysql4.php mysqli.php postgres7.php Log Message: removed --- mysqli.php DELETED --- --- mysql4.php DELETED --- --- msaccess.php DELETED --- --- mssql-odbc.php DELETED --- --- mssql.php DELETED --- --- mysql.php DELETED --- --- db2.php DELETED --- --- index.htm DELETED --- --- postgres7.php DELETED --- |
Update of /cvsroot/mxbb/core/install/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7979 Removed Files: db2.php index.htm msaccess.php mssql-odbc.php mssql.php mysql.php mysql4.php mysqli.php postgres7.php Log Message: removed --- mysqli.php DELETED --- --- mysql4.php DELETED --- --- msaccess.php DELETED --- --- mssql-odbc.php DELETED --- --- mssql.php DELETED --- --- mysql.php DELETED --- --- db2.php DELETED --- --- index.htm DELETED --- --- postgres7.php DELETED --- |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:17:58
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6733 Modified Files: Tag: core28x mx_constants.php mx_functions.php mx_functions_admincp.php mx_functions_blockcp.php mx_functions_ch.php mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php mx_functions_tools.php Log Message: Removing trailing newlines... Index: mx_functions_ch.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v retrieving revision 1.8.2.2 retrieving revision 1.8.2.3 diff -C2 -d -r1.8.2.2 -r1.8.2.3 *** mx_functions_ch.php 3 Feb 2008 19:22:15 -0000 1.8.2.2 --- mx_functions_ch.php 10 Feb 2008 21:17:54 -0000 1.8.2.3 *************** *** 96,98 **** include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx); ! ?> --- 96,98 ---- include($phpbb_root_path . 'language/lang_' . $language . '/lang_extend_cat_hierarchy.' . $phpEx); ! ?> \ No newline at end of file Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -C2 -d -r1.18.2.1 -r1.18.2.2 *** mx_functions_blockcp.php 3 Feb 2008 19:22:15 -0000 1.18.2.1 --- mx_functions_blockcp.php 10 Feb 2008 21:17:54 -0000 1.18.2.2 *************** *** 579,581 **** } // class mx_blockcp ! ?> --- 579,581 ---- } // class mx_blockcp ! ?> \ No newline at end of file Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52.2.4 retrieving revision 1.52.2.5 diff -C2 -d -r1.52.2.4 -r1.52.2.5 *** mx_functions_core.php 3 Feb 2008 19:22:16 -0000 1.52.2.4 --- mx_functions_core.php 10 Feb 2008 21:17:54 -0000 1.52.2.5 *************** *** 3489,3491 **** } // class mx_request_vars ! ?> --- 3489,3491 ---- } // class mx_request_vars ! ?> \ No newline at end of file Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -d -r1.24.2.1 -r1.24.2.2 *** mx_constants.php 3 Feb 2008 19:22:14 -0000 1.24.2.1 --- mx_constants.php 10 Feb 2008 21:17:54 -0000 1.24.2.2 *************** *** 70,72 **** $unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#'); $unhtml_specialchars_replace = array('>', '<', '"', '&'); ! ?> --- 70,72 ---- $unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#'); $unhtml_specialchars_replace = array('>', '<', '"', '&'); ! ?> \ No newline at end of file Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.32.2.11 retrieving revision 1.32.2.12 diff -C2 -d -r1.32.2.11 -r1.32.2.12 *** mx_functions_phpbb.php 5 Feb 2008 02:17:08 -0000 1.32.2.11 --- mx_functions_phpbb.php 10 Feb 2008 21:17:54 -0000 1.32.2.12 *************** *** 226,235 **** $mx_user = new mx_user(); } ! if( !is_object($mx_page)) { $mx_page = new mx_page(); } ! if( !is_object($mx_request_vars)) { --- 226,235 ---- $mx_user = new mx_user(); } ! if( !is_object($mx_page)) { $mx_page = new mx_page(); } ! if( !is_object($mx_request_vars)) { *************** *** 246,250 **** $mx_user->init($user_ip, - ( 1000 + $page_id )); } ! if ( empty($theme) ) { --- 246,250 ---- $mx_user->init($user_ip, - ( 1000 + $page_id )); } ! if ( empty($theme) ) { *************** *** 1142,1144 **** return $grouplist; } ! ?> --- 1142,1144 ---- return $grouplist; } ! ?> \ No newline at end of file Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.15.2.3 retrieving revision 1.15.2.4 diff -C2 -d -r1.15.2.3 -r1.15.2.4 *** mx_functions_tools.php 3 Feb 2008 19:22:17 -0000 1.15.2.3 --- mx_functions_tools.php 10 Feb 2008 21:17:54 -0000 1.15.2.4 *************** *** 3046,3048 **** } } ! ?> --- 3046,3048 ---- } } ! ?> \ No newline at end of file Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.39.2.2 retrieving revision 1.39.2.3 diff -C2 -d -r1.39.2.2 -r1.39.2.3 *** mx_functions_admincp.php 4 Feb 2008 18:10:16 -0000 1.39.2.2 --- mx_functions_admincp.php 10 Feb 2008 21:17:54 -0000 1.39.2.3 *************** *** 3827,3829 **** return $select; } ! ?> --- 3827,3829 ---- return $select; } ! ?> \ No newline at end of file Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.17.2.9 retrieving revision 1.17.2.10 diff -C2 -d -r1.17.2.9 -r1.17.2.10 *** mx_functions_style.php 5 Feb 2008 02:17:08 -0000 1.17.2.9 --- mx_functions_style.php 10 Feb 2008 21:17:54 -0000 1.17.2.10 *************** *** 922,924 **** } // class mx_user ! ?> --- 922,924 ---- } // class mx_user ! ?> \ No newline at end of file Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.72.2.2 retrieving revision 1.72.2.3 diff -C2 -d -r1.72.2.2 -r1.72.2.3 *** mx_functions.php 3 Feb 2008 19:22:14 -0000 1.72.2.2 --- mx_functions.php 10 Feb 2008 21:17:54 -0000 1.72.2.3 *************** *** 1192,1194 **** } } ! ?> --- 1192,1194 ---- } } ! ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:14:00
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5447 Modified Files: Tag: core28x mx_module_defs.php Log Message: the same bug here too Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.27.2.1 retrieving revision 1.27.2.2 diff -C2 -d -r1.27.2.1 -r1.27.2.2 *** mx_module_defs.php 3 Feb 2008 19:26:04 -0000 1.27.2.1 --- mx_module_defs.php 10 Feb 2008 21:13:55 -0000 1.27.2.2 *************** *** 1425,1428 **** --- 1425,1429 ---- } + break; case MX_MENU_PAGE_TYPE: |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:11:35
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4614/includes Modified Files: Tag: core28x functions_install.php Log Message: Minor updates to installation Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** functions_install.php 3 Feb 2008 19:23:28 -0000 1.2.2.2 --- functions_install.php 10 Feb 2008 21:11:28 -0000 1.2.2.3 *************** *** 75,88 **** global $lang; $available_dbms = array( ! 'firebird' => array( ! 'LABEL' => 'FireBird', ! 'SCHEMA' => 'firebird', ! 'MODULE' => 'interbase', ! 'DELIM' => ';;', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'firebird', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), 'mysqli' => array( 'LABEL' => 'MySQL with MySQLi Extension', --- 75,88 ---- global $lang; $available_dbms = array( ! // 'firebird' => array( ! // 'LABEL' => 'FireBird', ! // 'SCHEMA' => 'firebird', ! // 'MODULE' => 'interbase', ! // 'DELIM' => ';;', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'firebird', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), 'mysqli' => array( 'LABEL' => 'MySQL with MySQLi Extension', *************** *** 105,138 **** '2.0.x' => true, ), ! 'mssql' => array( ! 'LABEL' => 'MS SQL Server 2000+', ! 'SCHEMA' => 'mssql', ! 'MODULE' => 'mssql', ! 'DELIM' => 'GO', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'mssql', ! 'AVAILABLE' => true, ! '2.0.x' => true, ! ), ! 'mssql_odbc'=> array( ! 'LABEL' => 'MS SQL Server [ ODBC ]', ! 'SCHEMA' => 'mssql', ! 'MODULE' => 'odbc', ! 'DELIM' => 'GO', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'mssql_odbc', 'AVAILABLE' => true, '2.0.x' => true, ), ! 'oracle' => array( ! 'LABEL' => 'Oracle', ! 'SCHEMA' => 'oracle', ! 'MODULE' => 'oci8', ! 'DELIM' => '/', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'oracle', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), 'postgres' => array( 'LABEL' => 'PostgreSQL 7.x/8.x', --- 105,148 ---- '2.0.x' => true, ), ! 'mysql4' => array( ! 'LABEL' => 'MySQL 4.x', ! 'SCHEMA' => 'mysql', ! 'MODULE' => 'mysql', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'mysql', 'AVAILABLE' => true, '2.0.x' => true, ), ! // 'mssql' => array( ! // 'LABEL' => 'MS SQL Server 2000+', ! // 'SCHEMA' => 'mssql', ! // 'MODULE' => 'mssql', ! // 'DELIM' => 'GO', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'mssql', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), ! // 'mssql_odbc'=> array( ! // 'LABEL' => 'MS SQL Server [ ODBC ]', ! // 'SCHEMA' => 'mssql', ! // 'MODULE' => 'odbc', ! // 'DELIM' => 'GO', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'mssql_odbc', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), ! // 'oracle' => array( ! // 'LABEL' => 'Oracle', ! // 'SCHEMA' => 'oracle', ! // 'MODULE' => 'oci8', ! // 'DELIM' => '/', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'oracle', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), 'postgres' => array( 'LABEL' => 'PostgreSQL 7.x/8.x', *************** *** 145,158 **** '2.0.x' => true, ), ! 'sqlite' => array( ! 'LABEL' => 'SQLite', ! 'SCHEMA' => 'sqlite', ! 'MODULE' => 'sqlite', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'sqlite', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), ); --- 155,168 ---- '2.0.x' => true, ), ! // 'sqlite' => array( ! // 'LABEL' => 'SQLite', ! // 'SCHEMA' => 'sqlite', ! // 'MODULE' => 'sqlite', ! // 'DELIM' => ';', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'sqlite', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), ); *************** *** 224,228 **** { $selected = ($dbms_name == $default) ? ' selected="selected"' : ''; ! $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>'; } return $dbms_options; --- 234,239 ---- { $selected = ($dbms_name == $default) ? ' selected="selected"' : ''; ! //$dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>'; ! $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $dbms_name . '</option>'; } return $dbms_options; *************** *** 877,880 **** --- 888,893 ---- global $mx_root_path, $phpEx; + unset($GLOBALS['SQL_LAYER']); + if( !defined('BEGIN_TRANSACTION') ) { *************** *** 883,905 **** } ! switch ( $phpbb_info['dbms'] ) ! { ! case 'mysql': ! include($mx_root_path . "install/db/mysql.$phpEx"); ! break; ! case 'mysql4': ! include($mx_root_path . "install/db/mysql4.$phpEx"); ! break; ! case 'mysqli': ! include($mx_root_path . "install/db/mysqli.$phpEx"); ! break; ! case 'postgres': ! include($mx_root_path . "install/db/postgres7.$phpEx"); ! break; ! default: ! return false; ! } ! $db = new sql_db($phpbb_info['dbhost'], $phpbb_info['dbuser'], $phpbb_info['dbpasswd'], $phpbb_info['dbname'], false); return $db->db_connect_id; --- 896,906 ---- } ! $dbhost = $phpbb_info['dbhost']; ! $dbuser = $phpbb_info['dbuser']; ! $dbpasswd = $phpbb_info['dbpasswd']; ! $dbname = $phpbb_info['dbname']; ! $dbms = $phpbb_info['dbms']; ! include($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class return $db->db_connect_id; *************** *** 1253,1263 **** 'portal_version' => "'$mx_portal_version'", 'portal_phpbb_url' => "'$phpbb_url'", ! 'portal_url' => "'$portal_url'", ! 'overall_header' => "'overall_header.$tplEx'", ! 'main_layout' => "'mx_main_layout.$tplEx'", ! 'navigation_block' => 0, ! 'top_phpbb_links' => 0, ! 'mx_use_cache' => 1, ! 'mod_rewrite' => 0, ); $sql = "INSERT INTO ".PORTAL_TABLE." (". --- 1254,1258 ---- 'portal_version' => "'$mx_portal_version'", 'portal_phpbb_url' => "'$phpbb_url'", ! 'portal_url' => "'$portal_url'" ); $sql = "INSERT INTO ".PORTAL_TABLE." (". |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:11:35
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4614/templates Modified Files: Tag: core28x mx_install_body.tpl Log Message: Minor updates to installation Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** mx_install_body.tpl 6 Aug 2007 19:46:10 -0000 1.4 --- mx_install_body.tpl 10 Feb 2008 21:11:28 -0000 1.4.2.1 *************** *** 15,18 **** --- 15,19 ---- <!-- BEGIN datarow --> pathinfo[i] = []; + pathinfo[i]['info'] = '{datarow.INFO}'; pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}'; pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}'; |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:11:35
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4614 Modified Files: Tag: core28x mx_install.php Log Message: Minor updates to installation Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.79.2.3 retrieving revision 1.79.2.4 diff -C2 -d -r1.79.2.3 -r1.79.2.4 *** mx_install.php 7 Feb 2008 03:03:25 -0000 1.79.2.3 --- mx_install.php 10 Feb 2008 21:11:28 -0000 1.79.2.4 *************** *** 2,8 **** /** * ! * @package mxBB Installation * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com --- 2,8 ---- /** * ! * @package MX-Publisher Installation * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com *************** *** 19,23 **** // // FYI: This installation script will try to find your phpBB board and then ! // to get from there all the information required to install mxBB-Portal. // However, the methods we use might not work on some configurations. // If you get into trouble when running this installation script, then --- 19,23 ---- // // FYI: This installation script will try to find your phpBB board and then ! // to get from there all the information required to install MX-Publisher. // However, the methods we use might not work on some configurations. // If you get into trouble when running this installation script, then *************** *** 30,38 **** // ! // Set mxBB-Portal version here ! // ! $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8.1'; ! $mx_portal_copy = '<b>mxBB - Modular Portal & CMS for phpBB!</b> <br /><br/> mxBB is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated functions and features. mxBB-Portal is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001. <br /><br />Authors: The mxBB Development Team. <br />Please visit <a href="http://www.mx-system.com/">www.mx-system.com</a> for further information.'; // --- 30,38 ---- // ! // Set MX-Publisher version here ! // ! $mx_portal_name = 'MX-Publisher Modular System'; ! $mx_portal_version = '2.8.2'; ! $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; // *************** *** 40,54 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.2.0'); ! define('INSTALLER_NAME', 'mxBB-IWizard'); // // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-system.com/forum/viewtopic.php?t=1224'); ! define('U_WELCOME_PACK', 'http://www.mx-system.com/index.php?page=136'); ! define('U_ONLINE_FAQ', 'http://www.mx-system.com/index.php?page=117'); ! define('U_ONLINE_SUPPORT', 'http://www.mx-system.com/index.php?page=2'); ! define('U_TERMS_OF_USE', 'http://www.mx-system.com/index.php?page=126&dynamic_block=133'); // --- 40,54 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.2.1'); ! define('INSTALLER_NAME', 'MX-Publisher-IWizard'); // // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-publisher.com/forum/viewtopic.php?t=1224'); ! define('U_WELCOME_PACK', 'http://www.mx-publisher.com/index.php?page=136'); ! define('U_ONLINE_FAQ', 'http://www.mx-publisher.com/index.php?page=117'); ! define('U_ONLINE_SUPPORT', 'http://www.mx-publisher.com/index.php?page=2'); ! define('U_TERMS_OF_USE', 'http://www.mx-publisher.com/index.php?page=126&dynamic_block=133'); // *************** *** 124,128 **** if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { --- 124,128 ---- if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { *************** *** 150,154 **** unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') --- 150,154 ---- unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') *************** *** 180,185 **** if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { ! $HTTP_POST_VARS = $_POST; ! $HTTP_GET_VARS = $_GET; $HTTP_SERVER_VARS = $_SERVER; $HTTP_COOKIE_VARS = $_COOKIE; --- 180,185 ---- if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { ! $_POST = $_POST; ! $_GET = $_GET; $HTTP_SERVER_VARS = $_SERVER; $HTTP_COOKIE_VARS = $_COOKIE; *************** *** 196,200 **** // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { die("Hacking attempt"); --- 196,200 ---- // Protect against GLOBALS tricks ! if (isset($_POST['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($_GET['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { die("Hacking attempt"); *************** *** 207,210 **** --- 207,244 ---- } + if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') + { + // PHP4+ path + $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx'); + + // Not only will array_merge give a warning if a parameter + // is not an array, it will actually fail. So we check if + // HTTP_SESSION_VARS has been initialised. + if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) + { + $HTTP_SESSION_VARS = array(); + } + + // Merge all into one extremely huge array; unset + // this later + // + // Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead + // + $input = array_merge($_GET, $_POST, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); + //$input = $_GET + $_POST + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES; + + unset($input['input']); + unset($input['not_unset']); + + while (list($var,) = @each($input)) + { + if (in_array($var, $not_unset)) + { + die('Hacking attempt!'); + } + unset($$var); + } + unset($input); + } // *************** *** 215,256 **** if( !get_magic_quotes_gpc() ) { ! if( is_array($HTTP_GET_VARS) ) { ! while( list($k, $v) = each($HTTP_GET_VARS) ) { ! if( is_array($HTTP_GET_VARS[$k]) ) { ! while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) { ! $HTTP_GET_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_GET_VARS[$k]); } else { ! $HTTP_GET_VARS[$k] = addslashes($v); } } ! @reset($HTTP_GET_VARS); } ! if( is_array($HTTP_POST_VARS) ) { ! while( list($k, $v) = each($HTTP_POST_VARS) ) { ! if( is_array($HTTP_POST_VARS[$k]) ) { ! while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) { ! $HTTP_POST_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_POST_VARS[$k]); } else { ! $HTTP_POST_VARS[$k] = addslashes($v); } } ! @reset($HTTP_POST_VARS); } --- 249,290 ---- if( !get_magic_quotes_gpc() ) { ! if( is_array($_GET) ) { ! while( list($k, $v) = each($_GET) ) { ! if( is_array($_GET[$k]) ) { ! while( list($k2, $v2) = each($_GET[$k]) ) { ! $_GET[$k][$k2] = addslashes($v2); } ! @reset($_GET[$k]); } else { ! $_GET[$k] = addslashes($v); } } ! @reset($_GET); } ! if( is_array($_POST) ) { ! while( list($k, $v) = each($_POST) ) { ! if( is_array($_POST[$k]) ) { ! while( list($k2, $v2) = each($_POST[$k]) ) { ! $_POST[$k][$k2] = addslashes($v2); } ! @reset($_POST[$k]); } else { ! $_POST[$k] = addslashes($v); } } ! @reset($_POST); } *************** *** 310,320 **** 'COMMENTS' => 'mx_remove_remarks' ), ! // 'postgres' => array( ! // 'LABEL' => 'PostgreSQL 7.x', ! // 'SCHEMA' => 'postgres', ! // 'DELIM' => ';', ! // 'DELIM_BASIC' => ';', ! // 'COMMENTS' => 'mx_remove_comments' ! // ), // 'mssql' => array( // 'LABEL' => 'MS SQL Server 7/2000', --- 344,354 ---- 'COMMENTS' => 'mx_remove_remarks' ), ! 'postgres' => array( ! 'LABEL' => 'PostgreSQL 7.x', ! 'SCHEMA' => 'postgres', ! 'DELIM' => ';', ! 'DELIM_BASIC' => ';', ! 'COMMENTS' => 'mx_remove_comments' ! ), // 'mssql' => array( // 'LABEL' => 'MS SQL Server 7/2000', *************** *** 364,368 **** // Send file -------------------------------------------------- // ! if ( isset($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1 ) { header( "Content-Type: text/x-delimtext; name=\"config.$phpEx\"" ); --- 398,402 ---- // Send file -------------------------------------------------- // ! if ( isset($_POST['send_file']) && $_POST['send_file'] == 1 ) { header( "Content-Type: text/x-delimtext; name=\"config.$phpEx\"" ); *************** *** 373,378 **** // if it is on. ! $HTTP_POST_VARS['config_data'] = stripslashes( $HTTP_POST_VARS['config_data'] ); ! echo $HTTP_POST_VARS['config_data']; exit; } --- 407,412 ---- // if it is on. ! $_POST['config_data'] = stripslashes( $_POST['config_data'] ); ! echo $_POST['config_data']; exit; } *************** *** 381,385 **** // phpInfo -------------------------------------------------- // ! if ( isset($HTTP_GET_VARS['phpinfo']) ) { show_phpinfo(); --- 415,419 ---- // phpInfo -------------------------------------------------- // ! if ( isset($_GET['phpinfo']) ) { show_phpinfo(); *************** *** 390,394 **** // Load the installation language // ! $language = ( isset($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : ( isset($HTTP_GET_VARS['language']) ? $HTTP_GET_VARS['language'] : '' ) ); $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); --- 424,428 ---- // Load the installation language // ! $language = ( isset($_POST['language']) ? $_POST['language'] : ( isset($_GET['language']) ? $_GET['language'] : '' ) ); $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); *************** *** 404,409 **** if( install_language_select($lang_options, $language, 'language') > 1 ) { ! include($mx_root_path . "language/lang_$language/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_$language/lang_admin.$phpEx"); $s_hidden_fields = ''; --- 438,449 ---- if( install_language_select($lang_options, $language, 'language') > 1 ) { ! if( @file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) ! { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); ! } ! else ! { ! include($mx_root_path . "install/language/lang_english/lang_admin.$phpEx"); ! } $s_hidden_fields = ''; *************** *** 425,444 **** } ! if( !@file_exists($mx_root_path . "language/lang_$language/lang_main.$phpEx") || ! !@file_exists($mx_root_path . "language/lang_$language/lang_admin.$phpEx") ) { $language = guess_lang(); } ! if( !@file_exists($mx_root_path . "language/lang_$language/lang_main.$phpEx") || ! !@file_exists($mx_root_path . "language/lang_$language/lang_admin.$phpEx") ) { ! include($mx_root_path . "language/lang_english/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_engslih/lang_admin.$phpEx"); } else { ! include($mx_root_path . "language/lang_$language/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_$language/lang_admin.$phpEx"); } --- 465,481 ---- } ! if( !@file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) { $language = guess_lang(); } ! if( !@file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) { ! include($mx_root_path . "install/language/lang_english/lang_admin.$phpEx"); ! $language = 'english'; } else { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); } *************** *** 446,454 **** // Do install -------------------------------------------------- // ! $confirm = ( isset($HTTP_POST_VARS['confirm']) || isset($HTTP_GET_VARS['confirm']) ); if( $confirm ) { ! $install_mode = ( isset($HTTP_POST_VARS['install_mode']) ? $HTTP_POST_VARS['install_mode'] : ( isset($HTTP_GET_VARS['install_mode']) ? $HTTP_GET_VARS['install_mode'] : '' ) ); $install_mode = ( preg_match('#^[a-z_]+$#', $install_mode) ? strip_tags($install_mode) : '' ); --- 483,491 ---- // Do install -------------------------------------------------- // ! $confirm = ( isset($_POST['confirm']) || isset($_GET['confirm']) ); if( $confirm ) { ! $install_mode = ( isset($_POST['install_mode']) ? $_POST['install_mode'] : ( isset($_GET['install_mode']) ? $_GET['install_mode'] : '' ) ); $install_mode = ( preg_match('#^[a-z_]+$#', $install_mode) ? strip_tags($install_mode) : '' ); *************** *** 458,472 **** { case 'install': ! $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); ! $phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); ! $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); ! $dbms = ( isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : '' ); ! $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ? $HTTP_POST_VARS['dbhost'] : '' ); ! $dbname = ( !empty($HTTP_POST_VARS['dbname']) ? $HTTP_POST_VARS['dbname'] : '' ); ! $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ? $HTTP_POST_VARS['dbuser'] : '' ); ! $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ? $HTTP_POST_VARS['dbpasswd'] : '' ); ! $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); ! $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); ! $acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); if( empty($phpbb_path) || empty($phpbb_url) || empty($portal_url) || --- 495,509 ---- { case 'install': ! $phpbb_path = ( !empty($_POST['phpbb_path']) ? $_POST['phpbb_path'] : '' ); ! $phpbb_url = ( !empty($_POST['phpbb_url']) ? $_POST['phpbb_url'] : '' ); ! $portal_url = ( !empty($_POST['portal_url']) ? $_POST['portal_url'] : '' ); ! $dbms = ( isset($_POST['dbms']) ? $_POST['dbms'] : '' ); ! $dbhost = ( !empty($_POST['dbhost']) ? $_POST['dbhost'] : '' ); ! $dbname = ( !empty($_POST['dbname']) ? $_POST['dbname'] : '' ); ! $dbuser = ( !empty($_POST['dbuser']) ? $_POST['dbuser'] : '' ); ! $dbpasswd = ( !empty($_POST['dbpasswd']) ? $_POST['dbpasswd'] : '' ); ! $table_prefix = ( !empty($_POST['prefix']) ? $_POST['prefix'] : '' ); ! $mx_table_prefix = ( !empty($_POST['mx_prefix']) ? $_POST['mx_prefix'] : '' ); ! $acm_type = ( isset($_POST['acm_type']) ? $_POST['acm_type'] : '' ); if( empty($phpbb_path) || empty($phpbb_url) || empty($portal_url) || *************** *** 585,589 **** // ! // Ok, let's load the mxBB-Portal config.php // if( @file_exists($mx_root_path . "config.$phpEx") ) --- 622,626 ---- // ! // Ok, let's load the mx-Publisher config.php // if( @file_exists($mx_root_path . "config.$phpEx") ) *************** *** 602,636 **** // include($phpbb_root_path . "includes/constants.$phpEx"); ! ! switch($dbms) ! { ! case 'mysql': ! include($mx_root_path . 'install/db/mysql.'.$phpEx); ! break; ! case 'mysql4': ! include($mx_root_path . 'install/db/mysql4.'.$phpEx); ! break; ! case 'mysqli': ! include($mx_root_path . 'install/db/mysqli.'.$phpEx); ! break; ! case 'postgres': ! include($mx_root_path . 'install/db/postgres7.'.$phpEx); ! break; ! case 'mssql': ! include($mx_root_path . 'install/db/mssql.'.$phpEx); ! break; ! case 'oracle': ! include($mx_root_path . 'install/db/oracle.'.$phpEx); ! break; ! case 'msaccess': ! include($mx_root_path . 'install/db/msaccess.'.$phpEx); ! break; ! case 'mssql-odbc': ! include($mx_root_path . 'install/db/mssql-odbc.'.$phpEx); ! break; ! } ! ! ! $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false); if ( !$db->db_connect_id ) --- 639,643 ---- // include($phpbb_root_path . "includes/constants.$phpEx"); ! include($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class if ( !$db->db_connect_id ) *************** *** 743,747 **** $template = new Template($mx_root_path . 'install/templates'); - // // Check if the Portal is already installed --- 750,753 ---- *************** *** 802,806 **** // ! // Get the absolute path to this mxBB-Portal installation. // $mx_absolute_path = str_replace('\\', '/', substr(__FILE__, 0, -strlen('install/'.basename(__FILE__)))); --- 808,812 ---- // ! // Get the absolute path to this mx-Publisher installation. // $mx_absolute_path = str_replace('\\', '/', substr(__FILE__, 0, -strlen('install/'.basename(__FILE__)))); *************** *** 862,866 **** // ! // Get the mxBB base dir (computed from the phpbb search path), for example /mx/, /portal/ or / // $mx_base_path = substr($mx_absolute_path, strlen($phpbb_search_path)); --- 868,872 ---- // ! // Get the mx-Publisher base dir (computed from the phpbb search path), for example /mx/, /portal/ or / // $mx_base_path = substr($mx_absolute_path, strlen($phpbb_search_path)); *************** *** 872,881 **** // ! // Get the mxBB Path in the URL (this might not be the same as the base path when using aliases). // $mx_self_path = substr($HTTP_SERVER_VARS['PHP_SELF'], 0, -strlen('install/'.basename(__FILE__))); // ! // Get the mxBB Portal URL. // $portal_url = $server_url . $mx_self_path; --- 878,887 ---- // ! // Get the mx-Publisher Path in the URL (this might not be the same as the base path when using aliases). // $mx_self_path = substr($HTTP_SERVER_VARS['PHP_SELF'], 0, -strlen('install/'.basename(__FILE__))); // ! // Get the mx-Publisher URL. // $portal_url = $server_url . $mx_self_path; *************** *** 916,925 **** // ! // Get the relative path from mxBB to this phpBB installation // $phpbb_relative = get_relative_path($mx_base_path, $phpbb_base_path); // ! // Get the relative path from the mxBB Install script to this phpBB installation // $phpbb_root_path = $mx_root_path . $phpbb_relative; --- 922,931 ---- // ! // Get the relative path from mx-Publisher to this phpBB installation // $phpbb_relative = get_relative_path($mx_base_path, $phpbb_base_path); // ! // Get the relative path from the mx-Publisher Install script to this phpBB installation // $phpbb_root_path = $mx_root_path . $phpbb_relative; *************** *** 975,978 **** --- 981,985 ---- $template->assign_block_vars('datarow', array( + 'INFO' => $lang['Install_Instruction_phpBB'], 'PHPBB_PATH' => $phpbb_relative, 'PORTAL_URL' => $portal_url, |
|
From: Jon O. <jon...@us...> - 2008-02-10 21:07:16
|
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2398 Modified Files: Tag: core28x dbal.php firebird.php mssql.php mssql_odbc.php mysql.php mysql4.php mysqli.php oracle.php postgres.php sqlite.php Log Message: Removing trailing newlines... Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mysqli.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- mysqli.php 10 Feb 2008 21:07:10 -0000 1.8.2.4 *************** *** 410,412 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 410,412 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: sqlite.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/sqlite.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** sqlite.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- sqlite.php 10 Feb 2008 21:07:10 -0000 1.8.2.4 *************** *** 353,355 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 353,355 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: postgres.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/postgres.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** postgres.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- postgres.php 10 Feb 2008 21:07:10 -0000 1.8.2.4 *************** *** 429,431 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 429,431 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mysql4.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- mysql4.php 10 Feb 2008 21:07:09 -0000 1.8.2.4 *************** *** 429,431 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 429,431 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: firebird.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/firebird.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** firebird.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- firebird.php 10 Feb 2008 21:07:08 -0000 1.8.2.4 *************** *** 420,422 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 420,422 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mssql.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- mssql.php 10 Feb 2008 21:07:08 -0000 1.8.2.4 *************** *** 412,414 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 412,414 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mysql.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- mysql.php 10 Feb 2008 21:07:09 -0000 1.8.2.4 *************** *** 427,429 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 427,429 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: dbal.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** dbal.php 3 Feb 2008 19:23:01 -0000 1.6.2.2 --- dbal.php 10 Feb 2008 21:07:08 -0000 1.6.2.3 *************** *** 648,650 **** $sql_db = 'dbal_' . $dbms; ! ?> --- 648,650 ---- $sql_db = 'dbal_' . $dbms; ! ?> \ No newline at end of file Index: oracle.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/oracle.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** oracle.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- oracle.php 10 Feb 2008 21:07:10 -0000 1.8.2.4 *************** *** 458,460 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 458,460 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file Index: mssql_odbc.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql_odbc.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mssql_odbc.php 10 Feb 2008 20:56:39 -0000 1.8.2.3 --- mssql_odbc.php 10 Feb 2008 21:07:09 -0000 1.8.2.4 *************** *** 417,419 **** $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> --- 417,419 ---- $db = new $sql_db(); $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, false); ! ?> \ No newline at end of file |
|
From: MW <jo...@us...> - 2008-02-10 21:04:34
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1485 Modified Files: common.php Log Message: Remove old outdated php4 seciurity checks as they are unrelevant now. Moved init of $mx_request_vars up to make use it been initialized before used. Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** common.php 9 Feb 2008 19:49:06 -0000 1.80 --- common.php 10 Feb 2008 21:04:29 -0000 1.81 *************** *** 105,111 **** unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code ! if (phpversion() >= '6.0.0-dev') { /** --- 105,112 ---- unset($input); ! } ! // If we are on PHP >= 6.0.0 we do not need some code ! if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) { /** *************** *** 127,267 **** } - // The following code (unsetting globals) - // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files - - // PHP5 with register_long_arrays off? - /* - if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) - { - - $HTTP_POST_VARS = $_POST; - $HTTP_GET_VARS = $_GET; - $HTTP_SERVER_VARS = $_SERVER; - $HTTP_COOKIE_VARS = $_COOKIE; - $HTTP_ENV_VARS = $_ENV; - $HTTP_POST_FILES = $_FILES; - - // _SESSION is the only superglobal which is conditionally set - if (isset($_SESSION)) - { - $HTTP_SESSION_VARS = $_SESSION; - } - } - */ - // Protect against GLOBALS tricks - if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) - { - die("Hacking attempt"); - } - - // Protect against HTTP_SESSION_VARS tricks - if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) - { - die("Hacking attempt"); - } - - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') - { - // PHP4+ path - $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path', 'mx_root_path'); - - // Not only will array_merge give a warning if a parameter - // is not an array, it will actually fail. So we check if - // HTTP_SESSION_VARS has been initialised. - if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) - { - $HTTP_SESSION_VARS = array(); - } - - // Merge all into one extremely huge array; unset - // this later - // - // Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead - // - //$input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); - $input = $HTTP_GET_VARS + $HTTP_POST_VARS + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES; - - unset($input['input']); - unset($input['not_unset']); - - while (list($var,) = @each($input)) - { - if (in_array($var, $not_unset)) - { - die('Hacking attempt!'); - } - unset($$var); - } - unset($input); - } - - // - // addslashes to vars if magic_quotes_gpc is off - // this is a security precaution to prevent someone - // trying to break out of a SQL statement. - // - if( !get_magic_quotes_gpc() ) - { - if( is_array($HTTP_GET_VARS) ) - { - while( list($k, $v) = each($HTTP_GET_VARS) ) - { - if( is_array($HTTP_GET_VARS[$k]) ) - { - while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) - { - $HTTP_GET_VARS[$k][$k2] = addslashes($v2); - } - @reset($HTTP_GET_VARS[$k]); - } - else - { - $HTTP_GET_VARS[$k] = addslashes($v); - } - } - @reset($HTTP_GET_VARS); - } - - if( is_array($HTTP_POST_VARS) ) - { - while( list($k, $v) = each($HTTP_POST_VARS) ) - { - if( is_array($HTTP_POST_VARS[$k]) ) - { - while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) - { - $HTTP_POST_VARS[$k][$k2] = addslashes($v2); - } - @reset($HTTP_POST_VARS[$k]); - } - else - { - $HTTP_POST_VARS[$k] = addslashes($v); - } - } - @reset($HTTP_POST_VARS); - } - - if( is_array($HTTP_COOKIE_VARS) ) - { - while( list($k, $v) = each($HTTP_COOKIE_VARS) ) - { - if( is_array($HTTP_COOKIE_VARS[$k]) ) - { - while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) ) - { - $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); - } - @reset($HTTP_COOKIE_VARS[$k]); - } - else - { - $HTTP_COOKIE_VARS[$k] = addslashes($v); - } - } - @reset($HTTP_COOKIE_VARS); - } - } - // // Define some basic configuration arrays this also prevents --- 128,131 ---- *************** *** 300,303 **** --- 164,172 ---- // + // instatiate the mx_request_vars class + // make sure to do before it's ever used + $mx_request_vars = new mx_request_vars(); + + // // Instatiate the mx_cache class // *************** *** 386,394 **** // - // instatiate the mx_request_vars class - // - $mx_request_vars = new mx_request_vars(); - - // // instatiate the mx_user class // --- 255,258 ---- |
|
From: MW <jo...@us...> - 2008-02-10 21:00:18
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31780/includes Modified Files: mx_functions_core.php Log Message: update request class to use $_GET and $_POST instead of the $HTML_*VARS equvalent ones Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** mx_functions_core.php 9 Feb 2008 19:44:11 -0000 1.70 --- mx_functions_core.php 10 Feb 2008 21:00:06 -0000 1.71 *************** *** 3597,3602 **** function _read($var, $type = MX_TYPE_ANY, $dflt = '') { - global $HTTP_POST_VARS, $HTTP_GET_VARS; - if( ($type & (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS)) == 0 ) { --- 3597,3600 ---- *************** *** 3604,3611 **** } ! if( ($type & MX_TYPE_POST_VARS) && isset($HTTP_POST_VARS[$var]) || ! ($type & MX_TYPE_GET_VARS) && isset($HTTP_GET_VARS[$var]) ) { ! $val = ( ($type & MX_TYPE_POST_VARS) && isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : $HTTP_GET_VARS[$var] ); if( !($type & MX_TYPE_NO_STRIP) ) { --- 3602,3609 ---- } ! if( ($type & MX_TYPE_POST_VARS) && isset($_POST[$var]) || ! ($type & MX_TYPE_GET_VARS) && isset($_GET[$var]) ) { ! $val = ( ($type & MX_TYPE_POST_VARS) && isset($_POST[$var]) ? $_POST[$var] : $_GET[$var] ); if( !($type & MX_TYPE_NO_STRIP) ) { |
|
From: Jon O. <jon...@us...> - 2008-02-10 20:59:13
|
Update of /cvsroot/mxbb/core/install/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31706 Modified Files: lang_admin.php Log Message: Updated. Upgrad etc http://www.mx-system.com/forum/viewtopic.php?t=10571 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 4 Feb 2008 15:58:09 -0000 1.2 --- lang_admin.php 10 Feb 2008 20:59:08 -0000 1.3 *************** *** 30,34 **** $lang['Welcome_install'] = 'Welcome to the MX-Publisher Installation Wizard'; $lang['Install_Instruction'] = 'Please fill out the details requested below. This installation program will create your personalized config.php (in the Portal root directory) and the Portal database with default settings. Once this is done, you\'ll see a report of all the steps taken. You should then login to your board with your administrator username and password and go to the Administration Control Panel to configure your portal with your own preferences. Thank you for choosing MX-Publisher.'; ! $lang['Install_Instruction_mxBB'] = 'Your admin account will be created: username (admin), password (admin). Modify this password asap!'; $lang['Install_Instruction_phpBB'] = 'Please note, even if you plan to use MX-Publisher with phpBB, this installation does not modify your phpBB database in any way.'; $lang['Upgrade_Instruction'] = 'MX-Publisher is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note MX-Publisher does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; --- 30,35 ---- $lang['Welcome_install'] = 'Welcome to the MX-Publisher Installation Wizard'; $lang['Install_Instruction'] = 'Please fill out the details requested below. This installation program will create your personalized config.php (in the Portal root directory) and the Portal database with default settings. Once this is done, you\'ll see a report of all the steps taken. You should then login to your board with your administrator username and password and go to the Administration Control Panel to configure your portal with your own preferences. Thank you for choosing MX-Publisher.'; ! $lang['Install_Instruction_mxBB'] = 'Be sure to fill out the form below carefully. If you need, consult the MXP documentation for further assistance.'; ! $lang['Install_Instruction_MXP_Admin'] = 'If the MXP adminname and password are left blank, your admin account will be created: username (admin), password (admin). Modify this password asap!'; $lang['Install_Instruction_phpBB'] = 'Please note, even if you plan to use MX-Publisher with phpBB, this installation does not modify your phpBB database in any way.'; $lang['Upgrade_Instruction'] = 'MX-Publisher is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note MX-Publisher does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; *************** *** 53,57 **** --- 54,61 ---- $lang['DB_Name'] = 'Your Database Name'; $lang['DB_Username'] = 'Database Username'; + $lang['MXP_Adminname'] = 'MXP Admin Username'; $lang['DB_Password'] = 'Database Password'; + $lang['MXP_Password'] = 'MXP Admin Password'; + $lang['MXP_Password2'] = 'MXP Admin Password (repeat)'; $lang['Table_Prefix'] = 'phpBB Prefix in DB'; $lang['MX_Table_Prefix'] = 'MX-Publisher Prefix in DB'; *************** *** 89,92 **** --- 93,97 ---- $lang['Error_loading_config'] = 'Sorry, could not load MX-Publisher config.php'; $lang['Error_database_down'] = 'Sorry, could not connect to the database.'; + $lang['PasswordMissmatch'] = 'Sorry, your MXP Admin passwords mismatch.'; // |
|
From: Jon O. <jon...@us...> - 2008-02-10 20:58:54
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30903/templates Modified Files: mx_install_body.tpl mx_install_header.tpl Log Message: Updated. Upgrad etc http://www.mx-system.com/forum/viewtopic.php?t=10571 Index: mx_install_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_header.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_install_header.tpl 4 Feb 2008 15:58:09 -0000 1.9 --- mx_install_header.tpl 10 Feb 2008 20:58:47 -0000 1.10 *************** *** 213,216 **** --- 213,217 ---- font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; border: solid red 2px; + height: 30px; padding: 5px; } *************** *** 258,262 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-publisher.com" target="_blank"><img src="../templates/subSilver/images/logo.gif" border="0" alt="MX-Publisher" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> --- 259,263 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-publisher.com" target="_blank"><img src="../templates/_core/images/logo.gif" border="0" alt="MX-Publisher" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_install_body.tpl 13 Sep 2007 09:13:05 -0000 1.6 --- mx_install_body.tpl 10 Feb 2008 20:58:47 -0000 1.7 *************** *** 44,52 **** pathinfo[i]['dbms'] = '{datarow.DBMS}'; pathinfo[i]['dbhost'] = '{datarow.DB_HOST}'; pathinfo[i]['dbname'] = '{datarow.DB_NAME}'; pathinfo[i]['dbuser'] = '{datarow.DB_USER}'; pathinfo[i]['dbpasswd'] = '{datarow.DB_PASSWD}'; pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; ! pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}'; i++; --- 44,53 ---- pathinfo[i]['dbms'] = '{datarow.DBMS}'; pathinfo[i]['dbhost'] = '{datarow.DB_HOST}'; + pathinfo[i]['dbhost_mxbb'] = '{datarow.DB_HOST}'; pathinfo[i]['dbname'] = '{datarow.DB_NAME}'; pathinfo[i]['dbuser'] = '{datarow.DB_USER}'; pathinfo[i]['dbpasswd'] = '{datarow.DB_PASSWD}'; pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}'; ! //pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}'; pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}'; i++; *************** *** 69,73 **** <!-- END switch_readonly_mode --> <tr> ! <td class="row1" colspan="2" align="center"><input size="120" class="info" type="text" name="info" value="{INFO}" /></td></td> </tr> <tr> --- 70,74 ---- <!-- END switch_readonly_mode --> <tr> ! <td class="row1" colspan="2" align="center"><input size="140" class="info" type="text" name="info" value="{INFO}" /></td></td> </tr> <tr> *************** *** 129,132 **** --- 130,148 ---- </tr> <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}: </span></td> + <td class="row2"><input type="text" name="admin_name" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}: </span></td> + <td class="row2"><input type="password" name="admin_pass1" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}: </span></td> + <td class="row2"><input type="password" name="admin_pass2" value="" /></td> + </tr> + <tr> + <td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td> + </tr> + <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="phpbb" type="submit" value="{L_SUBMIT}" /></td> </tr> *************** *** 146,150 **** <tr> <td class="row1" align="right"><span class="gen">{L_DB_HOST}: </span></td> ! <td class="row2"><input type="text" name="dbhost_mxbb" value="" /></td> </tr> <tr> --- 162,166 ---- <tr> <td class="row1" align="right"><span class="gen">{L_DB_HOST}: </span></td> ! <td class="row2"><input type="text" name="dbhost_mxbb" value="{DB_HOST}" /></td> </tr> <tr> *************** *** 161,164 **** --- 177,195 ---- </tr> <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}: </span></td> + <td class="row2"><input type="text" name="admin_name_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}: </span></td> + <td class="row2"><input type="password" name="admin_pass1_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}: </span></td> + <td class="row2"><input type="password" name="admin_pass2_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td> + </tr> + <tr> <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="mxbb" type="submit" value="{L_SUBMIT}" /></td> </tr> |
|
From: Jon O. <jon...@us...> - 2008-02-10 20:58:52
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30903/includes Modified Files: functions_install.php Log Message: Updated. Upgrad etc http://www.mx-system.com/forum/viewtopic.php?t=10571 Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions_install.php 9 Feb 2008 19:46:04 -0000 1.6 --- functions_install.php 10 Feb 2008 20:58:47 -0000 1.7 *************** *** 85,98 **** // '2.0.x' => false, // ), ! // 'mysqli' => array( ! // 'LABEL' => 'MySQL with MySQLi Extension', ! // 'SCHEMA' => 'mysql_41', ! // 'MODULE' => 'mysqli', ! // 'DELIM' => ';', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'mysqli', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), 'mysql' => array( 'LABEL' => 'MySQL', --- 85,98 ---- // '2.0.x' => false, // ), ! 'mysqli' => array( ! 'LABEL' => 'MySQL with MySQLi Extension', ! 'SCHEMA' => 'mysql_41', ! 'MODULE' => 'mysqli', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'mysqli', ! 'AVAILABLE' => true, ! '2.0.x' => true, ! ), 'mysql' => array( 'LABEL' => 'MySQL', *************** *** 893,915 **** } ! switch ( $phpbb_info['dbms'] ) ! { ! case 'mysql': ! include($mx_root_path . "install/db/mysql.$phpEx"); ! break; ! case 'mysql4': ! include($mx_root_path . "install/db/mysql4.$phpEx"); ! break; ! case 'mysqli': ! include($mx_root_path . "install/db/mysqli.$phpEx"); ! break; ! case 'postgres': ! include($mx_root_path . "install/db/postgres7.$phpEx"); ! break; ! default: ! return false; ! } ! $db = new sql_db($phpbb_info['dbhost'], $phpbb_info['dbuser'], $phpbb_info['dbpasswd'], $phpbb_info['dbname'], false); return $db->db_connect_id; --- 893,904 ---- } ! $dbhost = $phpbb_info['dbhost']; ! $dbuser = $phpbb_info['dbuser']; ! $dbpasswd = $phpbb_info['dbpasswd']; ! $dbname = $phpbb_info['dbname']; ! $dbms = $phpbb_info['dbms']; ! ! include($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class return $db->db_connect_id; *************** *** 1101,1105 **** // - //echo($command . '<br>'); $parse_command(convert_setvars($command, true)); } --- 1090,1093 ---- *************** *** 1252,1260 **** * Post Process populates the basic portal settings into database */ ! function exec_post_process($mode) { ! global $mx_portal_name, $mx_portal_version, $phpbb_url, $portal_url, $tplEx; } --- 1240,1402 ---- * Post Process populates the basic portal settings into database */ ! function exec_post_process($mode, $upgrade_mode) { ! global $mx_portal_name, $mx_portal_version, $tplEx, $db, $table_prefix; ! global $language, $board_email, $script_path, $server_port, $server_name, $portal_backend, $phpbb_path; ! global $mx_root_path, $phpbb_root_path; ! global $admin_name, $admin_pass1; ! global $portal_backend; ! ! if( $mode == 'install' ) ! { ! $portal_table = array( ! 'portal_id' => 1, ! 'portal_name' => "'$mx_portal_name'", ! 'portal_version' => "'$mx_portal_version'", ! 'portal_startdate' => "'".time()."'", ! 'default_lang' => "'$language'", ! 'board_email' => "'$board_email'", ! 'script_path' => "'$script_path'", ! 'server_port' => "'$server_port'", ! 'server_name' => "'$server_name'", ! 'portal_backend' => "'$portal_backend'", ! 'portal_backend_path' => "'$phpbb_path'", ! ); ! ! if ($_POST['mxbb']) // Internal install ! { ! $portal_table['default_style'] = "'1'"; ! } ! ! $sql = "INSERT INTO ".PORTAL_TABLE." (". ! implode(', ', array_keys($portal_table)). ! ") VALUES (". ! implode(', ', array_values($portal_table)). ! ")"; ! ! parse_cmd_sql($sql); ! ! $admin_pass_md5 = md5($admin_pass1); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "' ! WHERE username = 'Admin'"; ! ! parse_cmd_sql($sql); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_regdate = " . time(); ! ! parse_cmd_sql($sql); ! ! if (!$_POST['mxbb'] && $portal_backend = 'phpbb2') // phpBB2 install ! { ! $sql_phpbb = "SELECT * FROM ".$table_prefix."users WHERE user_level = 1"; ! ! if( !($result = $db->sql_query($sql_phpbb)) ) ! { ! return false; ! } ! $user_id = 2; // Add ontop admin user... ! while( $row = $db->sql_fetchrow($result) ) ! { ! $user_id++; ! $sql = "INSERT INTO " . USERS_TABLE . " ! (user_id, username, user_password, user_email, user_level, user_regdate, user_active) ! VALUES ('" . $user_id . "', '" . $row['username'] . "', '" . $row['user_password'] . "', '" . $row['user_email'] . "', '" . $row['user_level'] . "', '" . time() . "', '1')"; ! ! parse_cmd_sql($sql); ! } ! } ! } ! else ! { ! $sql = "UPDATE ".PORTAL_TABLE." ! SET portal_name='$mx_portal_name', ! portal_version='$mx_portal_version'"; ! ! if ($upgrade_mode = 'from28x') ! { ! // ! // Get data from phpBB2 -> CORE ! // ! $sql_phpbb = "SELECT * FROM ".$table_prefix."config"; ! if( !($result = $db->sql_query($sql_phpbb)) ) ! { ! return false; ! } ! while( $row = $db->sql_fetchrow($result) ) ! { ! $board_config[$row['config_name']] = $row['config_value']; ! } ! ! $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; // Fix for Olympus ! ! $phpbb_backend_path = str_replace($mx_root_path, '', $phpbb_root_path); // Read from old config.php ! ! $sql .= ", portal_startdate = '".$board_config['board_startdate']."', ! ! default_style = '".$board_config['default_style']."', ! override_user_style = '".$board_config['override_user_style']."', ! default_lang = '".$board_config['default_lang']."', ! ! allow_html = '".$board_config['allow_html']."', ! allow_html_tags = '".$board_config['allow_html_tags']."', ! allow_bbcode = '".$board_config['allow_bbcode']."', ! allow_smilies = '".$board_config['allow_smilies']."', ! smilies_path = '".$board_config['smilies_path']."', + board_email = '".$board_config['board_email']."', + board_email_sig = '".$board_config['board_email_sig']."', + smtp_delivery = '".$board_config['smtp_delivery']."', + smtp_host = '".$board_config['smtp_host']."', + smtp_username = '".$board_config['smtp_username']."', + smtp_password = '".$board_config['smtp_password']."', + smtp_auth_method = '".$board_config['smtp_auth_method']."', + + default_dateformat = '".$board_config['default_dateformat']."', + board_timezone = '".$board_config['board_timezone']."', + gzip_compress = '".$board_config['gzip_compress']."', + + script_path = '".$script_path."', + server_port = '".$board_config['server_port']."', + script_protocol = '".$server_protocol."', + server_name = '".$board_config['server_name']."', + portal_backend = 'phpbb2', + portal_backend_path = '$phpbb_backend_path'"; + } + $sql .= " WHERE portal_id = 1"; + + parse_cmd_sql($sql); + + if ($upgrade_mode = 'from28x') + { + // + // Get admins from phpBB2 -> CORE + // + $sql = "DELETE FROM " . USERS_TABLE . " + WHERE username = 'Admin'"; + + parse_cmd_sql($sql); + + $sql_phpbb = "SELECT * FROM ".$table_prefix."users WHERE user_level = 1"; + + if( !($result = $db->sql_query($sql_phpbb)) ) + { + return false; + } + $user_id = 2; // Add ontop admin user... + while( $row = $db->sql_fetchrow($result) ) + { + $user_id++; + $sql = "INSERT INTO " . USERS_TABLE . " + (user_id, username, user_password, user_email, user_level, user_regdate, user_active) + VALUES ('" . $user_id . "', '" . $row['username'] . "', '" . $row['user_password'] . "', '" . $row['user_email'] . "', '" . $row['user_level'] . "', '" . time() . "', '1')"; + + parse_cmd_sql($sql); + } + } + } } |
|
From: Jon O. <jon...@us...> - 2008-02-10 20:58:51
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30903 Modified Files: mx_install.php Log Message: Updated. Upgrad etc http://www.mx-system.com/forum/viewtopic.php?t=10571 Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** mx_install.php 9 Feb 2008 19:46:04 -0000 1.89 --- mx_install.php 10 Feb 2008 20:58:47 -0000 1.90 *************** *** 40,44 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.2.0'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); --- 40,44 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.2.1'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); *************** *** 124,128 **** if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { --- 124,128 ---- if (isset($not_unset[$varname])) { ! // Hacking attempt. No point in continuing unless it's a COOKIE //removed for mx_install: $varname !== 'GLOBALS' || if (isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) { *************** *** 150,154 **** unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') --- 150,154 ---- unset($input); ! } // If we are on PHP >= 6.0.0 we do not need some code if (phpversion() >= '6.0.0-dev') *************** *** 179,184 **** if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { ! $HTTP_POST_VARS = $_POST; ! $HTTP_GET_VARS = $_GET; $HTTP_SERVER_VARS = $_SERVER; $HTTP_COOKIE_VARS = $_COOKIE; --- 179,184 ---- if (@phpversion() >= '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { ! $_POST = $_POST; ! $_GET = $_GET; $HTTP_SERVER_VARS = $_SERVER; $HTTP_COOKIE_VARS = $_COOKIE; *************** *** 195,199 **** // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($_COOKIE['GLOBALS'])) { die("Hacking attempt"); --- 195,199 ---- // Protect against GLOBALS tricks ! if (isset($_POST['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($_GET['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { die("Hacking attempt"); *************** *** 224,229 **** // Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead // ! $input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); ! //$input = $HTTP_GET_VARS + $HTTP_POST_VARS + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES; unset($input['input']); --- 224,229 ---- // Note! Since array_merge() destroys numerical keys - if the array is numerically indexed, the keys get reindexed in a continuous way - we use the + operator instead // ! $input = array_merge($_GET, $_POST, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); ! //$input = $_GET + $_POST + $HTTP_COOKIE_VARS + $HTTP_SERVER_VARS + $HTTP_SESSION_VARS + $HTTP_ENV_VARS + $HTTP_POST_FILES; unset($input['input']); *************** *** 248,289 **** if( !get_magic_quotes_gpc() ) { ! if( is_array($HTTP_GET_VARS) ) { ! while( list($k, $v) = each($HTTP_GET_VARS) ) { ! if( is_array($HTTP_GET_VARS[$k]) ) { ! while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) { ! $HTTP_GET_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_GET_VARS[$k]); } else { ! $HTTP_GET_VARS[$k] = addslashes($v); } } ! @reset($HTTP_GET_VARS); } ! if( is_array($HTTP_POST_VARS) ) { ! while( list($k, $v) = each($HTTP_POST_VARS) ) { ! if( is_array($HTTP_POST_VARS[$k]) ) { ! while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) { ! $HTTP_POST_VARS[$k][$k2] = addslashes($v2); } ! @reset($HTTP_POST_VARS[$k]); } else { ! $HTTP_POST_VARS[$k] = addslashes($v); } } ! @reset($HTTP_POST_VARS); } --- 248,289 ---- if( !get_magic_quotes_gpc() ) { ! if( is_array($_GET) ) { ! while( list($k, $v) = each($_GET) ) { ! if( is_array($_GET[$k]) ) { ! while( list($k2, $v2) = each($_GET[$k]) ) { ! $_GET[$k][$k2] = addslashes($v2); } ! @reset($_GET[$k]); } else { ! $_GET[$k] = addslashes($v); } } ! @reset($_GET); } ! if( is_array($_POST) ) { ! while( list($k, $v) = each($_POST) ) { ! if( is_array($_POST[$k]) ) { ! while( list($k2, $v2) = each($_POST[$k]) ) { ! $_POST[$k][$k2] = addslashes($v2); } ! @reset($_POST[$k]); } else { ! $_POST[$k] = addslashes($v); } } ! @reset($_POST); } *************** *** 384,387 **** --- 384,388 ---- // HERE BEGINS THE PARTY... // ================================================================================ + $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . "install/includes/functions_install.$phpEx"); *************** *** 503,507 **** } ! if (!$mx_request_vars->is_empty_post('server_port')) { $server_port = $mx_request_vars->post('server_port', MX_TYPE_NO_TAGS); --- 504,508 ---- } ! if (!$mx_request_vars->is_post('server_port')) { $server_port = $mx_request_vars->post('server_port', MX_TYPE_NO_TAGS); *************** *** 537,541 **** if ($mx_request_vars->is_post('mxbb')) { ! $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS); $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); --- 538,542 ---- if ($mx_request_vars->is_post('mxbb')) { ! $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS, ''); $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); *************** *** 545,551 **** $dbuser = $mx_request_vars->post('dbuser_mxbb', MX_TYPE_NO_TAGS); $dbpasswd = $mx_request_vars->post('dbpasswd_mxbb', MX_TYPE_NO_TAGS); - //$table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! //$acm_type = $mx_request_vars->post('acm_type', MX_TYPE_NO_TAGS); $portal_backend = 'internal'; --- 546,554 ---- $dbuser = $mx_request_vars->post('dbuser_mxbb', MX_TYPE_NO_TAGS); $dbpasswd = $mx_request_vars->post('dbpasswd_mxbb', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! ! $admin_name = $mx_request_vars->post('admin_name_mxbb', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass1 = $mx_request_vars->post('admin_pass1_mxbb', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass2 = $mx_request_vars->post('admin_pass2_mxbb', MX_TYPE_NO_TAGS, 'admin'); $portal_backend = 'internal'; *************** *** 555,559 **** $portal_url = $mx_request_vars->post('portal_url', MX_TYPE_NO_TAGS); $phpbb_path = $mx_request_vars->post('phpbb_path', MX_TYPE_NO_TAGS); - //$phpbb_url = $mx_request_vars->post('phpbb_url', MX_TYPE_NO_TAGS); $dbms = $mx_request_vars->post('dbms', MX_TYPE_NO_TAGS); $dbhost = $mx_request_vars->post('dbhost', MX_TYPE_NO_TAGS); --- 558,561 ---- *************** *** 563,567 **** $table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! //$acm_type = $mx_request_vars->post('acm_type', MX_TYPE_NO_TAGS); $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; --- 565,572 ---- $table_prefix = $mx_request_vars->post('prefix', MX_TYPE_NO_TAGS); $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! ! $admin_name = $mx_request_vars->post('admin_name', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass1 = $mx_request_vars->post('admin_pass1', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass2 = $mx_request_vars->post('admin_pass2', MX_TYPE_NO_TAGS, 'admin'); $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; *************** *** 575,578 **** --- 580,589 ---- } + if( $admin_pass1 != $admin_pass2 ) + { + install_die(sprintf($lang['PasswordMissmatch'], '<a href="javascript:history.go(-1);">', '</a>')); + break; + } + // // If they entered the information manually, we need to verify they did it correctly ;-) *************** *** 616,623 **** include($mx_root_path . "config.$phpEx"); } if( !defined('MX_INSTALLED') ) { - //$mx_acm_type = ( !empty($acm_type) ? $acm_type : 'file' ); - $process_msgs[] = $lang['Writing_config'] . ' ...<br />'; --- 627,636 ---- include($mx_root_path . "config.$phpEx"); } + + // + // Create fresh config.php + // if( !defined('MX_INSTALLED') ) { $process_msgs[] = $lang['Writing_config'] . ' ...<br />'; *************** *** 631,639 **** $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; - //$config_data .= '$'."table_prefix = '$table_prefix';\n\n"; - //$config_data .= '$'."acm_type = '$mx_acm_type';\n\n"; - //$config_data .= '$phpbb_root_path = $mx_root_path . ' . "'$phpbb_path';\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; - //$config_data .= "define('PHPBB_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! --- 644,648 ---- *************** *** 672,679 **** case 'upgrade': // ! // We will be correctly filling the $schemas array in a moment, ! // as soon as we open the DB connection. ;-) // $schemas[] = 'upgrade'; break; --- 681,741 ---- case 'upgrade': + + if( @file_exists($mx_root_path . "config.$phpEx") ) + { + include($mx_root_path . "config.$phpEx"); + } + // ! // Update config.php (if upgrading from 2.8.x) // + if( defined('MX_INSTALLED') && defined('PHPBB_INSTALLED')) + { + $upgrade_mode = 'from28x'; + + $process_msgs[] = $lang['Writing_config'] . ' ...<br />'; + + $config_data = "<"."?php\n\n"; + $config_data .= "// $mx_portal_name auto-generated config file\n// Do not change anything in this file!\n\n"; + $config_data .= "// This file must be put into the $mx_portal_name directory, not into the phpBB directory.\n\n"; + $config_data .= '$'."dbms = '$dbms';\n\n"; + $config_data .= '$'."dbhost = '$dbhost';\n"; + $config_data .= '$'."dbname = '$dbname';\n"; + $config_data .= '$'."dbuser = '$dbuser';\n"; + $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; + $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; + $config_data .= "define('MX_INSTALLED', true);\n\n"; + $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! + + @umask(0111); + @chmod($mx_root_path . "config.$phpEx", 0644); + + if ( !($fp = @fopen($mx_root_path.'config.php', 'w')) ) + { + $arg_mxbb_url = '<span style="color:blue;">' . $portal_url . '</span>'; + $arg_inst_url = '<a href="javascript:history.go(0);">'; + $instruction_text = sprintf($lang['Unwriteable_config'], $arg_mxbb_url, $arg_inst_url, '</a>'); + + $s_hidden_fields = '<input type="hidden" name="send_file" value="1" />'. + '<input type="hidden" name="config_data" value="' . htmlspecialchars($config_data) . '" />'; + + include_once($mx_root_path . "install/includes/template.$phpEx"); + $template = new Template($mx_root_path . 'install/templates'); + page_header_install($lang['Welcome_install'], $instruction_text); + $template->set_filenames(array('button' => 'mx_install_button.tpl')); + $template->assign_vars(array( + 'S_FORM_ACTION' => "mx_install.$phpEx", + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'L_SUBMIT' => $lang['Send_file'], + )); + $template->pparse('button'); + page_footer_install(); + } + $result = @fputs($fp, $config_data, strlen($config_data)); + @fclose($fp); + + $process_msgs[] = '<span style="color:green;">'.str_replace("\n", "<br />\n", htmlspecialchars($config_data)).'</span>'; + } + $schemas[] = 'upgrade'; break; *************** *** 704,737 **** // include($mx_root_path . "includes/sessions/internal/constants.$phpEx"); ! ! switch($dbms) ! { ! case 'mysql': ! include($mx_root_path . 'install/db/mysql.'.$phpEx); ! break; ! case 'mysql4': ! include($mx_root_path . 'install/db/mysql4.'.$phpEx); ! break; ! case 'mysqli': ! include($mx_root_path . 'install/db/mysqli.'.$phpEx); ! break; ! case 'postgres': ! include($mx_root_path . 'install/db/postgres7.'.$phpEx); ! break; ! case 'mssql': ! include($mx_root_path . 'install/db/mssql.'.$phpEx); ! break; ! case 'oracle': ! include($mx_root_path . 'install/db/oracle.'.$phpEx); ! break; ! case 'msaccess': ! include($mx_root_path . 'install/db/msaccess.'.$phpEx); ! break; ! case 'mssql-odbc': ! include($mx_root_path . 'install/db/mssql-odbc.'.$phpEx); ! break; ! } ! ! $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false); if ( !$db->db_connect_id ) --- 766,770 ---- // include($mx_root_path . "includes/sessions/internal/constants.$phpEx"); ! include($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class if ( !$db->db_connect_id ) *************** *** 770,837 **** $process_msgs[] = '<hr />'; $process_msgs[] = $install_title . '...<br />'; ! ! //exec_post_process($install_mode); ! ! if( $install_mode == 'install' ) ! { ! $portal_table = array( ! 'portal_id' => 1, ! 'portal_version' => "'$mx_portal_version'", ! 'portal_startdate' => "'".time()."'", ! 'default_lang' => "'$language'", ! 'board_email' => "'$board_email'", ! 'script_path' => "'$script_path'", ! 'server_port' => "'$server_port'", ! 'server_name' => "'$server_name'", ! 'portal_backend' => "'$portal_backend'", ! 'portal_backend_path' => "'$phpbb_path'", ! ); ! ! if ($mx_request_vars->is_post('mxbb')) // Internal install ! { ! $portal_table['default_style'] = "'1'"; ! } ! ! $sql = "INSERT INTO ".PORTAL_TABLE." (". ! implode(', ', array_keys($portal_table)). ! ") VALUES (". ! implode(', ', array_values($portal_table)). ! ")"; ! ! parse_cmd_sql($sql); ! ! /* ! $admin_pass_md5 = ($confirm && $userdata['user_level'] == ADMIN) ? $admin_pass1 : md5($admin_pass1); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "' ! WHERE username = 'Admin'"; ! ! if (!$db->sql_query($sql)) ! { ! $process_errors++; ! $process_msgs[] = "Could not update admin info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />"; ! } ! */ ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_regdate = " . time(); ! ! if (!$db->sql_query($sql)) ! { ! $process_errors++; ! $process_msgs[] = "Could not update user_regdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />"; ! } ! } ! else ! { ! $sql = "UPDATE ".PORTAL_TABLE." ! SET portal_name='$mx_portal_name', ! portal_version='$mx_portal_version' ! WHERE portal_id = 1"; ! ! parse_cmd_sql($sql); ! } ! // --- 803,807 ---- $process_msgs[] = '<hr />'; $process_msgs[] = $install_title . '...<br />'; ! exec_post_process($install_mode, $upgrade_mode); // *************** *** 907,911 **** $template = new Template($mx_root_path . 'install/templates'); - // // Check if the Portal is already installed --- 877,880 ---- *************** *** 922,925 **** --- 891,895 ---- // $install_mode = 'upgrade'; + $upgrade_mode = defined('PHPBB_INSTALLED') ? 'from28x' : ''; page_header_install($lang['Welcome_install'], $lang['Upgrade_Instruction']); $template->set_filenames(array('button' => 'mx_install_button.tpl')); *************** *** 1084,1088 **** 'PHPBB_URL' => '', 'DBMS' => '', ! 'DB_HOST' => '', 'DB_NAME' => '', 'DB_USER' => '', --- 1054,1058 ---- 'PHPBB_URL' => '', 'DBMS' => '', ! 'DB_HOST' => 'localhost', 'DB_NAME' => '', 'DB_USER' => '', *************** *** 1148,1157 **** } // ! // Get the phpBB URL (and close DB connection) // $phpbb_url = get_phpbb_url($phpbb_info['table_prefix']); $db->sql_close(); $db = false; if( empty($phpbb_url) ) { --- 1118,1131 ---- } // ! // Get the phpBB URL // $phpbb_url = get_phpbb_url($phpbb_info['table_prefix']); + // + // Close our DB connection. + // $db->sql_close(); $db = false; + if( empty($phpbb_url) ) { *************** *** 1170,1174 **** 'PHPBB_URL' => $phpbb_url, 'DBMS' => $phpbb_info['dbms'], ! 'DB_HOST' => $phpbb_info['dbhost'], 'DB_NAME' => $phpbb_info['dbname'], 'DB_USER' => $phpbb_info['dbuser'], --- 1144,1148 ---- 'PHPBB_URL' => $phpbb_url, 'DBMS' => $phpbb_info['dbms'], ! 'DB_HOST' => !empty($phpbb_info['dbhost']) ? $phpbb_info['dbhost'] : 'localhost', 'DB_NAME' => $phpbb_info['dbname'], 'DB_USER' => $phpbb_info['dbuser'], *************** *** 1204,1222 **** // -------------------- - /* - if( defined('INSTALL_READONLY') && !$phpbb_found ) - { - if( $files_cnt <= 0 ) - { - install_die($lang['Install_phpbb_not_found'], $debuginfo); - } - if( $phpbb_failed ) - { - install_die($lang['Install_phpbb_db_failed'], $debuginfo); - } - install_die($lang['Install_phpbb_unsupported'], $debuginfo); - } - */ - $s_hidden_fields = '<input type="hidden" name="install_mode" value="' . $install_mode . '" />'. '<input type="hidden" name="confirm" value="1" />'. --- 1178,1181 ---- *************** *** 1242,1248 **** --- 1201,1211 ---- 'L_DB_USER' => $lang['DB_Username'], 'L_DB_PASSWORD' => $lang['DB_Password'], + 'L_MXP_ADMINNAME' => $lang['MXP_Adminname'], + 'L_MXP_PASSWORD' => $lang['MXP_Password'], + 'L_MXP_PASSWORD2' => $lang['MXP_Password2'], 'L_DB_PREFIX' => $lang['Table_Prefix'], 'L_ACM_TYPE' => ( !empty($lang['acm_type']) ? $lang['acm_type'] : 'Acm Type' ), 'L_MX_DB_PREFIX' => $lang['MX_Table_Prefix'], + 'L_MXP_ADMIN' => $lang['Install_Instruction_MXP_Admin'], 'L_SUBMIT' => $lang['Start_Install'], |
2 messages has been excluded from this view by a project administrator.
