diff --git a/languages/en_us/Install.php b/languages/en_us/Install.php index 8a77320ba9da6814df772959aab9345b1cf0b879..342fa66bd55cd52b8c108314d8809b7dc14e514a 100644 --- a/languages/en_us/Install.php +++ b/languages/en_us/Install.php @@ -61,6 +61,7 @@ $languageStrings = array( 'LBL_WELCOME_TO_VTIGER7_SETUP_WIZARD' => 'Welcome to Vtiger CRM 7 Setup Wizard', 'LBL_WELCOME' => 'Welcome', 'LBL_ZLIB_SUPPORT' => 'Zlib Support', + 'LBL_SIMPLEXML' => 'SimpleXML Support', 'MSG_DB_PARAMETERS_INVALID' => 'specified database user, password, hostname, database type, or port is invalid', 'MSG_DB_ROOT_USER_NOT_AUTHORIZED' => 'Message: Specified database Root User doesn\'t have permission to Create database or the Database name has special characters. Try changing the Database settings', 'MSG_DB_USER_NOT_AUTHORIZED' => 'specified database user does not have access to connect to the database server from the host', diff --git a/modules/Install/models/Utils.php b/modules/Install/models/Utils.php index 1307398636b83a13ba070e508c33de7a82205450..f2696d16a4685504814baf4c57628319f028026b 100644 --- a/modules/Install/models/Utils.php +++ b/modules/Install/models/Utils.php @@ -129,21 +129,27 @@ class Install_Utils_Model { $preInstallConfig['LBL_PHP_VERSION'] = array(phpversion(), '5.4.0', (version_compare(phpversion(), '5.4.0', '>='))); $preInstallConfig['LBL_IMAP_SUPPORT'] = array(function_exists('imap_open'), true, (function_exists('imap_open') == true)); $preInstallConfig['LBL_ZLIB_SUPPORT'] = array(function_exists('gzinflate'), true, (function_exists('gzinflate') == true)); - if ($preInstallConfig['LBL_PHP_VERSION'] >= '5.5.0') { - $preInstallConfig['LBL_MYSQLI_CONNECT_SUPPORT'] = array(extension_loaded('mysqli'), true, extension_loaded('mysqli')); - } - $preInstallConfig['LBL_OPEN_SSL'] = array(extension_loaded('openssl'), true, extension_loaded('openssl')); - $preInstallConfig['LBL_CURL'] = array(extension_loaded('curl'), true, extension_loaded('curl')); - $gnInstalled = false; + + if ($preInstallConfig['LBL_PHP_VERSION'] >= '5.5.0') { + $preInstallConfig['LBL_MYSQLI_CONNECT_SUPPORT'] = array(extension_loaded('mysqli'), true, extension_loaded('mysqli')); + } + + $preInstallConfig['LBL_OPEN_SSL'] = array(extension_loaded('openssl'), true, extension_loaded('openssl')); + $preInstallConfig['LBL_CURL'] = array(extension_loaded('curl'), true, extension_loaded('curl')); + + $gnInstalled = false; if(!function_exists('gd_info')) { eval(self::$gdInfoAlternate); } + $gd_info = gd_info(); if (isset($gd_info['GD Version'])) { $gnInstalled = true; } + $preInstallConfig['LBL_GD_LIBRARY'] = array((extension_loaded('gd') || $gnInstalled), true, (extension_loaded('gd') || $gnInstalled)); $preInstallConfig['LBL_ZLIB_SUPPORT'] = array(function_exists('gzinflate'), true, (function_exists('gzinflate') == true)); + $preInstallConfig['LBL_SIMPLEXML'] = array(function_exists('simplexml_load_file'), true, (function_exists('simplexml_load_file'))); return $preInstallConfig; }