From 40b6e7a95f38d8e9aa5e55f18ef5ef20b653dd2e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 29 Apr 2015 21:56:17 +0200
Subject: [PATCH] some style fixes (mvc)

---
 .../Base/Validators/IntegerValidator.php      |  4 +--
 .../Base/Validators/MinMaxValidator.php       | 16 +++++-----
 .../mvc/app/models/OPNsense/Core/ACL.php      | 29 ++++++++++++++-----
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php
index d4863f56f..ca66d6700 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/IntegerValidator.php
@@ -36,10 +36,10 @@ use \Phalcon\Validation\Message;
 class IntegerValidator extends Validator implements ValidatorInterface
 {
 
-   /**
+    /**
     * Executes Integer validation
     *
-    * @param Phalcon\Validation $validator
+    * @param \Phalcon\Validation $validator
     * @param string $attribute
     * @return boolean
     */
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php
index 6bac11291..1ac06a778 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Validators/MinMaxValidator.php
@@ -35,14 +35,14 @@ use \Phalcon\Validation\Message;
 
 class MinMaxValidator extends Validator implements ValidatorInterface
 {
-   /**
-   * Executes MinMax validation
-   *
-   * @param Phalcon\Validation $validator
-   * @param string $attribute
-   * @return boolean
-   */
-   public function validate(\Phalcon\Validation $validator, $attribute)
+    /**
+    * Executes MinMax validation
+    *
+    * @param \Phalcon\Validation $validator
+    * @param string $attribute
+    * @return boolean
+    */
+    public function validate(\Phalcon\Validation $validator, $attribute)
     {
         $value = $validator->getValue($attribute);
 
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL.php b/src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
index ad08a6642..640ff74bc 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL.php
@@ -89,7 +89,7 @@ class ACL
                             $this->legacyUsers[$node->name->__toString()]["priv"][] = $legacyPageMap[$priv->__toString()] ;
                         }
                     }
-                }                
+                }
             } elseif ($key == "group") {
                 $groupmap[$node->name->__toString()] = $node ;
             }
@@ -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,21 +143,17 @@ 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;
                     }
-                }                        
+                }
             }
             // search groups
             foreach ($this->legacyUsers[$username]["groups"] as $itemkey => $group) {
                 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;
                             }
                         }