Tweak validation rules for host names

Fixes #93.
midasplatform · Mar 16, 2015 · 8c0614b · 8c0614b
1 parent af13c8c
commit 8c0614b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/ldap/forms/Admin.php b/modules/ldap/forms/Admin.php
@@ -35,7 +35,7 @@ public function init()
         $hostName->setLabel('LDAP Server Name');
         $hostName->setRequired(true);
         $hostName->addValidator('NotEmpty', true);
-        $hostName->addValidator('Hostname', true);
+        $hostName->addValidator('Hostname', true, array('allow' => Zend_Validate_Hostname::ALLOW_ALL, 'tld' => false));
 
         $port = new Zend_Form_Element_Text(LDAP_PORT_KEY);
         $port->setLabel('LDAP Server Port');
@@ -48,7 +48,7 @@ public function init()
         $backupServer = new Zend_Form_Element_Text(LDAP_BACKUP_SERVER_KEY);
         $backupServer->setLabel('Backup Server Name');
         $backupServer->addValidator('NotEmpty', true);
-        $backupServer->addValidator('Hostname', true);
+        $backupServer->addValidator('Hostname', true, array('allow' => Zend_Validate_Hostname::ALLOW_ALL, 'tld' => false));
 
         $bindRdn = new Zend_Form_Element_Text(LDAP_BIND_RDN_KEY);
         $bindRdn->setLabel('Bind DN');

diff --git a/modules/mail/forms/Admin.php b/modules/mail/forms/Admin.php
@@ -66,7 +66,7 @@ public function init()
         $smtpHost = new Zend_Form_Element_Text(MAIL_SMTP_HOST_KEY);
         $smtpHost->setLabel('Server name');
         $smtpHost->addValidator('NotEmpty', true);
-        $smtpHost->addValidator('Hostname', true);
+        $smtpHost->addValidator('Hostname', true, array('allow' => Zend_Validate_Hostname::ALLOW_ALL, 'tld' => false));
 
         $smtpPort = new Zend_Form_Element_Text(MAIL_SMTP_PORT_KEY);
         $smtpPort->setLabel('Port');

diff --git a/modules/solr/forms/Admin.php b/modules/solr/forms/Admin.php
@@ -35,7 +35,7 @@ public function init()
         $host->setLabel('Solr Host');
         $host->setRequired(true);
         $host->addValidator('NotEmpty', true);
-        $host->addValidator('Hostname', true);
+        $host->addValidator('Hostname', true, array('allow' => Zend_Validate_Hostname::ALLOW_ALL, 'tld' => false));
 
         $port = new Zend_Form_Element_Text(SOLR_PORT_KEY);
         $port->setLabel('Solr Port');