Merge branch 'master' into 'master'

Add upload component to ssl and status

See merge request ispconfig/ispconfig3!765

Author: Till Brehm

interface/web/mail/xmpp_domain_edit.php

@@ -416,11 +416,12 @@ private function update_dns($dataRecord, $new_rr) {
             $required_hosts[] = 'vjud';
         if($rec['use_muc_host']=='y')
             $required_hosts[] = 'muc';
-        $required_hosts[] = 'upload';
+        if($rec['use_http_upload']=='y')
+            $required_hosts[] = 'upload';
 
         // purge old rr-record
         $sql = "SELECT * FROM dns_rr WHERE zone = ? AND (name IN ? AND type = 'CNAME' OR name LIKE ? AND type = 'SRV')  AND " . $app->tform->getAuthSQL('r') . " ORDER BY serial DESC";
-        $rec = $app->db->queryAllRecords($sql, $new_rr['zone'], array('xmpp', 'pubsub', 'proxy', 'anon', 'vjud', 'muc'), '_xmpp-%');
+        $rec = $app->db->queryAllRecords($sql, $new_rr['zone'], array('xmpp', 'pubsub', 'proxy', 'anon', 'vjud', 'muc', 'upload'), '_xmpp-%');
         if (is_array($rec[1])) {
             for ($i=0; $i < count($rec); ++$i)
                 $app->db->datalogDelete('dns_rr', 'id', $rec[$i]['id']);

server/conf/xmpp_metronome_conf_ssl.master

@@ -69,4 +69,8 @@ otherName.12=      SRVName;IA5STRING:_xmpp-server.proxy.{tmpl_var name='domain'}
 
 DNS.6       =                                      vjud.{tmpl_var name='domain'}
 otherName.13=            xmppAddr;FORMAT:UTF8,UTF8:vjud.{tmpl_var name='domain'}
-otherName.14=       SRVName;IA5STRING:_xmpp-server.vjud.{tmpl_var name='domain'}
+otherName.14=       SRVName;IA5STRING:_xmpp-server.vjud.{tmpl_var name='domain'}
+
+DNS.7       =                                      upload.{tmpl_var name='domain'}
+otherName.15=            xmppAddr;FORMAT:UTF8,UTF8:upload.{tmpl_var name='domain'}
+otherName.16=       SRVName;IA5STRING:_xmpp-server.upload.{tmpl_var name='domain'}

server/plugins-available/xmpp_plugin.inc.php

@@ -192,7 +192,12 @@ function domainUpdate($event_name, $data){
         }else{
             $tpl->setVar('use_vjud', 'false');
         }
-        $tpl->setVar('use_http_upload', $data['new']['use_muc_host']=='y'?'true':'false');
+        if($data['new']['use_muc_host']=='y'){
+            $tpl->setVar('use_http_upload', 'true');
+            $status_comps[] = 'upload.'.$data['new']['domain'];
+        }else{
+            $tpl->setVar('use_http_upload', 'false');
+        }
 
         $tpl->setVar('use_muc', $data['new']['use_muc_host']=='y'?'true':'false');
         if($data['new']['use_muc_host'] == 'y'){