Merge branch 'develop' of https://git.ispconfig.org/ispconfig/ispconfig3 into develop

Author: ms217

install/lib/installer_base.lib.php

@@ -198,16 +198,16 @@ public function find_installed_apps() {
 
 		if (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost"))) $this->ispconfig_interface_installed = true;
 	}
-	
+
 	//** Check prerequisites
 	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(!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";
-		
+
 		if($msg != '') die($msg);
 	}
 
@@ -326,7 +326,7 @@ public function add_database_server_record() {
 		if(!$this->db->query($query, $conf['mysql']['database'] . ".*", $conf['mysql']['ispconfig_user'], $from_host)) {
 			$this->error('Unable to grant databse permissions to user: '.$conf['mysql']['ispconfig_user'].' Error: '.$this->db->errorMessage);
 		}
-		
+
 		// add correct administrative rights to IPSConfig user (SUPER is deprecated and unnecessarily powerful)
 		 if ($this->db->getDatabaseType() == 'mysql' && $this->db->getDatabaseVersion(true) >= 8) {
 			// there might be more needed on replicated db environments, this was not tested
@@ -2896,12 +2896,12 @@ public function make_ispconfig_ssl_cert() {
 		exec("cat $ssl_key_file $ssl_crt_file > $ssl_pem_file; chmod 600 $ssl_pem_file");
 
 		// Extend LE SSL certs to postfix
-		if ($conf['postfix']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig LE SSL certs to postfix?', array('y', 'n'), 'y')) == 'y') {
+		if ($conf['postfix']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Postfix?', array('y', 'n'), 'y')) == 'y') {
 
 			// Define folder, file(s)
 			$cf = $conf['postfix'];
 			$postfix_dir = $cf['config_dir'];
-			if(!is_dir($postfix_dir)) $this->error("The postfix configuration directory '$postfix_dir' does not exist.");
+			if(!is_dir($postfix_dir)) $this->error("The Postfix configuration directory '$postfix_dir' does not exist.");
 			$smtpd_crt = $postfix_dir.'/smtpd.cert';
 			$smtpd_key = $postfix_dir.'/smtpd.key';
 
@@ -2915,7 +2915,7 @@ public function make_ispconfig_ssl_cert() {
 		}
 
 		// Extend LE SSL certs to pureftpd
-		if ($conf['pureftpd']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig LE SSL certs to pureftpd? Creating dhparam file takes some times.', array('y', 'n'), 'y')) == 'y') {
+		if ($conf['pureftpd']['installed'] == true && strtolower($this->simple_query('Symlink ISPConfig SSL certs to Pure-FTPd? Creating dhparam file may take some time.', array('y', 'n'), 'y')) == 'y') {
 
 			// Define folder, file(s)
 			$pureftpd_dir = '/etc/ssl/private';

install/sql/ispconfig3.sql

@@ -2582,7 +2582,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
+INSERT INTO sys_config VALUES ('db','db_version','3.2dev');
 INSERT INTO sys_config VALUES ('interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;

install/tpl/config.inc.php.master

@@ -55,7 +55,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.2dev');
 define('DEVSYSTEM', 0);
 
 

interface/lib/config.inc.php

@@ -45,7 +45,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.2dev');
 define('DEVSYSTEM', 0);