From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/client/form/client_template.tform.php | 201 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 184 insertions(+), 17 deletions(-)
diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php
index 59be804..0b5c1be 100644
--- a/interface/web/client/form/client_template.tform.php
+++ b/interface/web/client/form/client_template.tform.php
@@ -42,7 +42,7 @@
$form["db_history"] = "no";
$form["tab_default"] = "template";
$form["list_default"] = "client_template_list.php";
-$form["auth"] = 'no';
+$form["auth"] = 'yes';
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
@@ -107,7 +107,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_maildomain_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -121,7 +121,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailbox_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -134,6 +134,34 @@
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailalias_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_mailaliasdomain' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_mailaliasdomain_error_notint'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_mailmailinglist' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_mailmailinglist_error_notint'),
),
'default' => '-1',
'value' => '',
@@ -149,7 +177,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailforward_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -163,7 +191,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailcatchall_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -191,7 +219,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailfilter_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -205,7 +233,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailfetchmail_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -219,7 +247,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_mailquota_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -233,7 +261,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_spamfilter_wblist_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -247,7 +275,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_spamfilter_user_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -261,7 +289,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_spamfilter_policy_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -275,6 +303,20 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_web_domain_error_notint'),
),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_web_quota' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_web_quota_error_notint'),
+ ),
'default' => '-1',
'value' => '',
'separator' => '',
@@ -283,13 +325,21 @@
'rows' => '',
'cols' => ''
),
+ 'web_php_options' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOXARRAY',
+ 'default' => '',
+ 'separator' => ',',
+ 'valuelimit' => 'client:web_php_options',
+ 'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
+ ),
'limit_web_aliasdomain' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_web_aliasdomain_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -303,7 +353,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_web_subdomain_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -317,7 +367,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_ftp_user_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -331,7 +381,35 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_shell_user_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'ssh_chroot' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'CHECKBOXARRAY',
+ 'validators' => array (
+ 0 => array (
+ 'type'=> 'NOTEMPTY',
+ 'errmsg'=> 'ssh_chroot_notempty'
+ ),
+ ),
+ 'default' => '',
+ 'separator' => ',',
+ 'valuelimit' => 'client:ssh_chroot',
+ 'value' => array('no' => 'None', 'jailkit' => 'Jailkit')
+ ),
+ 'limit_webdav_user' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_webdav_user_error_notint'),
+ ),
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -345,7 +423,7 @@
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_dns_zone_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -353,13 +431,27 @@
'rows' => '',
'cols' => ''
),
+ 'limit_dns_slave_zone' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_dns_slave_zone_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
'limit_dns_record' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_dns_record_error_notint'),
),
- 'default' => '-1',
+ 'default' => '0',
'value' => '',
'separator' => '',
'width' => '10',
@@ -367,6 +459,7 @@
'rows' => '',
'cols' => ''
),
+ /*
'limit_client' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
@@ -381,11 +474,60 @@
'rows' => '',
'cols' => ''
),
+ */
'limit_database' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'limit_database_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_cron' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_cron_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_cron_type' => array (
+ 'datatype' => 'VARCHAR',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'value' => array('full' => 'Full Cron','chrooted' => 'Chrooted Cron','url' => 'URL Cron')
+ ),
+ 'limit_cron_frequency' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_cron_error_frequency'),
+ ),
+ 'default' => '-1',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_traffic_quota' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_traffic_quota_error_notint'),
),
'default' => '-1',
'value' => '',
@@ -395,6 +537,31 @@
'rows' => '',
'cols' => ''
),
+ 'limit_openvz_vm' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'TEXT',
+ 'validators' => array ( 0 => array ( 'type' => 'ISINT',
+ 'errmsg'=> 'limit_openvz_vm_error_notint'),
+ ),
+ 'default' => '0',
+ 'value' => '',
+ 'separator' => '',
+ 'width' => '10',
+ 'maxlength' => '10',
+ 'rows' => '',
+ 'cols' => ''
+ ),
+ 'limit_openvz_vm_template_id' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'SELECT',
+ 'default' => '',
+ 'datasource' => array ( 'type' => 'SQL',
+ 'querystring' => 'SELECT template_id,template_name FROM openvz_template WHERE 1 ORDER BY template_name',
+ 'keyfield'=> 'template_id',
+ 'valuefield'=> 'template_name'
+ ),
+ 'value' => array(0 => ' ')
+ ),
##################################
# END Datatable fields
##################################
--
Gitblit v1.9.1