gitlabFork/ISPConfig3.git - Solinfo Gitblit

parent: f6513f0b | patch | commit | ignore whitespace

Marius Burkard

2016-05-04 d933cc2708fe10e648a9b454ba4c0b81ebb606c7

Merge branch 'master' into 'stable-3.1'

allow empty servers (Fixes: #3874)



See merge request !336

3 files modified

	interface/web/client/form/client.tform.php	16 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/client/form/reseller.tform.php	16 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/client/templates/client_template_edit_limits.htm	2 ●●●●● patch \| view \| raw \| blame \| history

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

@@ -594,9 +594,7 @@
                'class'=> 'custom_datasource',
                'function'=> 'client_servers'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_mail_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'mail_servers_used'),
@@ -919,9 +917,7 @@
                'class'=> 'custom_datasource',
                'function'=> 'client_servers'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_web_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'web_servers_used'),
@@ -1141,9 +1137,7 @@
                'class'=> 'custom_datasource',
                'function'=> 'client_servers'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_dns_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'dns_servers_used'),
@@ -1238,9 +1232,7 @@
                'class'=> 'custom_datasource',
                'function'=> 'client_servers'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_db_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'db_servers_used'),

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

@@ -593,9 +593,7 @@
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_mail_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'mail_servers_used'),
@@ -918,9 +916,7 @@
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_web_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'web_servers_used'),
@@ -1138,9 +1134,7 @@
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_dns_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'dns_servers_used'),
@@ -1238,9 +1232,7 @@
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
            'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
                    'errmsg'=> 'no_db_server_error'),
                1 => array ( 'type' => 'CUSTOM',
            'validators'    => array (  0 => array ( 'type' => 'CUSTOM',
                    'class' => 'validate_client',
                    'function' => 'check_used_servers',
                    'errmsg'=> 'db_servers_used'),

 interface/web/client/templates/client_template_edit_limits.htm

@@ -138,7 +138,7 @@
        </a>
      </h4>
    </div>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
      <div class="panel-body">
                <div class="form-group">
                    <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>

			@@ -594,9 +594,7 @@
			'class'=> 'custom_datasource',
			'function'=> 'client_servers'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_mail_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'mail_servers_used'),
			@@ -919,9 +917,7 @@
			'class'=> 'custom_datasource',
			'function'=> 'client_servers'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_web_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'web_servers_used'),
			@@ -1141,9 +1137,7 @@
			'class'=> 'custom_datasource',
			'function'=> 'client_servers'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_dns_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'dns_servers_used'),
			@@ -1238,9 +1232,7 @@
			'class'=> 'custom_datasource',
			'function'=> 'client_servers'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_db_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'db_servers_used'),

			@@ -593,9 +593,7 @@
			'keyfield'=> 'server_id',
			'valuefield'=> 'server_name'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_mail_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'mail_servers_used'),
			@@ -918,9 +916,7 @@
			'keyfield'=> 'server_id',
			'valuefield'=> 'server_name'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_web_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'web_servers_used'),
			@@ -1138,9 +1134,7 @@
			'keyfield'=> 'server_id',
			'valuefield'=> 'server_name'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_dns_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'dns_servers_used'),
			@@ -1238,9 +1232,7 @@
			'keyfield'=> 'server_id',
			'valuefield'=> 'server_name'
			),
			'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
			'errmsg'=> 'no_db_server_error'),
			1 => array ( 'type' => 'CUSTOM',
			'validators' => array ( 0 => array ( 'type' => 'CUSTOM',
			'class' => 'validate_client',
			'function' => 'check_used_servers',
			'errmsg'=> 'db_servers_used'),

			@@ -138,7 +138,7 @@
			</a>
			</h4>
			</div>
			<div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
			<div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
			<div class="panel-body">
			<div class="form-group">
			<label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>