Commit cc08f2c1 authored by Florian Schaal's avatar Florian Schaal
Browse files

allow empty servers (Fixes: #3874)

parent 57e9825a

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

+4 −12
Original line number Diff line number Diff line
@@ -594,9 +594,7 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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

+4 −12
Original line number Diff line number Diff line
@@ -593,9 +593,7 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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 @@ $form["tabs"]['limits'] = array ( 
				'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

+1 −1
Original line number Diff line number Diff line
@@ -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>