|
From: Jon O. <jon...@us...> - 2007-09-13 09:12:46
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12479/install Modified Files: mx_install.php Log Message: Updated schemas Added smiles and word censors db/admincp for standalone mode Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** mx_install.php 9 Sep 2007 16:48:17 -0000 1.80 --- mx_install.php 13 Sep 2007 09:12:38 -0000 1.81 *************** *** 33,37 **** // $mx_portal_name = 'mxBB Modular System'; ! $mx_portal_version = '2.9.1'; $mx_portal_copy = '<b>mxBB Modular System!</b> <br /><br/> mxBB is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. 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.'; --- 33,37 ---- // $mx_portal_name = 'mxBB Modular System'; ! $mx_portal_version = '2.9.2'; $mx_portal_copy = '<b>mxBB Modular System!</b> <br /><br/> mxBB is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. 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.'; *************** *** 815,818 **** --- 815,819 ---- include($mx_root_path . "config.$phpEx"); } + if( defined('MX_INSTALLED') ) { *************** *** 992,996 **** )); ! $select_phpbb_path .= '<option value="-1">'.'Internal'.'</option>'; // --- 993,997 ---- )); ! $select_phpbb_path .= '<option value="-1">'.'Internal'.'</option>'; // *************** *** 1090,1096 **** --- 1091,1108 ---- $phpbb_failed = true; $files_cnt = 0; + + 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); } // -------------------- + /* if( defined('INSTALL_READONLY') && !$phpbb_found ) { *************** *** 1105,1108 **** --- 1117,1121 ---- install_die($lang['Install_phpbb_unsupported'], $debuginfo); } + */ $s_hidden_fields = '<input type="hidden" name="install_mode" value="' . $install_mode . '" />'. *************** *** 1139,1152 **** 'PHPBB_PATH' => $phpbb_relative, 'PORTAL_URL' => $portal_url, ! 'PHPBB_URL' => $phpbb_url, ! 'DBMS' => $phpbb_info['dbms'], ! 'DB_HOST' => $phpbb_info['dbhost'], ! 'DB_NAME' => $phpbb_info['dbname'], ! 'DB_USER' => $phpbb_info['dbuser'], ! 'DB_PASSWD' => $phpbb_info['dbpasswd'], ! 'DB_PREFIX' => $phpbb_info['table_prefix'], ! 'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), ! 'DBMS_SELECT' => dbms_select('mysql'), 'S_HIDDEN_FIELDS' => $s_hidden_fields, --- 1152,1165 ---- 'PHPBB_PATH' => $phpbb_relative, 'PORTAL_URL' => $portal_url, ! 'PHPBB_URL' => $phpbb_url, ! 'DBMS' => $phpbb_info['dbms'], ! 'DB_HOST' => $phpbb_info['dbhost'], ! 'DB_NAME' => $phpbb_info['dbname'], ! 'DB_USER' => $phpbb_info['dbuser'], ! 'DB_PASSWD' => $phpbb_info['dbpasswd'], ! 'DB_PREFIX' => $phpbb_info['table_prefix'], ! 'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), ! 'DBMS_SELECT' => dbms_select('mysql'), 'S_HIDDEN_FIELDS' => $s_hidden_fields, |