some style fixes (mvc)

src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php

@@ -39,7 +39,7 @@ class IntegerValidator extends Validator implements ValidatorInterface
     /**
     * Executes Integer validation
     *
-    * @param Phalcon\Validation $validator
+    * @param \Phalcon\Validation $validator
     * @param string $attribute
     * @return boolean
     */

src/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php

@@ -38,7 +38,7 @@ class MinMaxValidator extends Validator implements ValidatorInterface
     /**
     * Executes MinMax validation
     *
-   * @param Phalcon\Validation $validator
+    * @param \Phalcon\Validation $validator
     * @param string $attribute
     * @return boolean
     */

src/opnsense/mvc/app/models/OPNsense/Core/ACL.php

@@ -114,6 +114,23 @@ class ACL
         }
     }
 
+    /**
+     * check url against regex mask
+     * @param $url url to match
+     * @param $urlmask regex mask
+     * @return bool url matches mask
+     */
+    private function urlMatch($url, $urlmask)
+    {
+        $match =  str_replace(array(".", "*","?"), array("\.", ".*","\?"), $urlmask);
+        $result = preg_match("@^/{$match}$@", "{$url}");
+        if ($result) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * legacy functionality to check if a page is accessible for the specified user.
      * @param $username user name
@@ -126,9 +143,7 @@ class ACL
             // search user privs
             foreach ($this->legacyUsers[$username]["priv"] as $privset) {
                 foreach ($privset as $urlmask) {
-                    $match =  str_replace(array(".", "*","?"), array("\.", ".*","\?"), $urlmask);
-                    $result = preg_match("@^/{$match}$@", "{$url}");
-                    if ($result) {
+                    if ($this->urlMatch($url, $urlmask)) {
                         return true;
                     }
                 }
@@ -138,9 +153,7 @@ class ACL
                 if (array_key_exists($group, $this->legacyGroupPrivs)) {
                     foreach ($this->legacyGroupPrivs[$group] as $privset) {
                         foreach ($privset as $urlmask) {
-                            $match =  str_replace(array(".", "*","?"), array("\.", ".*","\?"), $urlmask);
-                            $result = preg_match("@^/{$match}$@", "{$url}");
-                            if ($result) {
+                            if ($this->urlMatch($url, $urlmask)) {
                                 return true;
                             }
                         }