Merge branch 'master' into 'master'

various fix

fix ipv6 auth compatibility for `attempts_login` table and `auth.log` file (Now ipv6 is supported for attempts login verification and log file (which can be used by fail2ban unstable))

fix XMPP correct nameserver server_id for DNS RR creation/modification

fix XMPP correct Jabber ID field in XMPP Account page

fix XMPP anonymous

-REVERT fix Let's Encrypt web domain alias support

See merge request !486

Author: Till Brehm

interface/web/login/index.php

@@ -63,7 +63,7 @@
 	if(!preg_match("/^.{1,256}$/i", $_POST['password'])) $error = $app->lng('pw_error_length');
 
 	//** importing variables
-	$ip    = ip2long($_SERVER['REMOTE_ADDR']);
+	$ip = md5($_SERVER['REMOTE_ADDR']);
 	$username = $_POST['username'];
 	$password = $_POST['password'];
 	$loginAs  = false;
@@ -262,7 +262,7 @@
 						$app->plugin->raiseEvent('login', $this);
 
 						//* Save successfull login message to var
-						$authlog = 'Successful login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+						$authlog = 'Successful login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
 						$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
 						fwrite($authlog_handle, $authlog ."\n");
 						fclose($authlog_handle);
@@ -300,7 +300,7 @@
 
 				$app->plugin->raiseEvent('login_failed', $this);
 				//* Save failed login message to var
-				$authlog = 'Failed login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+				$authlog = 'Failed login for user \''. $username .'\' from '. $_SERVER['REMOTE_ADDR'] .' at '. date('Y-m-d H:i:s');
 				$authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
 				fwrite($authlog_handle, $authlog ."\n");
 				fclose($authlog_handle);

interface/web/mail/list/xmpp_user.list.php

@@ -47,7 +47,7 @@
 * Suchfelder
 *****************************************************/
 
-$liste["item"][] = array(   'field'     => "JID",
+$liste["item"][] = array(   'field'     => "jid",
 	'datatype'  => "VARCHAR",
 	'filters'   => array( 0 => array( 'event' => 'SHOW',
 			'type' => 'IDNTOUTF8')

interface/web/mail/xmpp_domain_edit.php

@@ -402,7 +402,7 @@ function onAfterUpdate() {
         //    $this->desyncMailusers($this->dataRecord['domain']);
         // Update DNS Records
         // TODO: Update gets only triggered from main form. WHY?
-        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
+        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
         if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
 	}
 

server/conf/metronome_conf_host.master

@@ -59,7 +59,7 @@ VirtualHost "{tmpl_var name='domain'}"
         };
 </tmpl_if>
 
-<tmpl_if name='use_proxy' op='==' value='true'>
+<tmpl_if name='use_anon_host' op='==' value='true'>
 VirtualHost "anon.{tmpl_var name='domain'}"
         enabled = true;
         authentication = "anonymous";