Added configuration for webpresence and http_upload

qroac · qroac · commit e68211cfe9d9 · 2018-03-09T16:40:46.000+01:00
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
@@ -92,3 +92,18 @@ ALTER TABLE `web_domain` ADD COLUMN `ssl_letsencrypt_exclude` enum('n','y') NOT
 ALTER TABLE `remote_user` ADD `remote_access` ENUM('y','n') NOT NULL DEFAULT 'y' AFTER `remote_password`;
 ALTER TABLE `remote_user` ADD `remote_ips` TEXT AFTER `remote_access`;
 ALTER TABLE `web_domain` ADD `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n' AFTER `php_fpm_use_socket`;
+
+
+
+
+ALTER TABLE `client_template`
+  ADD COLUMN `limit_xmpp_webpresence` ENUM( 'n', 'y' ) NOT NULL default 'y',
+  ADD COLUMN `limit_xmpp_http_upload` ENUM( 'n', 'y' ) NOT NULL default 'n';
+
+ALTER TABLE `client`
+  ADD COLUMN `limit_xmpp_webpresence` ENUM( 'n', 'y' ) NOT NULL default 'y',
+  ADD COLUMN `limit_xmpp_http_upload` ENUM( 'n', 'y' ) NOT NULL default 'n';
+
+ALTER TABLE `xmpp_domain`
+  ADD COLUMN `use_webpresence` enum('n','y') NOT NULL DEFAULT 'y',
+  ADD COLUMN `use_http_upload` enum('n','y') NOT NULL DEFAULT 'n';
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
@@ -1011,6 +1011,18 @@
             'default' => 'n',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
+        'limit_xmpp_webpresence' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_http_upload' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
         'limit_xmpp_pastebin' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
@@ -427,6 +427,18 @@
             'default' => 'n',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
+        'limit_xmpp_webpresence' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_http_upload' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
         'limit_xmpp_pastebin' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
@@ -1009,6 +1009,18 @@
             'default' => 'n',
             'value'  => array(0 => 'n', 1 => 'y')
         ),
+        'limit_xmpp_webpresence' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_http_upload' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
         'limit_xmpp_pastebin' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'CHECKBOX',
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
@@ -188,6 +188,8 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
 $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
 $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
 $wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_xmpp_webpresence_txt'] = 'Webpresence available';
+$wb['limit_xmpp_http_upload_txt'] = 'HTTP upload available';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['parent_client_id_txt'] = 'Client of reseller';
diff --git a/interface/web/client/lib/lang/en_client_template.lng b/interface/web/client/lib/lang/en_client_template.lng
@@ -115,6 +115,8 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
 $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
 $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
 $wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_xmpp_webpresence_txt'] = 'Webpresence available';
+$wb['limit_xmpp_http_upload_txt'] = 'HTTP upload available';
 $wb['dns_servers_txt'] = 'DNS servers';
 $wb['limit_directive_snippets_txt'] = 'Show web server config selection';
 $wb['limit_database_user_txt'] = 'Max. Database users';
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
@@ -192,6 +192,8 @@ $wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
 $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
 $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
 $wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_xmpp_webpresence_txt'] = 'Webpresence available';
+$wb['limit_xmpp_http_upload_txt'] = 'HTTP upload available';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
@@ -312,6 +312,18 @@ <h4 class="panel-title">
                         {tmpl_var name='limit_xmpp_status'}
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_webpresence_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_webpresence'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_http_upload_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_http_upload'}
+                    </div>
+                </div>
       </div>
     </div>
   </div>
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
@@ -270,6 +270,18 @@ <h4 class="panel-title">
                         {tmpl_var name='limit_xmpp_status'}
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_webpresence_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_webpresence'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_http_upload_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_http_upload'}
+                    </div>
+                </div>
       </div>
     </div>
   </div>
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
@@ -314,6 +314,18 @@ <h4 class="panel-title">
                         {tmpl_var name='limit_xmpp_status'}
                     </div>
                 </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_webpresence_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_webpresence'}
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">{tmpl_var name='limit_xmpp_http_upload_txt'}</label>
+                    <div class="col-sm-9">
+                        {tmpl_var name='limit_xmpp_http_upload'}
+                    </div>
+                </div>
       </div>
     </div>
   </div>
diff --git a/interface/web/mail/form/xmpp_domain.tform.php b/interface/web/mail/form/xmpp_domain.tform.php
@@ -55,10 +55,10 @@
 $form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
-$muc_available = $muc_pastebin_available = $muc_httparchive_available = $anon_available = $vjud_available = $proxy_available = $status_available = true;
+$muc_available = $muc_pastebin_available = $muc_httparchive_available = $anon_available = $vjud_available = $proxy_available = $status_available = $webpresence_available = $http_upload_available = true;
 if(!$app->auth->is_admin()) {
     $client_group_id = $_SESSION["s"]["user"]["default_group"];
-    $client = $app->db->queryOneRecord("SELECT limit_xmpp_muc, limit_xmpp_anon, limit_xmpp_vjud, limit_xmpp_proxy, limit_xmpp_status, limit_xmpp_pastebin, limit_xmpp_httparchive FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
+    $client = $app->db->queryOneRecord("SELECT limit_xmpp_muc, limit_xmpp_anon, limit_xmpp_vjud, limit_xmpp_proxy, limit_xmpp_status, limit_xmpp_pastebin, limit_xmpp_httparchive, limit_xmpp_webpresence, limit_xmpp_http_upload FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
 
     if($client['limit_xmpp_muc'] != 'y') $muc_available = false;
     if($client['limit_xmpp_pastebin'] != 'y' || $client['limit_xmpp_muc'] != 'y') $muc_pastebin_available = false;
@@ -67,8 +67,14 @@
     if($client['limit_xmpp_vjud'] != 'y') $vjud_available = false;
     if($client['limit_xmpp_proxy'] != 'y') $proxy_available= false;
     if($client['limit_xmpp_status'] != 'y') $status_available = false;
+    if($client['limit_xmpp_webpresence'] != 'y') $webpresence_available = false;
+    if($client['limit_xmpp_http_upload'] != 'y') $http_upload_available = false;
 }
 
+$app->uses('getconf');
+$xmpp_config = $app->getconf->get_global_config('xmpp');
+
+
 $form["tabs"]['domain'] = array (
 	'title'  => "Domain",
 	'width'  => 100,
@@ -229,6 +235,22 @@
         'value'  => array(0 => 'n', 1 => 'y')
     );
 
+if($webpresence_available)
+    $form['tabs']['features']['fields']['use_webpresence'] = array (
+        'datatype' => 'VARCHAR',
+        'formtype' => 'CHECKBOX',
+        'default' => 'y',
+        'value'  => array(0 => 'n', 1 => 'y')
+    );
+
+if($http_upload_available)
+    $form['tabs']['features']['fields']['use_http_upload'] = array (
+        'datatype' => 'VARCHAR',
+        'formtype' => 'CHECKBOX',
+        'default' => 'y',
+        'value'  => array(0 => 'n', 1 => 'y')
+    );
+
 
 if($muc_available)
     $form["tabs"]['muc'] = array (
diff --git a/interface/web/mail/lib/lang/en_xmpp_domain.lng b/interface/web/mail/lib/lang/en_xmpp_domain.lng
@@ -26,6 +26,8 @@ $wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
 $wb["http_archive_show_join_txt"] = 'Show join messages in archive';
 $wb["http_archive_show_status_txt"] = 'Show status changes in archive';
 $wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["use_webpresence_txt"] = 'Enable Webpresence';
+$wb["use_http_upload_txt"] = 'Enable HTTP Upload';
 $wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
 $wb["about_registration_url_txt"] = 'Link to your registration form.';
 $wb["about_registration_message_txt"] = 'Description about your account registration process.';
diff --git a/interface/web/mail/templates/xmpp_domain_edit_modules.htm b/interface/web/mail/templates/xmpp_domain_edit_modules.htm
@@ -49,6 +49,25 @@ <h1><tmpl_var name="list_head_txt"></h1>
     </div>
 </tmpl_if>
 
+<tmpl_if name="limit_xmpp_webpresence" value="y">
+    <div class="form-group">
+        <label class="col-sm-3 control-label">{tmpl_var name='use_webpresence_txt'}</label>
+        <div class="col-sm-9">
+            {tmpl_var name='use_webpresence'}
+            {tmpl_var name='xmpp_daemon'}
+        </div>
+    </div>
+</tmpl_if>
+
+<tmpl_if name="limit_xmpp_http_upload" value="y">
+    <div class="form-group">
+        <label class="col-sm-3 control-label">{tmpl_var name='use_http_upload_txt'}</label>
+        <div class="col-sm-9">
+            {tmpl_var name='use_http_upload'}
+        </div>
+    </div>
+</tmpl_if>
+
 
 
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/mail/xmpp_domain_edit.php b/interface/web/mail/xmpp_domain_edit.php
@@ -87,12 +87,12 @@ function onShowNew() {
 	}
 
 	function onShowEnd() {
-		global $app, $conf;
+		global $app;
 
 		$app->uses('ini_parser,getconf');
 		$settings = $app->getconf->get_global_config('domains');
 
-        $read_limits = array('limit_xmpp_pastebin', 'limit_xmpp_httparchive', 'limit_xmpp_anon', 'limit_xmpp_vjud', 'limit_xmpp_proxy', 'limit_xmpp_status');
+        $read_limits = array('limit_xmpp_pastebin', 'limit_xmpp_httparchive', 'limit_xmpp_anon', 'limit_xmpp_vjud', 'limit_xmpp_proxy', 'limit_xmpp_status', 'limit_xmpp_webpresence', 'limit_xmpp_http_upload');
         if($_SESSION["s"]["user"]["typ"] != 'admin') {
             $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
             $client = $app->db->queryOneRecord("SELECT client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id);
@@ -221,7 +221,7 @@ function onShowEnd() {
 	}
 
 	function onSubmit() {
-		global $app, $conf;
+		global $app;
 
 		/* check if the domain module is used - and check if the selected domain can be used! */
 		$app->uses('ini_parser,getconf');
diff --git a/server/conf/xmpp_prosody_conf_host.master b/server/conf/xmpp_prosody_conf_host.master
@@ -47,10 +47,12 @@ VirtualHost "{tmpl_var name='domain'}"
             "{tmpl_var name='domain'} User Directory",
         },
 </tmpl_if>
+<tmpl_if name='use_http_upload' op='==' value='true'>
         {
             "upload.{tmpl_var name='domain'}",
             "{tmpl_var name='domain'} HTTP File Upload",
         }
+</tmpl_if>
     };
 
     admins = {
@@ -63,17 +65,6 @@ VirtualHost "{tmpl_var name='domain'}"
     };
 </tmpl_if>
 
-<tmpl_if name='use_anon_host' op='==' value='true'>
-VirtualHost "anon.{tmpl_var name='domain'}"
-    enabled = true;
-    authentication = "anonymous";
-    allow_anonymous_multiresourcing = true;
-    anonymous_jid_gentoken = "{tmpl_var name='domain'} Anonymous User";
-    admins = {
-    };
-</tmpl_if>
-
-
 <tmpl_if name='use_muc' op='==' value='true'>
 Component "muc.{tmpl_var name='domain'}" "muc"
     modules_enabled = {
@@ -132,8 +123,21 @@ Component "vjud.{tmpl_var name='domain'}" "vjud"
     vjud_mode = "{tmpl_var name='vjud_opt_mode'}";
 </tmpl_if>
 
+<tmpl_if name='use_http_upload' op='==' value='true'>
 Component "upload.{tmpl_var name='domain'}" "http_upload"
     ud_disco_name = "{tmpl_var name='domain'} HTTP File Upload";
     http_upload_file_size_limit = 1024 * 1024 * 10      -- 10MB, maximum
     http_upload_quota = 1024 * 1024 * 10                -- 10MB quota per user
     http_upload_expire_after = 60 * 60 * 24 * 2         -- 2 days in seconds
+</tmpl_if>
+
+
+<tmpl_if name='use_anon_host' op='==' value='true'>
+VirtualHost "anon.{tmpl_var name='domain'}"
+    enabled = true;
+    authentication = "anonymous";
+    allow_anonymous_multiresourcing = true;
+    anonymous_jid_gentoken = "{tmpl_var name='domain'} Anonymous User";
+    admins = {
+    };
+</tmpl_if>
diff --git a/server/conf/xmpp_prosody_conf_status.master b/server/conf/xmpp_prosody_conf_status.master
@@ -1,13 +1,20 @@
 Component "xmpp.{tmpl_var name='domain'}" "http"
         modules_enabled = {
+<tmpl_if name='use_status_host' op='==' value='true'>
                 "server_status",
-                "webpresence"
+</tmpl_if>
+<tmpl_if name='use_webpresence' op='==' value='true'>
+                "webpresence",
+</tmpl_if>
         };
+
+<tmpl_if name='use_status_host' op='==' value='true'>
         server_status_basepath = "/xmppd/";
         server_status_json = true;
         server_status_show_hosts = {
 {tmpl_var name='status_hosts'}
         };
         server_status_show_comps = {
 {tmpl_var name='status_comps'}
-        };
+        };
+</tmpl_if>
diff --git a/server/plugins-available/xmpp_plugin.inc.php b/server/plugins-available/xmpp_plugin.inc.php
@@ -190,6 +190,7 @@ function domainUpdate($event_name, $data){
         }else{
             $tpl->setVar('use_vjud', 'false');
         }
+        $tpl->setVar('use_http_upload', $data['new']['use_muc_host']=='y'?'true':'false');
 
         $tpl->setVar('use_muc', $data['new']['use_muc_host']=='y'?'true':'false');
         if($data['new']['use_muc_host'] == 'y'){
@@ -228,16 +229,27 @@ function domainUpdate($event_name, $data){
         $app->system->file_put_contents($this->xmpp_config_dir.'/hosts/'.$data['new']['domain'].'.cfg.lua', $tpl->grab());
         unset($tpl);
 
-        // Create status host file
+        // Create http host file
+        $tpl = new tpl;
+        $tpl->newTemplate("xmpp_{$this->daemon}_conf_status.master");
+        $tpl->setVar('domain', $data['new']['domain']);
+        $httpMods = 0;
+        $tpl->setVar('use_webpresence', $data['new']['use_webpresence'] == 'y' ? 'true' : 'false');
+        if($data['new']['use_webpresence']=='y') {
+            $httpMods++;
+        }
+        $tpl->setVar('use_status_host', $data['new']['use_status_host'] == 'y' ? 'true' : 'false');
         if($data['new']['use_status_host']=='y'){
-            $tpl = new tpl;
-            $tpl->newTemplate("xmpp_{$this->daemon}_conf_status.master");
-            $tpl->setVar('domain', $data['new']['domain']);
+            $httpMods++;
             $tpl->setVar('status_hosts', "\t\t\"".implode("\",\n\t\t\"",$status_hosts)."\"\n");
             $tpl->setVar('status_comps', "\t\t\"".implode("\",\n\t\t\"",$status_comps)."\"\n");
+        }
+        if($httpMods > 0){
             $app->system->file_put_contents($this->xmpp_config_dir.'/status/'.$data['new']['domain'].'.cfg.lua', $tpl->grab());
-            unset($tpl);
+        } else {
+            unlink($this->xmpp_config_dir.'/status/'.$data['new']['domain'].'.cfg.lua');
         }
+        unset($tpl);
 
         $app->services->restartServiceDelayed('xmpp', 'reload');
     }
