feat(MacAttribute) Use pattern HTML5 attribute for Mac Address as well

issue #5910

include/class_tests.inc

@@ -166,7 +166,7 @@ class tests
    */
   public static function is_mac($mac)
   {
-    return preg_match("/^[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$/i", $mac);
+    return preg_match('/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/', $mac);
   }
 
 

include/simpleplugin/class_helpersAttribute.inc

@@ -118,16 +118,14 @@ class MacAddressAttribute extends StringAttribute
 {
   protected $trim = TRUE;
 
-  function setValue ($value)
+  function __construct ($label, $description, $ldapName, $required = FALSE, $defaultValue = '', $acl = '')
   {
-    return parent::setValue(strtolower($value));
+    parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl, '/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/', '5E:FF:56:A2:AF:15');
   }
 
-  function validate ()
+  function setValue ($value)
   {
-    if (!tests::is_mac($this->value)) {
-      return msgPool::invalid($this->getLabel(), $this->value);
-    }
+    return parent::setValue(strtolower($value));
   }
 }
 

[bmortier]

SonarQube analysis reported 1 issue

• 1 minor

Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

1. Remove this method "__construct" to simply inherit it.

By Ghost User on 2018-10-17T09:08:52 (imported from GitLab)