Skip to content

Commit ac099e2

Browse files
author
mcramer
committed
FS#2385 - Extend client limits
1 parent 3501f91 commit ac099e2

17 files changed

+510
-26
lines changed

‎install/sql/incremental/upd_0036.sql‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,26 @@
22

33
ALTER TABLE `web_domain` ADD `perl` enum('n','y') NOT NULL default 'n' AFTER `python`;
44

5+
-- --------------------------------------------------------
6+
7+
ALTER TABLE `client` ADD `limit_cgi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `web_php_options`,
8+
ADD `limit_ssi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_cgi`,
9+
ADD `limit_perl` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_ssi`,
10+
ADD `limit_ruby` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_perl`,
11+
ADD `limit_python` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_ruby`,
12+
ADD `force_suexec` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_python`,
13+
ADD `limit_hterror` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `force_suexec`,
14+
ADD `limit_wildcard` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_hterror`,
15+
ADD `limit_ssl` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_wildcard`;
16+
17+
ALTER TABLE `client_template` ADD `limit_cgi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `web_php_options`,
18+
ADD `limit_ssi` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_cgi`,
19+
ADD `limit_perl` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_ssi`,
20+
ADD `limit_ruby` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_perl`,
21+
ADD `limit_python` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_ruby`,
22+
ADD `force_suexec` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y' AFTER `limit_python`,
23+
ADD `limit_hterror` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `force_suexec`,
24+
ADD `limit_wildcard` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_hterror`,
25+
ADD `limit_ssl` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `limit_wildcard`;
26+
527

‎install/sql/ispconfig3.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,15 @@ CREATE TABLE `client` (
179179
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
180180
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
181181
`web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp',
182+
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
183+
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
184+
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',
185+
`limit_ruby` enum('n','y') NOT NULL DEFAULT 'n',
186+
`limit_python` enum('n','y') NOT NULL DEFAULT 'n',
187+
`force_suexec` enum('n','y') NOT NULL DEFAULT 'y',
188+
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
189+
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
190+
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
182191
`limit_web_subdomain` int(11) NOT NULL DEFAULT '-1',
183192
`limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1',
184193
`limit_ftp_user` int(11) NOT NULL DEFAULT '-1',
@@ -265,6 +274,15 @@ CREATE TABLE `client_template` (
265274
`limit_web_domain` int(11) NOT NULL default '-1',
266275
`limit_web_quota` int(11) NOT NULL default '-1',
267276
`web_php_options` varchar(255) NOT NULL DEFAULT 'no',
277+
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
278+
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
279+
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',
280+
`limit_ruby` enum('n','y') NOT NULL DEFAULT 'n',
281+
`limit_python` enum('n','y') NOT NULL DEFAULT 'n',
282+
`force_suexec` enum('n','y') NOT NULL DEFAULT 'y',
283+
`limit_hterror` enum('n','y') NOT NULL DEFAULT 'n',
284+
`limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n',
285+
`limit_ssl` enum('n','y') NOT NULL DEFAULT 'n',
268286
`limit_web_subdomain` int(11) NOT NULL default '-1',
269287
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
270288
`limit_ftp_user` int(11) NOT NULL default '-1',

‎interface/web/client/form/client.tform.php‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,60 @@
688688
'valuelimit' => 'client:web_php_options',
689689
'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
690690
),
691+
'limit_cgi' => array (
692+
'datatype' => 'VARCHAR',
693+
'formtype' => 'CHECKBOX',
694+
'default' => 'n',
695+
'value' => array(0 => 'n',1 => 'y')
696+
),
697+
'limit_ssi' => array (
698+
'datatype' => 'VARCHAR',
699+
'formtype' => 'CHECKBOX',
700+
'default' => 'n',
701+
'value' => array(0 => 'n',1 => 'y')
702+
),
703+
'limit_perl' => array (
704+
'datatype' => 'VARCHAR',
705+
'formtype' => 'CHECKBOX',
706+
'default' => 'n',
707+
'value' => array(0 => 'n',1 => 'y')
708+
),
709+
'limit_ruby' => array (
710+
'datatype' => 'VARCHAR',
711+
'formtype' => 'CHECKBOX',
712+
'default' => 'n',
713+
'value' => array(0 => 'n',1 => 'y')
714+
),
715+
'limit_python' => array (
716+
'datatype' => 'VARCHAR',
717+
'formtype' => 'CHECKBOX',
718+
'default' => 'n',
719+
'value' => array(0 => 'n',1 => 'y')
720+
),
721+
'force_suexec' => array (
722+
'datatype' => 'VARCHAR',
723+
'formtype' => 'CHECKBOX',
724+
'default' => 'y',
725+
'value' => array(0 => 'n',1 => 'y')
726+
),
727+
'limit_hterror' => array (
728+
'datatype' => 'VARCHAR',
729+
'formtype' => 'CHECKBOX',
730+
'default' => 'n',
731+
'value' => array(0 => 'n',1 => 'y')
732+
),
733+
'limit_wildcard' => array (
734+
'datatype' => 'VARCHAR',
735+
'formtype' => 'CHECKBOX',
736+
'default' => 'n',
737+
'value' => array(0 => 'n',1 => 'y')
738+
),
739+
'limit_ssl' => array (
740+
'datatype' => 'VARCHAR',
741+
'formtype' => 'CHECKBOX',
742+
'default' => 'n',
743+
'value' => array(0 => 'n',1 => 'y')
744+
),
691745
'limit_web_aliasdomain' => array (
692746
'datatype' => 'INTEGER',
693747
'formtype' => 'TEXT',

‎interface/web/client/form/client_template.tform.php‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,60 @@
333333
'valuelimit' => 'client:web_php_options',
334334
'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
335335
),
336+
'limit_cgi' => array (
337+
'datatype' => 'VARCHAR',
338+
'formtype' => 'CHECKBOX',
339+
'default' => 'n',
340+
'value' => array(0 => 'n',1 => 'y')
341+
),
342+
'limit_ssi' => array (
343+
'datatype' => 'VARCHAR',
344+
'formtype' => 'CHECKBOX',
345+
'default' => 'n',
346+
'value' => array(0 => 'n',1 => 'y')
347+
),
348+
'limit_perl' => array (
349+
'datatype' => 'VARCHAR',
350+
'formtype' => 'CHECKBOX',
351+
'default' => 'n',
352+
'value' => array(0 => 'n',1 => 'y')
353+
),
354+
'limit_ruby' => array (
355+
'datatype' => 'VARCHAR',
356+
'formtype' => 'CHECKBOX',
357+
'default' => 'n',
358+
'value' => array(0 => 'n',1 => 'y')
359+
),
360+
'limit_python' => array (
361+
'datatype' => 'VARCHAR',
362+
'formtype' => 'CHECKBOX',
363+
'default' => 'n',
364+
'value' => array(0 => 'n',1 => 'y')
365+
),
366+
'force_suexec' => array (
367+
'datatype' => 'VARCHAR',
368+
'formtype' => 'CHECKBOX',
369+
'default' => 'y',
370+
'value' => array(0 => 'n',1 => 'y')
371+
),
372+
'limit_hterror' => array (
373+
'datatype' => 'VARCHAR',
374+
'formtype' => 'CHECKBOX',
375+
'default' => 'n',
376+
'value' => array(0 => 'n',1 => 'y')
377+
),
378+
'limit_wildcard' => array (
379+
'datatype' => 'VARCHAR',
380+
'formtype' => 'CHECKBOX',
381+
'default' => 'n',
382+
'value' => array(0 => 'n',1 => 'y')
383+
),
384+
'limit_ssl' => array (
385+
'datatype' => 'VARCHAR',
386+
'formtype' => 'CHECKBOX',
387+
'default' => 'n',
388+
'value' => array(0 => 'n',1 => 'y')
389+
),
336390
'limit_web_aliasdomain' => array (
337391
'datatype' => 'INTEGER',
338392
'formtype' => 'TEXT',

‎interface/web/client/form/reseller.tform.php‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,60 @@
622622
'separator' => ',',
623623
'value' => array('no' => 'Disabled', 'fast-cgi' => 'Fast-CGI', 'cgi' => 'CGI', 'mod' => 'Mod-PHP', 'suphp' => 'SuPHP', 'php-fpm' => 'PHP-FPM')
624624
),
625+
'limit_cgi' => array (
626+
'datatype' => 'VARCHAR',
627+
'formtype' => 'CHECKBOX',
628+
'default' => 'n',
629+
'value' => array(0 => 'n',1 => 'y')
630+
),
631+
'limit_ssi' => array (
632+
'datatype' => 'VARCHAR',
633+
'formtype' => 'CHECKBOX',
634+
'default' => 'n',
635+
'value' => array(0 => 'n',1 => 'y')
636+
),
637+
'limit_perl' => array (
638+
'datatype' => 'VARCHAR',
639+
'formtype' => 'CHECKBOX',
640+
'default' => 'n',
641+
'value' => array(0 => 'n',1 => 'y')
642+
),
643+
'limit_ruby' => array (
644+
'datatype' => 'VARCHAR',
645+
'formtype' => 'CHECKBOX',
646+
'default' => 'n',
647+
'value' => array(0 => 'n',1 => 'y')
648+
),
649+
'limit_python' => array (
650+
'datatype' => 'VARCHAR',
651+
'formtype' => 'CHECKBOX',
652+
'default' => 'n',
653+
'value' => array(0 => 'n',1 => 'y')
654+
),
655+
'force_suexec' => array (
656+
'datatype' => 'VARCHAR',
657+
'formtype' => 'CHECKBOX',
658+
'default' => 'y',
659+
'value' => array(0 => 'n',1 => 'y')
660+
),
661+
'limit_hterror' => array (
662+
'datatype' => 'VARCHAR',
663+
'formtype' => 'CHECKBOX',
664+
'default' => 'n',
665+
'value' => array(0 => 'n',1 => 'y')
666+
),
667+
'limit_wildcard' => array (
668+
'datatype' => 'VARCHAR',
669+
'formtype' => 'CHECKBOX',
670+
'default' => 'n',
671+
'value' => array(0 => 'n',1 => 'y')
672+
),
673+
'limit_ssl' => array (
674+
'datatype' => 'VARCHAR',
675+
'formtype' => 'CHECKBOX',
676+
'default' => 'n',
677+
'value' => array(0 => 'n',1 => 'y')
678+
),
625679
'limit_web_aliasdomain' => array (
626680
'datatype' => 'INTEGER',
627681
'formtype' => 'TEXT',

‎interface/web/client/lib/lang/de_client.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ $wb["add_additional_template_txt"] = 'Zusätzliches Template hinzufügen';
8787
$wb["delete_additional_template_txt"] = 'Zusätzliches Template löschen';
8888
$wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
8989
$wb['web_php_options_txt'] = 'PHP Optionen';
90+
$wb["limit_cgi_txt"] = "CGI verfügbar";
91+
$wb["limit_ssi_txt"] = "SSI verfügbar";
92+
$wb["limit_perl_txt"] = "Perl verfügbar";
93+
$wb["limit_ruby_txt"] = "Ruby verfügbar";
94+
$wb["limit_python_txt"] = "Python verfügbar";
95+
$wb["force_suexec_txt"] = "SuEXEC erzwungen";
96+
$wb["limit_hterror_txt"] = "Eigene Fehlerseiten verfügbar";
97+
$wb["limit_wildcard_txt"] = "Wildcard Subdomain verfügbar";
98+
$wb["limit_ssl_txt"] = "SSL verfügbar";
9099
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
91100
$wb['limit_mailaliasdomain_txt'] = 'Max. Anzahl an Domain-Aliases';
92101
$wb['limit_mailaliasdomain_error_notint'] = 'Das E-Mail Domain-Alias Limit muss eine Zahl sein.';

‎interface/web/client/lib/lang/de_client_template.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,15 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Template für virtuelle Server erzwing
6767
$wb['limit_openvz_vm_error_notint'] = 'Das Limit virtueller Server muss eine Zahl sein.';
6868
$wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
6969
$wb['web_php_options_txt'] = 'PHP-Optionen';
70+
$wb["limit_cgi_txt"] = "CGI verfügbar";
71+
$wb["limit_ssi_txt"] = "SSI verfügbar";
72+
$wb["limit_perl_txt"] = "Perl verfügbar";
73+
$wb["limit_ruby_txt"] = "Ruby verfügbar";
74+
$wb["limit_python_txt"] = "Python verfügbar";
75+
$wb["force_suexec_txt"] = "SuEXEC erzwungen";
76+
$wb["limit_hterror_txt"] = "Eigene Fehlerseiten verfügbar";
77+
$wb["limit_wildcard_txt"] = "Wildcard Subdomain verfügbar";
78+
$wb["limit_ssl_txt"] = "SSL verfügbar";
7079
$wb['template_type_txt'] = 'Template-Typ';
7180
$wb['template_name_txt'] = 'Template-Name';
7281
$wb["web_limits_txt"] = 'Web-Limits';

‎interface/web/client/lib/lang/de_reseller.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@ $wb["add_additional_template_txt"] = 'Zusätzliches Template hinzufügen';
8787
$wb["delete_additional_template_txt"] = 'Zusätzliches Template löschen';
8888
$wb['ssh_chroot_txt'] = 'SSH-Chroot Optionen';
8989
$wb['web_php_options_txt'] = 'PHP-Optionen';
90+
$wb["limit_cgi_txt"] = "CGI verfügbar";
91+
$wb["limit_ssi_txt"] = "SSI verfügbar";
92+
$wb["limit_perl_txt"] = "Perl verfügbar";
93+
$wb["limit_ruby_txt"] = "Ruby verfügbar";
94+
$wb["limit_python_txt"] = "Python verfügbar";
95+
$wb["force_suexec_txt"] = "SuEXEC erzwungen";
96+
$wb["limit_hterror_txt"] = "Eigene Fehlerseiten verfügbar";
97+
$wb["limit_wildcard_txt"] = "Wildcard Subdomain verfügbar";
98+
$wb["limit_ssl_txt"] = "SSL verfügbar";
9099
$wb['limit_client_error'] = 'Die maximale Anzahl an Kunden wurde erreicht.';
91100
$wb['limit_client_error_positive'] = 'Die Anzahl an Kunden muss > 0 sein';
92101
$wb['limit_web_quota_txt'] = 'Web Quota';

‎interface/web/client/lib/lang/en_client.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@ $wb["add_additional_template_txt"] = 'Add additional template';
9898
$wb["delete_additional_template_txt"] = 'Delete additional template';
9999
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
100100
$wb["web_php_options_txt"] = 'PHP Options';
101+
$wb["limit_cgi_txt"] = "CGI available";
102+
$wb["limit_ssi_txt"] = "SSI available";
103+
$wb["limit_perl_txt"] = "Perl available";
104+
$wb["limit_ruby_txt"] = "Ruby available";
105+
$wb["limit_python_txt"] = "Python available";
106+
$wb["force_suexec_txt"] = "SuEXEC forced";
107+
$wb["limit_hterror_txt"] = "Custom error docs available";
108+
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
109+
$wb["limit_ssl_txt"] = "SSL available";
101110
$wb["limit_client_error"] = 'The max. number of clients is reached.';
102111
$wb["limit_web_quota_txt"] = 'Web Quota';
103112
$wb["limit_traffic_quota_txt"] = 'Traffic Quota';

‎interface/web/client/lib/lang/en_client_template.lng‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ $wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template';
7070
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
7171
$wb["ssh_chroot_txt"] = 'SSH-Chroot Options';
7272
$wb["web_php_options_txt"] = 'PHP Options';
73+
$wb["limit_cgi_txt"] = "CGI available";
74+
$wb["limit_ssi_txt"] = "SSI available";
75+
$wb["limit_perl_txt"] = "Perl available";
76+
$wb["limit_ruby_txt"] = "Ruby available";
77+
$wb["limit_python_txt"] = "Python available";
78+
$wb["force_suexec_txt"] = "SuEXEC forced";
79+
$wb["limit_hterror_txt"] = "Custom error docs available";
80+
$wb["limit_wildcard_txt"] = "Wildcard subdomain available";
81+
$wb["limit_ssl_txt"] = "SSL available";
7382
$wb["web_limits_txt"] = 'Web Limits';
7483
$wb["email_limits_txt"] = 'Email Limits';
7584
$wb["database_limits_txt"] = 'Database Limits';

0 commit comments

Comments
 (0)