diff --git a/languages/en_us/Install.php b/languages/en_us/Install.php index 9f98636d67339a3ee99502ae533bff22619bd9db..8718d8f8ef9352be177c5dbb502d131cc8c98792 100644 --- a/languages/en_us/Install.php +++ b/languages/en_us/Install.php @@ -68,7 +68,8 @@ $languageStrings = array( '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', 'MSG_LIST_REASONS' => 'This may be due to the following reasons', - 'LBL_MYSQLI_CONNECT_SUPPORT'=>'mysqli support', - 'LBL_OPEN_SSL'=>'openssl support', - 'LBL_CURL'=>'cURL support', + 'LBL_MYSQLI_CONNECT_SUPPORT'=>'Mysqli support', + 'LBL_OPEN_SSL'=>'Openssl support', + 'LBL_CURL'=>'Curl support', + 'LBL_MB_STRING'=>'Mbstring support', ); diff --git a/modules/Install/models/Utils.php b/modules/Install/models/Utils.php index 11a00c02cc8c39751401e1a2f38d6efb0e25dac6..d6b247e5de4a0646f4fc3152e4b56f3998ae1557 100644 --- a/modules/Install/models/Utils.php +++ b/modules/Install/models/Utils.php @@ -59,8 +59,10 @@ class Install_Utils_Model { $directiveValues = array(); if (ini_get('safe_mode') == '1' || stripos(ini_get('safe_mode'), 'On') > -1) $directiveValues['safe_mode'] = 'On'; - if (ini_get('display_errors') != '1' || stripos(ini_get('display_errors'), 'Off') > -1) - $directiveValues['display_errors'] = 'Off'; + /* if (ini_get('display_errors') != '1' || stripos(ini_get('display_errors'), 'Off') > -1) + $directiveValues['display_errors'] = 'Off'; */ + if (ini_get('display_errors') == '1' || stripos(ini_get('display_errors'), 'On') > -1) + $directiveValues['display_errors'] = 'On'; if (ini_get('file_uploads') != '1' || stripos(ini_get('file_uploads'), 'Off') > -1) $directiveValues['file_uploads'] = 'Off'; if (ini_get('register_globals') == '1' || stripos(ini_get('register_globals'), 'On') > -1) @@ -94,7 +96,7 @@ class Install_Utils_Model { */ public static $recommendedDirectives = array ( 'safe_mode' => 'Off', - 'display_errors' => 'On', + 'display_errors' => 'Off', 'file_uploads' => 'On', 'register_globals' => 'On', 'output_buffering' => 'On', @@ -126,8 +128,8 @@ class Install_Utils_Model { public static function getSystemPreInstallParameters() { $preInstallConfig = array(); // Name => array( System Value, Recommended value, supported or not(true/false) ); - $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_PHP_VERSION'] = array(phpversion(), '5.4.0+, 7.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') { @@ -136,6 +138,8 @@ class Install_Utils_Model { $preInstallConfig['LBL_OPEN_SSL'] = array(extension_loaded('openssl'), true, extension_loaded('openssl')); $preInstallConfig['LBL_CURL'] = array(extension_loaded('curl'), true, extension_loaded('curl')); + $preInstallConfig['LBL_IMAP_SUPPORT'] = array(extension_loaded('imap'), true, (extension_loaded('imap') == true)); + $preInstallConfig['LBL_MB_STRING'] = array(extension_loaded('mbstring'), true, (extension_loaded('mbstring') == true)); $gnInstalled = false; if(!function_exists('gd_info')) { diff --git a/modules/Install/views/Index.php b/modules/Install/views/Index.php index cc872c29f17e50cd1d9e4d9ee42adb1f9094b07a..4e20ac2fd677a496c8768b19b074e5d5f0f747c8 100644 --- a/modules/Install/views/Index.php +++ b/modules/Install/views/Index.php @@ -30,7 +30,7 @@ class Install_Index_view extends Vtiger_View_Controller { protected function applyInstallFriendlyEnv() { // config.inc.php - will not be ready to control this yet. version_compare(PHP_VERSION, '5.5.0') <= 0 ? error_reporting(E_ERROR & ~E_NOTICE & ~E_DEPRECATED) : error_reporting(E_ERROR & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT); - + version_compare(PHP_VERSION, '7.0.0') >= 0 ? error_reporting(E_WARNING & ~E_NOTICE) : error_reporting(E_WARNING & ~E_NOTICE & ~E_DEPRECATED & E_ERROR & ~E_STRICT); set_time_limit(0); // override limits on execution time to allow install to finish }