diff --git a/install/dist/conf/centos70.conf.php b/install/dist/conf/centos70.conf.php index 84b90b732a25209fbead179a09aed4deba76b4a5..ec59c754cb3c93ead89f61738982bd9f4ba5756f 100644 --- a/install/dist/conf/centos70.conf.php +++ b/install/dist/conf/centos70.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "5.4"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/centos72.conf.php b/install/dist/conf/centos72.conf.php index 9f2c84140c47e168ff69b37501b90cd871cb0686..a00b9b53e023de33e1bed3d0bb01027171a3b772 100644 --- a/install/dist/conf/centos72.conf.php +++ b/install/dist/conf/centos72.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "5.4"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/centos80.conf.php b/install/dist/conf/centos80.conf.php index b69e578d40e089368bf17d0c33b0086c3a1fd314..9e702b0b7442ad7526a63864a5a75892b410e3c4 100644 --- a/install/dist/conf/centos80.conf.php +++ b/install/dist/conf/centos80.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.2"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/debian100.conf.php b/install/dist/conf/debian100.conf.php index c98a2677ec2f1f89f4294a4d5118df77c43bcfe7..b23bbbf32c3a64a8fc949e4a347ee5c8555b1b7d 100644 --- a/install/dist/conf/debian100.conf.php +++ b/install/dist/conf/debian100.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.3"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/debian110.conf.php b/install/dist/conf/debian110.conf.php index 8b81c8680c0b015ece0ae42ef96647aa4591c1dc..a1754722e56f773f20dbd3cb61391bc74e7be659 100644 --- a/install/dist/conf/debian110.conf.php +++ b/install/dist/conf/debian110.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.4"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/debian90.conf.php b/install/dist/conf/debian90.conf.php index 906fda1c0e09eecbb0f1a223a9aea7a13b07433a..64e22fea285a6a014027c531cdc9ca9b152d97ee 100644 --- a/install/dist/conf/debian90.conf.php +++ b/install/dist/conf/debian90.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.0"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/debiantesting.conf.php b/install/dist/conf/debiantesting.conf.php index 03f2612377330d50b7f5614693008d8982b5fcd0..e2fa04f8ab9bf5b6b63ce234d941b65af3e32c91 100644 --- a/install/dist/conf/debiantesting.conf.php +++ b/install/dist/conf/debiantesting.conf.php @@ -32,7 +32,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //* Main $conf['language'] = 'en'; -$conf['distname'] = 'debian110'; +$conf['distname'] = 'debian120'; $conf['hostname'] = 'server1.domain.tld'; // Full hostname $conf['ispconfig_install_dir'] = '/usr/local/ispconfig'; $conf['ispconfig_config_dir'] = '/usr/local/ispconfig'; @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "8.1"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/ubuntu1604.conf.php b/install/dist/conf/ubuntu1604.conf.php index b7c68c7bbf9c78eded96adfda2977ed1d53cd6fe..3758eeff30619b46dfdaef8eb8ae1e152a695238 100644 --- a/install/dist/conf/ubuntu1604.conf.php +++ b/install/dist/conf/ubuntu1604.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.0"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/ubuntu1804.conf.php b/install/dist/conf/ubuntu1804.conf.php index 319930698b81d4c5708b530afc7bfac462c312f8..6dc51a13c77a776389002b1ed4485372b462eb31 100644 --- a/install/dist/conf/ubuntu1804.conf.php +++ b/install/dist/conf/ubuntu1804.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.2"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/dist/conf/ubuntu2004.conf.php b/install/dist/conf/ubuntu2004.conf.php index 546e2f57d7df7c472d9c0c2862d8a45fcbdb48f9..2cde7e3200f0366aabe5fffd1d0f453dac7a8e94 100644 --- a/install/dist/conf/ubuntu2004.conf.php +++ b/install/dist/conf/ubuntu2004.conf.php @@ -43,6 +43,7 @@ $conf['init_scripts'] = '/etc/init.d'; $conf['runlevel'] = '/etc'; $conf['shells'] = '/etc/shells'; $conf['pam'] = '/etc/pam.d'; +$conf['default_php'] = "7.4"; //* Services provided by this server, this selection will be overridden by the expert mode $conf['services']['mail'] = true; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 05312093120cce474839bce6775a40393bb8cc05..6cc4de996ab17a97bcbc827c372b87110a6a06ef 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -248,8 +248,11 @@ class installer_base { public function check_prerequisites() { $msg = ''; - if(version_compare(phpversion(), '5.4', '<')) $msg .= "PHP Version 5.4 or newer is required. The currently used PHP version is ".phpversion().".\n"; - if(version_compare(phpversion(), '8.2', '>=')) $msg .= "PHP Version 8.2+ is not supported yet. Change PHP version back to the default version of the OS. The currently used PHP version is ".phpversion().".\n"; + if ($conf['default_php'] != '') { + if(version_compare(phpversion('tidy'), $conf['default_php'], '==')) $msg .= "Your PHP version is not the OS default. Change the PHP version back to the default version of the OS. The currently used PHP version is " . phpversion() . "The default version for your OS is PHP " . $conf['default_php'] . ".\n"; + } + if(version_compare(phpversion(), '5.4', '<')) $msg .= "PHP Version 5.4 or newer is required. The currently used PHP version is " . phpversion() . ".\n"; + //if(version_compare(phpversion(), '8.2', '>=')) $msg .= "PHP Version 8.2+ is not supported yet. Change the PHP version back to the default version of the OS. The currently used PHP version is " . phpversion() . ".\n"; if(!function_exists('curl_init')) $msg .= "PHP Curl Module is missing.\n"; if(!function_exists('mysqli_connect')) $msg .= "PHP MySQLi Module is nmissing.\n"; if(!function_exists('mb_detect_encoding')) $msg .= "PHP Multibyte Module (MB) is missing.\n";