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

Author: florian030

README.md

@@ -1,13 +1,43 @@
 # ISPConfig - Hosting Control Panel
-
+![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
 Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop)
 
-
+## Functions
 - Manage multiple servers from one control panel
-- Web server management (Apache2 and nginx)
-- Mail server management (with virtual mail users)
-- DNS server management (BIND and MyDNS)
+- Single server, multiserver and mirrored clusters.
+- Webserver management (Apache2 and nginx)
+- Mailserver management
+- DNS server management (BIND and PowerDNS)
 - Virtualization (OpenVZ)
-- Administrator, reseller and client login
-- Configuration mirroring and clusters
+- Administrator, reseller, client and mailuser login
 - Open Source software (BSD license)
+
+## Supported daemons
+- HTTP: Apache2 and nginx
+- HTTP stats: Webalizer, GoAccess and AWStats
+- Let's Encrypt: Acme.sh and certbot
+- SMTP: Postfix
+- POP3/IMAP: Dovecot
+- Spamfilter: Rspamd and Amavis
+- FTP: PureFTPD
+- DNS: BIND9 and PowerDNS
+- Database: MariaDB and MySQL
+
+## Supported operating systems
+- Debian 9, 10, and testing
+- Ubuntu 16.04 - 20.04
+- CentOS 7 and 8
+
+## Auto-install script
+You can install ISPConfig with our official autoinstaller: https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/-/blob/master/README.md
+
+## Migration tool
+The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel** and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/
+
+** The Migration Toolkit contains now beta support for migrating CPanel to ISPConfig.
+
+## Documentation
+You can support ISPConfig development by buying the manual: https://www.ispconfig.org/documentation/
+
+## Contributing
+If you like to contribute to the ISPConfig development, please send an email to: dev [at] ispconfig [dot] org.

install/lib/install.lib.php

@@ -882,9 +882,8 @@ function get_apps_vhost_port_number() {
 }
 
 /*
-* Get the port number of the ISPConfig controlpanel vhost
-*/
-
+ * Check if SSL is anabled in the ISPConfig controlpanel vhost.
+ */
 function is_ispconfig_ssl_enabled() {
 	global $conf;
 	$ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';

install/lib/installer_base.lib.php

@@ -650,7 +650,7 @@ public function grant_master_database_rights($verbose = false) {
 				$query = "GRANT SELECT, INSERT ON ?? TO ?@?";
 				if ($verbose){
 					echo $query ."\n";
-				}
+				
 				if(!$this->dbmaster->query($query, $value['db'] . '.sys_log', $value['user'], $host)) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}

install/tpl/debian6_dovecot2.conf.master

@@ -111,7 +111,7 @@ plugin {
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
 
-imap_capability=+SEPCIAL-USE XLIST
+imap_capability=+SPECIAL-USE XLIST
 namespace inbox {
   inbox = yes
   separator = .

install/tpl/fedora_dovecot2.conf.master

@@ -105,7 +105,7 @@ plugin {
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
 
-imap_capability=+SEPCIAL-USE XLIST
+imap_capability=+SPECIAL-USE XLIST
 namespace inbox {
   inbox = yes
   separator = .

install/tpl/opensuse_dovecot2.conf.master

@@ -104,7 +104,7 @@ plugin {
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
 
-imap_capability=+SEPCIAL-USE XLIST
+imap_capability=+SPECIAL-USE XLIST
 namespace inbox {
   inbox = yes
   separator = .

interface/lib/classes/remote.d/dns.inc.php

@@ -46,7 +46,6 @@ public function dns_templatezone_add($session_id, $client_id, $template_id, $dom
 		global $app, $conf;
 		if(!$this->checkPerm($session_id, 'dns_templatezone_add')) {
 			throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
-			return false;
 		}
 
 		$client = $app->db->queryOneRecord("SELECT default_dnsserver FROM client WHERE client_id = ?", $client_id);

interface/lib/classes/remoting.inc.php

@@ -124,7 +124,7 @@ public function login($username, $password, $client_login = false)
 			$remote_functions = '';
 			$tstamp = time() + $this->session_timeout;
 			$sql = 'INSERT INTO remote_session (remote_session,remote_userid,remote_functions,client_login,tstamp'
-				.') VALUES (?, ?, ?, 1, $tstamp)';
+				.') VALUES (?, ?, ?, 1, ?)';
 			$app->db->query($sql, $remote_session,$remote_userid,$remote_functions,$tstamp);
 			return $remote_session;
 		} else {

interface/web/admin/form/dbsync.tform.php

@@ -94,7 +94,7 @@
 
 
 $form['title']          = 'DB sync';
-$form['description']    = 'ISPConfig database synchronisation tool.';
+//$form['description']    = 'ISPConfig database synchronisation tool.';
 $form['name']           = 'dbsync';
 $form['action']         = 'dbsync_edit.php';
 $form['db_table']       = 'sys_dbsync';

interface/web/admin/form/groups.tform.php

@@ -60,7 +60,7 @@
 */
 
 $form["title"]    = "Groups";
-$form["description"]  = "groups_description";
+//$form["description"]  = "groups_description";
 $form["name"]    = "groups";
 $form["action"]   = "groups_edit.php";
 $form["db_table"]  = "sys_group";