From cab4ba3af9dfd02c303d3b4714700269133f35bf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 31 Mar 2015 05:35:38 -0400
Subject: [PATCH] Merge branch 'Quest/ispconfig3-master'

---
 interface/web/client/form/client.tform.php |   99 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 99 insertions(+), 0 deletions(-)

diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 8d2ce89..7507c18 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -773,6 +773,105 @@
 			'rows'  => '',
 			'cols'  => ''
 		),
+        'default_xmppserver' => array (
+            'datatype' => 'INTEGER',
+            'formtype' => 'SELECT',
+            'default' => '1',
+            'datasource' => array (  'type' => 'CUSTOM',
+                'class'=> 'custom_datasource',
+                'function'=> 'client_servers'
+            ),
+            'value'  => '',
+            'name'  => 'default_xmppserver'
+        ),
+        'xmpp_servers' => array (
+            'datatype' => 'VARCHAR',
+            'formtype' => 'MULTIPLE',
+            'separator' => ',',
+            'default' => '1',
+            'datasource' => array (  'type' => 'CUSTOM',
+                'class'=> 'custom_datasource',
+                'function'=> 'client_servers'
+            ),
+            'validators'    => array (
+                0 => array ( 'type' => 'CUSTOM',
+                    'class' => 'validate_client',
+                    'function' => 'check_used_servers',
+                    'errmsg'=> 'xmpp_servers_used'),
+            ),
+            'value'  => '',
+            'name'  => 'xmpp_servers'
+        ),
+        'limit_xmpp_domain' => array(
+            'datatype' => 'INTEGER',
+            'formtype' => 'TEXT',
+            'validators' => array (  0 => array ( 'type' => 'ISINT',
+                'errmsg'=> 'limit_xmpp_domain_error_notint'),
+            ),
+            'default' => '-1',
+            'value'  => '',
+            'separator' => '',
+            'width'  => '10',
+            'maxlength' => '10',
+            'rows'  => '',
+            'cols'  => ''
+        ),
+        'limit_xmpp_user' => array(
+            'datatype' => 'INTEGER',
+            'formtype' => 'TEXT',
+            'validators' => array (  0 => array ( 'type' => 'ISINT',
+                'errmsg'=> 'limit_xmpp_user_error_notint'),
+            ),
+            'default' => '-1',
+            'value'  => '',
+            'separator' => '',
+            'width'  => '10',
+            'maxlength' => '10',
+            'rows'  => '',
+            'cols'  => ''
+        ),
+        'limit_xmpp_muc' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_anon' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_vjud' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_proxy' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_status' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_pastebin' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
+        'limit_xmpp_httparchive' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'CHECKBOX',
+            'default' => 'n',
+            'value'  => array(0 => 'n', 1 => 'y')
+        ),
 		'default_webserver' => array (
 			'datatype' => 'INTEGER',
 			'formtype' => 'SELECT',

--
Gitblit v1.9.1