HexMakina / kadro

Router/RouterInterface.class.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
   public function match($requestUrl = null, $requestMethod = null);
   
   // generates URL for href and location
-  public function prehop($route, $route_params=[]);
+  public function prehop($route, $route_params = []);
   
   // heads to another location
-  public function hop($route, $route_params=[]);
+  public function hop($route, $route_params = []);
 
   // do you GET it ?
   public function requests() : bool;

Router/AltoRouter.php

Indentation +261 added lines, -261 removed lines

@@ -2,266 +2,266 @@
 
 class AltoRouter {
 
-	/**
-	 * @var array Array of all routes (incl. named routes).
-	 */
-	protected $routes = [];
-
-	/**
-	 * @var array Array of all named routes.
-	 */
-	protected $namedRoutes = [];
-
-	/**
-	 * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
-	 */
-	protected $basePath = '';
-
-	/**
-	 * @var array Array of default match types (regex helpers)
-	 */
-	protected $matchTypes = array(
-		'i'  => '[0-9]++',
-		'a'  => '[0-9A-Za-z]++',
-		'h'  => '[0-9A-Fa-f]++',
-		'*'  => '.+?',
-		'**' => '.++',
-		''   => '[^/\.]++'
-	);
-
-	/**
-	  * Create router in one call from config.
-	  *
-	  * @param array $routes
-	  * @param string $basePath
-	  * @param array $matchTypes
-	  */
-	public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
-		$this->addRoutes($routes);
-		$this->setBasePath($basePath);
-		$this->addMatchTypes($matchTypes);
-	}
-
-	/**
-	 * Retrieves all routes.
-	 * Useful if you want to process or display routes.
-	 * @return array All routes.
-	 */
-	public function getRoutes() {
-		return $this->routes;
-	}
-
-	/**
-	 * Add multiple routes at once from array in the following format:
-	 *
-	 *   $routes = array(
-	 *      array($method, $route, $target, $name)
-	 *   );
-	 *
-	 * @param array $routes
-	 * @return void
-	 * @author Koen Punt
-	 * @throws Exception
-	 */
-	public function addRoutes($routes){
-		if(!is_array($routes) && !$routes instanceof Traversable) {
-			throw new \Exception('Routes should be an array or an instance of Traversable');
-		}
-		foreach($routes as $route) {
-			call_user_func_array(array($this, 'map'), $route);
-		}
-	}
-
-	/**
-	 * Set the base path.
-	 * Useful if you are running your application from a subdirectory.
-	 */
-	public function setBasePath($basePath) {
-		$this->basePath = $basePath;
-	}
-
-	/**
-	 * Add named match types. It uses array_merge so keys can be overwritten.
-	 *
-	 * @param array $matchTypes The key is the name and the value is the regex.
-	 */
-	public function addMatchTypes($matchTypes) {
-		$this->matchTypes = array_merge($this->matchTypes, $matchTypes);
-	}
-
-	/**
-	 * Map a route to a target
-	 *
-	 * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
-	 * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
-	 * @param mixed $target The target where this route should point to. Can be anything.
-	 * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
-	 * @throws Exception
-	 */
-	public function map($method, $route, $target, $name = null) {
-
-		$this->routes[] = array($method, $route, $target, $name);
-
-		if($name) {
-			if(isset($this->namedRoutes[$name])) {
-				throw new \Exception("Can not redeclare route '{$name}'");
-			} else {
-				$this->namedRoutes[$name] = $route;
-			}
-
-		}
-
-		return;
-	}
-
-	/**
-	 * Reversed routing
-	 *
-	 * Generate the URL for a named route. Replace regexes with supplied parameters
-	 *
-	 * @param string $routeName The name of the route.
-	 * @param array @params Associative array of parameters to replace placeholders with.
-	 * @return string The URL of the route with named parameters in place.
-	 * @throws Exception
-	 */
-	public function generate($routeName, array $params = array()) {
-
-		// Check if named route exists
-		if(!isset($this->namedRoutes[$routeName])) {
-			throw new \Exception("Route '{$routeName}' does not exist.");
-		}
-
-		// Replace named parameters
-		$route = $this->namedRoutes[$routeName];
-
-		// prepend base path to route url again
-		$url = $this->basePath . $route;
-
-		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-
-			foreach($matches as $match) {
-				list($block, $pre, $type, $param, $optional) = $match;
-
-				if ($pre) {
-					$block = substr($block, 1);
-				}
-
-				if(isset($params[$param])) {
-					$url = str_replace($block, $params[$param], $url);
-				} elseif ($optional) {
-					$url = str_replace($pre . $block, '', $url);
-				}
-			}
-
-
-		}
-
-		return $url;
-	}
-
-	/**
-	 * Match a given Request Url against stored routes
-	 * @param string $requestUrl
-	 * @param string $requestMethod
-	 * @return array|boolean Array with route information on success, false on failure (no match).
-	 */
-	public function match($requestUrl = null, $requestMethod = null) {
-
-		$params = [];
-		$match = false;
-
-		// set Request Url if it isn't passed as parameter
-		if($requestUrl === null) {
-			$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
-		}
-
-		// strip base path from request url
-		$requestUrl = substr($requestUrl, strlen($this->basePath));
+  /**
+   * @var array Array of all routes (incl. named routes).
+   */
+  protected $routes = [];
+
+  /**
+   * @var array Array of all named routes.
+   */
+  protected $namedRoutes = [];
+
+  /**
+   * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host)
+   */
+  protected $basePath = '';
+
+  /**
+   * @var array Array of default match types (regex helpers)
+   */
+  protected $matchTypes = array(
+    'i'  => '[0-9]++',
+    'a'  => '[0-9A-Za-z]++',
+    'h'  => '[0-9A-Fa-f]++',
+    '*'  => '.+?',
+    '**' => '.++',
+    ''   => '[^/\.]++'
+  );
+
+  /**
+   * Create router in one call from config.
+   *
+   * @param array $routes
+   * @param string $basePath
+   * @param array $matchTypes
+   */
+  public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
+    $this->addRoutes($routes);
+    $this->setBasePath($basePath);
+    $this->addMatchTypes($matchTypes);
+  }
+
+  /**
+   * Retrieves all routes.
+   * Useful if you want to process or display routes.
+   * @return array All routes.
+   */
+  public function getRoutes() {
+    return $this->routes;
+  }
+
+  /**
+   * Add multiple routes at once from array in the following format:
+   *
+   *   $routes = array(
+   *      array($method, $route, $target, $name)
+   *   );
+   *
+   * @param array $routes
+   * @return void
+   * @author Koen Punt
+   * @throws Exception
+   */
+  public function addRoutes($routes){
+    if(!is_array($routes) && !$routes instanceof Traversable) {
+      throw new \Exception('Routes should be an array or an instance of Traversable');
+    }
+    foreach($routes as $route) {
+      call_user_func_array(array($this, 'map'), $route);
+    }
+  }
+
+  /**
+   * Set the base path.
+   * Useful if you are running your application from a subdirectory.
+   */
+  public function setBasePath($basePath) {
+    $this->basePath = $basePath;
+  }
+
+  /**
+   * Add named match types. It uses array_merge so keys can be overwritten.
+   *
+   * @param array $matchTypes The key is the name and the value is the regex.
+   */
+  public function addMatchTypes($matchTypes) {
+    $this->matchTypes = array_merge($this->matchTypes, $matchTypes);
+  }
+
+  /**
+   * Map a route to a target
+   *
+   * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE)
+   * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id]
+   * @param mixed $target The target where this route should point to. Can be anything.
+   * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application.
+   * @throws Exception
+   */
+  public function map($method, $route, $target, $name = null) {
+
+    $this->routes[] = array($method, $route, $target, $name);
+
+    if($name) {
+      if(isset($this->namedRoutes[$name])) {
+        throw new \Exception("Can not redeclare route '{$name}'");
+      } else {
+        $this->namedRoutes[$name] = $route;
+      }
+
+    }
+
+    return;
+  }
+
+  /**
+   * Reversed routing
+   *
+   * Generate the URL for a named route. Replace regexes with supplied parameters
+   *
+   * @param string $routeName The name of the route.
+   * @param array @params Associative array of parameters to replace placeholders with.
+   * @return string The URL of the route with named parameters in place.
+   * @throws Exception
+   */
+  public function generate($routeName, array $params = array()) {
+
+    // Check if named route exists
+    if(!isset($this->namedRoutes[$routeName])) {
+      throw new \Exception("Route '{$routeName}' does not exist.");
+    }
+
+    // Replace named parameters
+    $route = $this->namedRoutes[$routeName];
+
+    // prepend base path to route url again
+    $url = $this->basePath . $route;
+
+    if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+
+      foreach($matches as $match) {
+        list($block, $pre, $type, $param, $optional) = $match;
+
+        if ($pre) {
+          $block = substr($block, 1);
+        }
+
+        if(isset($params[$param])) {
+          $url = str_replace($block, $params[$param], $url);
+        } elseif ($optional) {
+          $url = str_replace($pre . $block, '', $url);
+        }
+      }
+
+
+    }
+
+    return $url;
+  }
+
+  /**
+   * Match a given Request Url against stored routes
+   * @param string $requestUrl
+   * @param string $requestMethod
+   * @return array|boolean Array with route information on success, false on failure (no match).
+   */
+  public function match($requestUrl = null, $requestMethod = null) {
+
+    $params = [];
+    $match = false;
+
+    // set Request Url if it isn't passed as parameter
+    if($requestUrl === null) {
+      $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
+    }
+
+    // strip base path from request url
+    $requestUrl = substr($requestUrl, strlen($this->basePath));
     
-		// Strip query string (?a=b) from Request Url
-		if (($strpos = strpos($requestUrl, '?')) !== false) {
-			$requestUrl = substr($requestUrl, 0, $strpos);
-		}
-
-		// set Request Method if it isn't passed as a parameter
-		if($requestMethod === null) {
-			$requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
-		}
-
-		foreach($this->routes as $handler) {
-			list($methods, $route, $target, $name) = $handler;
-			$method_match = (stripos($methods, $requestMethod) !== false);
-
-			// Method did not match, continue to next route.
-			if (!$method_match) continue;
-
-			if ($route === '*') {
-				// * wildcard (matches all)
-				$match = true;
-			} elseif (isset($route[0]) && $route[0] === '@') {
-				// @ regex delimiter
-				$pattern = '`' . substr($route, 1) . '`u';
-				$match = preg_match($pattern, $requestUrl, $params) === 1;
-			} elseif (($position = strpos($route, '[')) === false) {
-				// No params in url, do string comparison
-				$match = strcmp($requestUrl, $route) === 0;
-			} else {
-				// Compare longest non-param string with url
-				if (strncmp($requestUrl, $route, $position) !== 0) {
-					continue;
-				}
-				$regex = $this->compileRoute($route);
-				$match = preg_match($regex, $requestUrl, $params) === 1;
-			}
-
-			if ($match) {
-
-				if ($params) {
-					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
-					}
-				}
-
-				return array(
-					'target' => $target,
-					'params' => $params,
-					'name' => $name
-				);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Compile the regex for a given route (EXPENSIVE)
-	 */
-	private function compileRoute($route) {
-		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-
-			$matchTypes = $this->matchTypes;
-			foreach($matches as $match) {
-				list($block, $pre, $type, $param, $optional) = $match;
-
-				if (isset($matchTypes[$type])) {
-					$type = $matchTypes[$type];
-				}
-				if ($pre === '.') {
-					$pre = '\.';
-				}
-
-				//Older versions of PCRE require the 'P' in (?P<named>)
-				$pattern = '(?:'
-						. ($pre !== '' ? $pre : null)
-						. '('
-						. ($param !== '' ? "?P<$param>" : null)
-						. $type
-						. '))'
-						. ($optional !== '' ? '?' : null);
-
-				$route = str_replace($block, $pattern, $route);
-			}
-
-		}
-		return "`^$route$`u";
-	}
+    // Strip query string (?a=b) from Request Url
+    if (($strpos = strpos($requestUrl, '?')) !== false) {
+      $requestUrl = substr($requestUrl, 0, $strpos);
+    }
+
+    // set Request Method if it isn't passed as a parameter
+    if($requestMethod === null) {
+      $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
+    }
+
+    foreach($this->routes as $handler) {
+      list($methods, $route, $target, $name) = $handler;
+      $method_match = (stripos($methods, $requestMethod) !== false);
+
+      // Method did not match, continue to next route.
+      if (!$method_match) continue;
+
+      if ($route === '*') {
+        // * wildcard (matches all)
+        $match = true;
+      } elseif (isset($route[0]) && $route[0] === '@') {
+        // @ regex delimiter
+        $pattern = '`' . substr($route, 1) . '`u';
+        $match = preg_match($pattern, $requestUrl, $params) === 1;
+      } elseif (($position = strpos($route, '[')) === false) {
+        // No params in url, do string comparison
+        $match = strcmp($requestUrl, $route) === 0;
+      } else {
+        // Compare longest non-param string with url
+        if (strncmp($requestUrl, $route, $position) !== 0) {
+          continue;
+        }
+        $regex = $this->compileRoute($route);
+        $match = preg_match($regex, $requestUrl, $params) === 1;
+      }
+
+      if ($match) {
+
+        if ($params) {
+          foreach($params as $key => $value) {
+            if(is_numeric($key)) unset($params[$key]);
+          }
+        }
+
+        return array(
+          'target' => $target,
+          'params' => $params,
+          'name' => $name
+        );
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Compile the regex for a given route (EXPENSIVE)
+   */
+  private function compileRoute($route) {
+    if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+
+      $matchTypes = $this->matchTypes;
+      foreach($matches as $match) {
+        list($block, $pre, $type, $param, $optional) = $match;
+
+        if (isset($matchTypes[$type])) {
+          $type = $matchTypes[$type];
+        }
+        if ($pre === '.') {
+          $pre = '\.';
+        }
+
+        //Older versions of PCRE require the 'P' in (?P<named>)
+        $pattern = '(?:'
+            . ($pre !== '' ? $pre : null)
+            . '('
+            . ($param !== '' ? "?P<$param>" : null)
+            . $type
+            . '))'
+            . ($optional !== '' ? '?' : null);
+
+        $route = str_replace($block, $pattern, $route);
+      }
+
+    }
+    return "`^$route$`u";
+  }
 }

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 	  * @param string $basePath
 	  * @param array $matchTypes
 	  */
-	public function __construct( $routes = array(), $basePath = '', $matchTypes = array() ) {
+	public function __construct($routes = array(), $basePath = '', $matchTypes = array()) {
 		$this->addRoutes($routes);
 		$this->setBasePath($basePath);
 		$this->addMatchTypes($matchTypes);
@@ -63,11 +63,11 @@ 
 	 * @author Koen Punt
 	 * @throws Exception
 	 */
-	public function addRoutes($routes){
-		if(!is_array($routes) && !$routes instanceof Traversable) {
+	public function addRoutes($routes) {
+		if (!is_array($routes) && !$routes instanceof Traversable) {
 			throw new \Exception('Routes should be an array or an instance of Traversable');
 		}
-		foreach($routes as $route) {
+		foreach ($routes as $route) {
 			call_user_func_array(array($this, 'map'), $route);
 		}
 	}
@@ -102,8 +102,8 @@ 
 
 		$this->routes[] = array($method, $route, $target, $name);
 
-		if($name) {
-			if(isset($this->namedRoutes[$name])) {
+		if ($name) {
+			if (isset($this->namedRoutes[$name])) {
 				throw new \Exception("Can not redeclare route '{$name}'");
 			} else {
 				$this->namedRoutes[$name] = $route;
@@ -127,7 +127,7 @@ 
 	public function generate($routeName, array $params = array()) {
 
 		// Check if named route exists
-		if(!isset($this->namedRoutes[$routeName])) {
+		if (!isset($this->namedRoutes[$routeName])) {
 			throw new \Exception("Route '{$routeName}' does not exist.");
 		}
 
@@ -135,21 +135,21 @@ 
 		$route = $this->namedRoutes[$routeName];
 
 		// prepend base path to route url again
-		$url = $this->basePath . $route;
+		$url = $this->basePath.$route;
 
 		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
 
-			foreach($matches as $match) {
+			foreach ($matches as $match) {
 				list($block, $pre, $type, $param, $optional) = $match;
 
 				if ($pre) {
 					$block = substr($block, 1);
 				}
 
-				if(isset($params[$param])) {
+				if (isset($params[$param])) {
 					$url = str_replace($block, $params[$param], $url);
 				} elseif ($optional) {
-					$url = str_replace($pre . $block, '', $url);
+					$url = str_replace($pre.$block, '', $url);
 				}
 			}
 
@@ -171,7 +171,7 @@ 
 		$match = false;
 
 		// set Request Url if it isn't passed as parameter
-		if($requestUrl === null) {
+		if ($requestUrl === null) {
 			$requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/';
 		}
 
@@ -184,11 +184,11 @@ 
 		}
 
 		// set Request Method if it isn't passed as a parameter
-		if($requestMethod === null) {
+		if ($requestMethod === null) {
 			$requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
 		}
 
-		foreach($this->routes as $handler) {
+		foreach ($this->routes as $handler) {
 			list($methods, $route, $target, $name) = $handler;
 			$method_match = (stripos($methods, $requestMethod) !== false);
 
@@ -200,7 +200,7 @@ 
 				$match = true;
 			} elseif (isset($route[0]) && $route[0] === '@') {
 				// @ regex delimiter
-				$pattern = '`' . substr($route, 1) . '`u';
+				$pattern = '`'.substr($route, 1).'`u';
 				$match = preg_match($pattern, $requestUrl, $params) === 1;
 			} elseif (($position = strpos($route, '[')) === false) {
 				// No params in url, do string comparison
@@ -217,8 +217,8 @@ 
 			if ($match) {
 
 				if ($params) {
-					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
+					foreach ($params as $key => $value) {
+						if (is_numeric($key)) unset($params[$key]);
 					}
 				}
 
@@ -239,7 +239,7 @@ 
 		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
 
 			$matchTypes = $this->matchTypes;
-			foreach($matches as $match) {
+			foreach ($matches as $match) {
 				list($block, $pre, $type, $param, $optional) = $match;
 
 				if (isset($matchTypes[$type])) {

Braces +6 added lines, -2 removed lines

@@ -193,7 +193,9 @@ 
 			$method_match = (stripos($methods, $requestMethod) !== false);
 
 			// Method did not match, continue to next route.
-			if (!$method_match) continue;
+			if (!$method_match) {
+			  continue;
+			}
 
 			if ($route === '*') {
 				// * wildcard (matches all)
@@ -218,7 +220,9 @@ 
 
 				if ($params) {
 					foreach($params as $key => $value) {
-						if(is_numeric($key)) unset($params[$key]);
+						if(is_numeric($key)) {
+						  unset($params[$key]);
+						}
 					}
 				}
 

Controllers/OperatorController.class.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 namespace HexMakina\kadro\Controllers;
 
 use \HexMakina\Crudites\Crudites;
-use \HexMakina\kadro\Auth\{Operator,OperatorInterface,ACL,AccessRefusedException};
+use \HexMakina\kadro\Auth\{Operator, OperatorInterface, ACL, AccessRefusedException};
 
 
 class OperatorController extends \HexMakina\kadro\Controllers\ORMController
@@ -23,7 +23,7 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
+    if (is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
       $this->authorize('group_admin');
 
   }
@@ -35,7 +35,7 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
+    if ($this->operator()->operator_id() !== $this->form_model->operator_id())
       $this->authorize('group_admin');
 
     parent::save();
@@ -44,7 +44,7 @@ 
   public function before_save() : array
   {
     //------------------------------------------------------------- PASSWORDS
-    if($this->form_model->get('password') != $this->form_model->get('password_verification'))
+    if ($this->form_model->get('password') != $this->form_model->get('password_verification'))
     {
       $this->logger()->warning('KADRO_operator_ERR_PASSWORDS_MISMATCH');
       return $this->edit();
@@ -58,7 +58,7 @@ 
   public function dashboard()
   {
     $real_operator_class = get_class($this->operator());
-    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null,'username', 'ASC']]));
+    $this->viewport('users', $real_operator_class::filter([], ['order_by' => [null, 'username', 'ASC']]));
   }
 
   public function destroy()
@@ -71,10 +71,10 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
-    if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
+    if (Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice($confirmation_message, [$operator->get('name')]);
@@ -92,14 +92,14 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one(['username' => $this->router()->params('username')]);
-    if($operator->username() == $this->operator()->username())
+    if ($operator->username() == $this->operator()->username())
       throw new AccessRefusedException();
 
     $permission_id = $this->router()->params('permission_id');
 
     $row_data = ['operator_id' => $operator->operator_id(), 'permission_id' => $permission_id];
     $row = ACL::table()->restore($row_data);
-    if($row->is_new())
+    if ($row->is_new())
     {
       $row = ACL::table()->produce($row_data);
       $res = $row->persist();

Braces +14 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
     parent::edit();
 
     // do we create? or do we edit someone else ? must be admin
-    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id())
-      $this->authorize('group_admin');
+    if(is_null($this->load_model) || $this->operator()->operator_id() !== $this->load_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
   }
 
@@ -35,8 +36,9 @@ 
 
   public function save()
   {
-    if($this->operator()->operator_id() !== $this->form_model->operator_id())
-      $this->authorize('group_admin');
+    if($this->operator()->operator_id() !== $this->form_model->operator_id()) {
+          $this->authorize('group_admin');
+    }
 
     parent::save();
   }
@@ -71,15 +73,15 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one($this->router()->params());
-    if($operator->username() == $this->operator()->username())
-      throw new AccessRefusedException();
+    if($operator->username() == $this->operator()->username()) {
+          throw new AccessRefusedException();
+    }
 
     if(Operator::toggle_boolean(Operator::table_name(), 'active', $operator->operator_id()) === true)
     {
       $confirmation_message = $operator->is_active() ? 'KADRO_operator_DISABLED' : 'KADRO_operator_ENABLED';
       $this->logger()->nice($confirmation_message, [$operator->get('name')]);
-    }
-    else
+    } else
     {
       $this->logger()->warning('CRUDITES_ERR_QUERY_FAILED');
     }
@@ -92,8 +94,9 @@ 
     parent::authorize('group_admin');
 
     $operator = Operator::one(['username' => $this->router()->params('username')]);
-    if($operator->username() == $this->operator()->username())
-      throw new AccessRefusedException();
+    if($operator->username() == $this->operator()->username()) {
+          throw new AccessRefusedException();
+    }
 
     $permission_id = $this->router()->params('permission_id');
 
@@ -103,8 +106,7 @@ 
     {
       $row = ACL::table()->produce($row_data);
       $res = $row->persist();
-    }
-    else
+    } else
     {
       $row->wipe();
     }

Controllers/TradukoController.class.php

Indentation +3 added lines, -3 removed lines

@@ -15,9 +15,9 @@
   }
 
   public function route_back($route_name = NULL, $route_params = []) : string
-	{
-		return $this->router()->prehop('traduko');
-	}
+  {
+    return $this->router()->prehop('traduko');
+  }
 
   public function update_file($lang='fra')
   {

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 		return $this->router()->prehop('traduko');
 	}
 
-  public function update_file($lang='fra')
+  public function update_file($lang = 'fra')
   {
     $locale_path = $this->box('settings.locale_data_path');
     self::create_file($locale_path, $lang);
@@ -32,11 +32,11 @@ 
   {
     $res = Traduko::filter(['lang' => $lang]);
     $assoc = [];
-    foreach($res as $id => $trad)
+    foreach ($res as $id => $trad)
     {
-      if(!isset($assoc[$trad->kategorio]))
+      if (!isset($assoc[$trad->kategorio]))
         $assoc[$trad->kategorio] = [];
-      if(!isset($assoc[$trad->kategorio][$trad->sekcio]))
+      if (!isset($assoc[$trad->kategorio][$trad->sekcio]))
         $assoc[$trad->kategorio][$trad->sekcio] = [];
 
       $assoc[$trad->kategorio][$trad->sekcio][$trad->referenco] = $trad->$lang;
@@ -46,7 +46,7 @@ 
     // {
     $path_to_file = $locale_path.'/'.$lang;
     // test directory access & creation
-    if(!JSON::exists($path_to_file))
+    if (!JSON::exists($path_to_file))
       JSON::make_dir($path_to_file);
 
     $file = new JSON($path_to_file.'/'.self::JSON_FILENAME, 'w+');
@@ -61,7 +61,7 @@ 
   public static function init($locale_path)
   {
     $languages = array_keys(array_slice(Traduko::inspect(Traduko::table_name())->columns(), 4));
-    foreach($languages as $l)
+    foreach ($languages as $l)
       self::create_file($locale_path, $l);
 
     return $languages;

Braces +12 added lines, -8 removed lines

@@ -34,10 +34,12 @@ 
     $assoc = [];
     foreach($res as $id => $trad)
     {
-      if(!isset($assoc[$trad->kategorio]))
-        $assoc[$trad->kategorio] = [];
-      if(!isset($assoc[$trad->kategorio][$trad->sekcio]))
-        $assoc[$trad->kategorio][$trad->sekcio] = [];
+      if(!isset($assoc[$trad->kategorio])) {
+              $assoc[$trad->kategorio] = [];
+      }
+      if(!isset($assoc[$trad->kategorio][$trad->sekcio])) {
+              $assoc[$trad->kategorio][$trad->sekcio] = [];
+      }
 
       $assoc[$trad->kategorio][$trad->sekcio][$trad->referenco] = $trad->$lang;
     }
@@ -46,8 +48,9 @@ 
     // {
     $path_to_file = $locale_path.'/'.$lang;
     // test directory access & creation
-    if(!JSON::exists($path_to_file))
-      JSON::make_dir($path_to_file);
+    if(!JSON::exists($path_to_file)) {
+          JSON::make_dir($path_to_file);
+    }
 
     $file = new JSON($path_to_file.'/'.self::JSON_FILENAME, 'w+');
     $file->set_content(JSON::from_php($assoc));
@@ -61,8 +64,9 @@ 
   public static function init($locale_path)
   {
     $languages = array_keys(array_slice(Traduko::inspect(Traduko::table_name())->columns(), 4));
-    foreach($languages as $l)
-      self::create_file($locale_path, $l);
+    foreach($languages as $l) {
+          self::create_file($locale_path, $l);
+    }
 
     return $languages;
   }

Controllers/Interfaces/CRUDController.class.php

Indentation +6 added lines, -6 removed lines

@@ -4,14 +4,14 @@
 
 interface CRUDController
 {
-   public function dashboard();
-   public function edit();
-   public function save();
-   public function listing();
+    public function dashboard();
+    public function edit();
+    public function save();
+    public function listing();
 
-   public function destroy();
+    public function destroy();
 
-   public function errors() : array;
+    public function errors() : array;
 }
 
 ?>

Controllers/Interfaces/DisplayController.class.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 interface DisplayController extends BaseController
 {
 
-   /*
+    /*
       The viewport is an associative array of values to be exported as variables in the view
          the assoc keys will be the variable names
 
@@ -42,9 +42,9 @@ 
            returns null
    */
    
-   public function viewport($key=null, $value=null, $coercion=false);
+    public function viewport($key=null, $value=null, $coercion=false);
 
-   public function display($custom_template = null, $standalone=false);
+    public function display($custom_template = null, $standalone=false);
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -42,9 +42,9 @@
            returns null
    */
    
-   public function viewport($key=null, $value=null, $coercion=false);
+   public function viewport($key = null, $value = null, $coercion = false);
 
-   public function display($custom_template = null, $standalone=false);
+   public function display($custom_template = null, $standalone = false);
 
 }
 

Controllers/Paginator.class.php

Indentation +7 added lines, -7 removed lines

@@ -7,8 +7,8 @@ 
 {
   protected static function prepare_pagination($records_total)
   {
-  	global $settings;
-  	global $smarty;
+    global $settings;
+    global $smarty;
 
     $pages_max_on_each_side = 3;
     $pages_max_displayed = $pages_max_on_each_side*2+1;
@@ -35,12 +35,12 @@ 
     if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
 
-  	$this->viewport("pages_total",     $pages_total);
-  	$this->viewport("pages_first",     $pages_first);
+    $this->viewport("pages_total",     $pages_total);
+    $this->viewport("pages_first",     $pages_first);
     $this->viewport("pages_previous",  $pages_current <= 1 ? $pages_total : $pages_current - 1);
-  	$this->viewport("pages_current",   $pages_current);
-  	$this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
-  	$this->viewport("pages_last",      $pages_last);
+    $this->viewport("pages_current",   $pages_current);
+    $this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
+    $this->viewport("pages_last",      $pages_last);
   }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -11,36 +11,36 @@
   	global $smarty;
 
     $pages_max_on_each_side = 3;
-    $pages_max_displayed = $pages_max_on_each_side*2+1;
+    $pages_max_displayed = $pages_max_on_each_side * 2+1;
 
     // are we paginating ?
 
-    if(is_null($this->box('StateAgent')->filters('results_per_page')))
+    if (is_null($this->box('StateAgent')->filters('results_per_page')))
       return;
 
     $pages_range    = intval($this->box('StateAgent')->filters('results_per_page'));
     $pages_total    = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1;
     $pages_current  = intval($this->box('StateAgent')->filters('page'));
 
-    if($pages_current >= $pages_total)
+    if ($pages_current >= $pages_total)
       $pages_current = $pages_total;
 
-    $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side;
+    $pages_first = ($pages_current <= $pages_max_on_each_side) ? 1 : $pages_current-$pages_max_on_each_side;
 
-    $pages_last = $pages_current + $pages_max_on_each_side;
+    $pages_last = $pages_current+$pages_max_on_each_side;
 
-    if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
+    if ($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
       $pages_last += $pages_max_displayed-$pages_last;
 
-    if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
+    if ($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
 
-  	$this->viewport("pages_total",     $pages_total);
-  	$this->viewport("pages_first",     $pages_first);
-    $this->viewport("pages_previous",  $pages_current <= 1 ? $pages_total : $pages_current - 1);
-  	$this->viewport("pages_current",   $pages_current);
-  	$this->viewport("pages_next",      $pages_current >= $pages_total ? 1 : $pages_current + 1);
-  	$this->viewport("pages_last",      $pages_last);
+  	$this->viewport("pages_total", $pages_total);
+  	$this->viewport("pages_first", $pages_first);
+    $this->viewport("pages_previous", $pages_current <= 1 ? $pages_total : $pages_current-1);
+  	$this->viewport("pages_current", $pages_current);
+  	$this->viewport("pages_next", $pages_current >= $pages_total ? 1 : $pages_current+1);
+  	$this->viewport("pages_last", $pages_last);
   }
 
 }

Braces +12 added lines, -6 removed lines

@@ -15,25 +15,31 @@
 
     // are we paginating ?
 
-    if(is_null($this->box('StateAgent')->filters('results_per_page')))
-      return;
+    if(is_null($this->box('StateAgent')->filters('results_per_page'))) {
+          return;
+    }
 
     $pages_range    = intval($this->box('StateAgent')->filters('results_per_page'));
     $pages_total    = $pages_range > 0 ? intval(ceil($records_total / $pages_range)) : 1;
     $pages_current  = intval($this->box('StateAgent')->filters('page'));
 
-    if($pages_current >= $pages_total)
-      $pages_current = $pages_total;
+    if($pages_current >= $pages_total) {
+          $pages_current = $pages_total;
+    }
 
     $pages_first = ($pages_current <= $pages_max_on_each_side)? 1 : $pages_current - $pages_max_on_each_side;
 
     $pages_last = $pages_current + $pages_max_on_each_side;
 
-    if($pages_last < $pages_max_displayed) // add the missing pages to fullfill $pages_max_displayed
+    if($pages_last < $pages_max_displayed) {
+      // add the missing pages to fullfill $pages_max_displayed
       $pages_last += $pages_max_displayed-$pages_last;
+    }
 
-    if($pages_last > $pages_total) // $pages_max_displayed greater than the total of pages
+    if($pages_last > $pages_total) {
+      // $pages_max_displayed greater than the total of pages
       $pages_last = $pages_total;
+    }
 
   	$this->viewport("pages_total",     $pages_total);
   	$this->viewport("pages_first",     $pages_first);

Controllers/KadroController.class.php

Indentation +13 added lines, -13 removed lines

@@ -107,18 +107,18 @@ 
     $custom_template = null;
 
     if(method_exists($this, 'prepare'))
-    	$this->prepare();
+      $this->prepare();
 
-  	if(method_exists($this, $method = $this->router()->target_method()))
+    if(method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
     if(method_exists($this, 'conclude'))
-    	$this->conclude();
+      $this->conclude();
 
     if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+      $template = $this->display($custom_template);
   }
 
   public function conclude(){}
@@ -143,16 +143,16 @@ 
 
     $template = $this->find_template($smarty, $custom_template); // throws Exception if nothing found
 
-		$this->viewport('controller', $this);
+    $this->viewport('controller', $this);
 
     $this->viewport('user_messages', $this->logger()->get_user_report());
 
 
-  	$this->viewport('file_root', $this->router()->file_root());
-  	$this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
-  	$this->viewport('web_root', $this->router()->web_root());
-  	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
-  	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
+    $this->viewport('file_root', $this->router()->file_root());
+    $this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
+    $this->viewport('web_root', $this->router()->web_root());
+    $this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
+    $this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
 
     foreach($this->viewport() as $template_var_name => $value)
       $smarty->assign($template_var_name, $value);
@@ -227,12 +227,12 @@ 
    *
    */
   public function route_back($route_name=null, $route_params=[]) : string
-	{
+  {
     if(is_null($route_name))
-		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+      return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
-	}
+  }
 
   public function route_factory($route_name=null, $route_params=[]) : string
   {

Spacing +45 added lines, -45 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HexMakina\kadro\Controllers;
 
-use \Psr\Container\{ContainerInterface,ContainerExceptionInterface,NotFoundExceptionInterface};
+use \Psr\Container\{ContainerInterface, ContainerExceptionInterface, NotFoundExceptionInterface};
 
 use \HexMakina\kadro\Auth\{OperatorInterface, AccessRefusedException};
 use \HexMakina\kadro\Router\RouterInterface;
@@ -15,7 +15,7 @@ 
 
   protected $route_back = null;
 
-  public function __toString(){ return get_called_class();}
+  public function __toString() { return get_called_class(); }
 
   // -------- Controller Container
   public function set_container(ContainerInterface $container)
@@ -29,9 +29,9 @@ 
   }
 
   // shortcut for (un)boxing
-  public function box($key, $instance=null)
+  public function box($key, $instance = null)
   {
-    if(!is_null($instance))
+    if (!is_null($instance))
       $this->container->register($key, $instance);
 
     // dd($this->container->get($key));
@@ -61,32 +61,32 @@ 
     return true; // security by default
   }
 
-  public function authorize($permission=null)
+  public function authorize($permission = null)
   {
     // if(!$this->requires_operator() || is_null($permission))
-    if(!$this->requires_operator())
+    if (!$this->requires_operator())
       return true;
 
     $operator = $this->operator();
-    if(is_null($operator) || $operator->is_new() || !$operator->is_active())
+    if (is_null($operator) || $operator->is_new() || !$operator->is_active())
       throw new AccessRefusedException();
 
-    if(!is_null($permission) && !$operator->has_permission($permission))
+    if (!is_null($permission) && !$operator->has_permission($permission))
       throw new AccessRefusedException();
 
     return true;
   }
 
-  public function viewport($key=null, $value=null, $coercion=false)
+  public function viewport($key = null, $value = null, $coercion = false)
   {
     // no key, returns all
-    if(is_null($key))
+    if (is_null($key))
       return $this->template_variables;
 
     // got key, got null value, returns $[$key]
-    if(is_null($value))
+    if (is_null($value))
     {
-      if($coercion === true) // break rule 1 ?
+      if ($coercion === true) // break rule 1 ?
         $this->template_variables[$key] = null;
 
       return $this->template_variables[$key] ?? null;
@@ -94,7 +94,7 @@ 
 
     // got key, got value
     // sets or coerces $[$key]=$value and returns $[$key]
-    if(!isset($this->template_variables[$key]) || $coercion === true)
+    if (!isset($this->template_variables[$key]) || $coercion === true)
       $this->template_variables[$key] = $value;
 
     return $this->template_variables[$key] ?? null;
@@ -106,22 +106,22 @@ 
 
     $custom_template = null;
 
-    if(method_exists($this, 'prepare'))
+    if (method_exists($this, 'prepare'))
     	$this->prepare();
 
-  	if(method_exists($this, $method = $this->router()->target_method()))
+  	if (method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
-    if(method_exists($this, 'conclude'))
+    if (method_exists($this, 'conclude'))
     	$this->conclude();
 
-    if(method_exists($this, 'display'))
+    if (method_exists($this, 'display'))
     	$template = $this->display($custom_template);
   }
 
-  public function conclude(){}
+  public function conclude() {}
 
   public function prepare()
   {
@@ -130,14 +130,14 @@ 
 
   private function trim_request_data()
   {
-    array_walk_recursive($_GET, function(&$value){$value = trim($value);});
-    array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);});
+    array_walk_recursive($_GET, function(&$value) {$value = trim($value); });
+    array_walk_recursive($_REQUEST, function(&$value) {$value = trim($value); });
 
-    if($this->router()->submits())
-      array_walk_recursive($_POST, function(&$value){$value = trim($value);});
+    if ($this->router()->submits())
+      array_walk_recursive($_POST, function(&$value) {$value = trim($value); });
   }
 
-  public function display($custom_template = null, $standalone=false)
+  public function display($custom_template = null, $standalone = false)
   {
     $smarty = $this->box('template_engine');
 
@@ -149,15 +149,15 @@ 
 
 
   	$this->viewport('file_root', $this->router()->file_root());
-  	$this->viewport('view_path', $this->router()->file_root() . $this->box('settings.smarty.template_path').'app/');
+  	$this->viewport('view_path', $this->router()->file_root().$this->box('settings.smarty.template_path').'app/');
   	$this->viewport('web_root', $this->router()->web_root());
-  	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
-  	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
+  	$this->viewport('view_url', $this->router()->web_root().$this->box('settings.smarty.template_path'));
+  	$this->viewport('images_url', $this->router()->web_root().$this->box('settings.smarty.template_path').'images/');
 
-    foreach($this->viewport() as $template_var_name => $value)
+    foreach ($this->viewport() as $template_var_name => $value)
       $smarty->assign($template_var_name, $value);
 
-    if($standalone === false)
+    if ($standalone === false)
     {
       $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template));
     }
@@ -180,32 +180,32 @@ 
     $controller_template_path = $this->template_base();
     $templates = [];
 
-    if(!empty($custom_template))
+    if (!empty($custom_template))
     {
       // 1. check for custom template in the current controller directory
-      $templates ['custom_3']= sprintf('%s/%s.html', $controller_template_path, $custom_template);
+      $templates ['custom_3'] = sprintf('%s/%s.html', $controller_template_path, $custom_template);
       // 2. check for custom template formatted as controller/view
-      $templates ['custom_2']= $custom_template.'.html';
-      $templates ['custom_1']= '_layouts/'.$custom_template.'.html';
+      $templates ['custom_2'] = $custom_template.'.html';
+      $templates ['custom_1'] = '_layouts/'.$custom_template.'.html';
     }
 
-    if(!empty($this->router()->target_method()))
+    if (!empty($this->router()->target_method()))
     {
       // 1. check for template in controller-related directory
-      $templates ['target_1']= sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method());
+      $templates ['target_1'] = sprintf('%s/%s.html', $controller_template_path, $this->router()->target_method());
       // 2. check for template in app-related directory
-      $templates ['target_2']= sprintf('_layouts/%s.html', $this->router()->target_method());
+      $templates ['target_2'] = sprintf('_layouts/%s.html', $this->router()->target_method());
       // 3. check for template in kadro directory
-      $templates ['target_3']= sprintf('%s.html', $this->router()->target_method());
+      $templates ['target_3'] = sprintf('%s.html', $this->router()->target_method());
     }
 
-    $templates ['default_3']= sprintf('%s/edit.html', $controller_template_path);
-    $templates ['default_4']= 'edit.tpl';
+    $templates ['default_3'] = sprintf('%s/edit.html', $controller_template_path);
+    $templates ['default_4'] = 'edit.tpl';
     $templates = array_unique($templates);
 
-    while(!is_null($tpl_path = array_shift($templates)))
+    while (!is_null($tpl_path = array_shift($templates)))
     {
-      if($smarty->templateExists($tpl_path))
+      if ($smarty->templateExists($tpl_path))
         return $tpl_path;
     }
 
@@ -226,21 +226,21 @@ 
    * route_back($route_name [,$route_params]), sets $route_back using route_factory()
    *
    */
-  public function route_back($route_name=null, $route_params=[]) : string
+  public function route_back($route_name = null, $route_params = []) : string
 	{
-    if(is_null($route_name))
+    if (is_null($route_name))
 		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
 	}
 
-  public function route_factory($route_name=null, $route_params=[]) : string
+  public function route_factory($route_name = null, $route_params = []) : string
   {
     $route = null;
 
-    if(is_string($route_name) && !empty($route_name))
+    if (is_string($route_name) && !empty($route_name))
     {
-      if($this->router()->route_exists($route_name))
+      if ($this->router()->route_exists($route_name))
         $route = $this->router()->prehop($route_name, $route_params);
       else
         $route = $route_name;

Braces +49 added lines, -33 removed lines

@@ -31,8 +31,9 @@ 
   // shortcut for (un)boxing
   public function box($key, $instance=null)
   {
-    if(!is_null($instance))
-      $this->container->register($key, $instance);
+    if(!is_null($instance)) {
+          $this->container->register($key, $instance);
+    }
 
     // dd($this->container->get($key));
     return $this->container->get($key);
@@ -64,15 +65,18 @@ 
   public function authorize($permission=null)
   {
     // if(!$this->requires_operator() || is_null($permission))
-    if(!$this->requires_operator())
-      return true;
+    if(!$this->requires_operator()) {
+          return true;
+    }
 
     $operator = $this->operator();
-    if(is_null($operator) || $operator->is_new() || !$operator->is_active())
-      throw new AccessRefusedException();
+    if(is_null($operator) || $operator->is_new() || !$operator->is_active()) {
+          throw new AccessRefusedException();
+    }
 
-    if(!is_null($permission) && !$operator->has_permission($permission))
-      throw new AccessRefusedException();
+    if(!is_null($permission) && !$operator->has_permission($permission)) {
+          throw new AccessRefusedException();
+    }
 
     return true;
   }
@@ -80,22 +84,26 @@ 
   public function viewport($key=null, $value=null, $coercion=false)
   {
     // no key, returns all
-    if(is_null($key))
-      return $this->template_variables;
+    if(is_null($key)) {
+          return $this->template_variables;
+    }
 
     // got key, got null value, returns $[$key]
     if(is_null($value))
     {
-      if($coercion === true) // break rule 1 ?
+      if($coercion === true) {
+        // break rule 1 ?
         $this->template_variables[$key] = null;
+      }
 
       return $this->template_variables[$key] ?? null;
     }
 
     // got key, got value
     // sets or coerces $[$key]=$value and returns $[$key]
-    if(!isset($this->template_variables[$key]) || $coercion === true)
-      $this->template_variables[$key] = $value;
+    if(!isset($this->template_variables[$key]) || $coercion === true) {
+          $this->template_variables[$key] = $value;
+    }
 
     return $this->template_variables[$key] ?? null;
   }
@@ -106,19 +114,22 @@ 
 
     $custom_template = null;
 
-    if(method_exists($this, 'prepare'))
-    	$this->prepare();
+    if(method_exists($this, 'prepare')) {
+        	$this->prepare();
+    }
 
   	if(method_exists($this, $method = $this->router()->target_method()))
     {
       $custom_template = $this->$method();
     }
 
-    if(method_exists($this, 'conclude'))
-    	$this->conclude();
+    if(method_exists($this, 'conclude')) {
+        	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function conclude(){}
@@ -133,8 +144,10 @@ 
     array_walk_recursive($_GET, function(&$value){$value = trim($value);});
     array_walk_recursive($_REQUEST, function(&$value){$value = trim($value);});
 
-    if($this->router()->submits())
-      array_walk_recursive($_POST, function(&$value){$value = trim($value);});
+    if($this->router()->submits()) {
+          array_walk_recursive($_POST, function(&$value){$value = trim($value);
+    }
+    });
   }
 
   public function display($custom_template = null, $standalone=false)
@@ -154,14 +167,14 @@ 
   	$this->viewport('view_url', $this->router()->web_root() . $this->box('settings.smarty.template_path'));
   	$this->viewport('images_url', $this->router()->web_root() . $this->box('settings.smarty.template_path') . 'images/');
 
-    foreach($this->viewport() as $template_var_name => $value)
-      $smarty->assign($template_var_name, $value);
+    foreach($this->viewport() as $template_var_name => $value) {
+          $smarty->assign($template_var_name, $value);
+    }
 
     if($standalone === false)
     {
       $smarty->display(sprintf('%s|%s', $this->box('settings.smarty.template_inclusion_path'), $template));
-    }
-    else
+    } else
     {
       $smarty->display($template);
     }
@@ -205,8 +218,9 @@ 
 
     while(!is_null($tpl_path = array_shift($templates)))
     {
-      if($smarty->templateExists($tpl_path))
-        return $tpl_path;
+      if($smarty->templateExists($tpl_path)) {
+              return $tpl_path;
+      }
     }
 
     throw new \Exception('KADRO_ERR_NO_TEMPLATE_TO_DISPLAY');
@@ -228,8 +242,9 @@ 
    */
   public function route_back($route_name=null, $route_params=[]) : string
 	{
-    if(is_null($route_name))
-		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    if(is_null($route_name)) {
+    		  return $this->route_back ?? $this->router()->prehop(RouterInterface::ROUTE_HOME_NAME);
+    }
 
     return $this->route_back = $this->route_factory($route_name, $route_params);
 	}
@@ -240,10 +255,11 @@ 
 
     if(is_string($route_name) && !empty($route_name))
     {
-      if($this->router()->route_exists($route_name))
-        $route = $this->router()->prehop($route_name, $route_params);
-      else
-        $route = $route_name;
+      if($this->router()->route_exists($route_name)) {
+              $route = $this->router()->prehop($route_name, $route_params);
+      } else {
+              $route = $route_name;
+      }
 
       return $route;
     }

Controllers/ORMController.class.php

Indentation +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
     foreach(['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
     {
       $this->search_and_execute_trait_methods($chainling);
-    	if(method_exists($this, $chainling) && empty($this->errors()))
+      if(method_exists($this, $chainling) && empty($this->errors()))
       {
         $res = $this->$chainling();
 
@@ -48,10 +48,10 @@ 
     }
 
     if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
-    	$this->conclude();
+      $this->conclude();
 
     if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+      $template = $this->display($custom_template);
   }
 
   public function prepare()

Spacing +50 added lines, -50 removed lines

@@ -27,19 +27,19 @@ 
     $custom_template = null;
     $method = $this->router()->target_method();
 
-    foreach(['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
+    foreach (['prepare', "before_$method", $method, "after_$method"] as $step => $chainling)
     {
       $this->search_and_execute_trait_methods($chainling);
-    	if(method_exists($this, $chainling) && empty($this->errors()))
+    	if (method_exists($this, $chainling) && empty($this->errors()))
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if ($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
         {
           break; // dont go on with other
         }
 
-        if($chainling === $method)
+        if ($chainling === $method)
         {
 
           $custom_template = $res;
@@ -47,10 +47,10 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if (method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
     	$this->conclude();
 
-    if(method_exists($this, 'display'))
+    if (method_exists($this, 'display'))
     	$template = $this->display($custom_template);
   }
 
@@ -58,7 +58,7 @@ 
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
+    if (!class_exists($this->model_class_name = $this->class_name()))
       throw new \Exception("!class_exists($this->model_class_name)");
 
     $this->model_type = $this->model_class_name::model_type();
@@ -68,22 +68,22 @@ 
 
     $pk_values = [];
 
-    if($this->router()->submits())
+    if ($this->router()->submits())
     {
       $this->form_model->import($this->sanitize_post_data($this->router()->submitted()));
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
     }
-    elseif($this->router()->requests())
+    elseif ($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
+      if (!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
         $this->form_model = clone $this->load_model;
     }
 
-    if(!is_null($this->load_model) && $this->load_model->traceable())
+    if (!is_null($this->load_model) && $this->load_model->traceable())
       $this->viewport('load_model_history', $this->load_model->traces() ?? []);
   }
 
@@ -94,7 +94,7 @@ 
   // ----------- META -----------
   public function class_name() : string
   {
-    if(is_null($this->model_class_name))
+    if (is_null($this->model_class_name))
     {
       $this->model_class_name = get_called_class();
       $this->model_class_name = str_replace('\Controllers\\', '\Models\\', $this->model_class_name);
@@ -107,12 +107,12 @@ 
   public function persist_model($model) : ?ModelInterface
   {
     $this->errors = $model->save($this->operator()->operator_id()); // returns [errors]
-    if(empty($this->errors()))
+    if (empty($this->errors()))
     {
       $this->logger()->nice('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']);
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
+    foreach ($this->errors() as $field => $error_msg)
       $this->logger()->warning($error_msg, [$field]);
 
     return null;
@@ -123,12 +123,12 @@ 
     return $this->listing(); //default dashboard is a listing
   }
 
-  public function listing($model=null,$filters=[],$options=[])
+  public function listing($model = null, $filters = [], $options = [])
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if (!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    if (!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -139,24 +139,24 @@ 
   public function viewport_listing($class_name, $listing, $listing_template)
   {
     $listing_fields = [];
-    if(empty($listing))
+    if (empty($listing))
     {
-      foreach($class_name::table()->columns() as $column)
+      foreach ($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if (!$column->is_auto_incremented() && !$column->is_hidden())
+          $listing_fields[$column->name()] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
       }
     }
     else
     {
       $current = current($listing);
-      if(is_object($current))
+      if (is_object($current))
         $current = get_object_vars($current);
 
-      foreach(array_keys($current) as $field)
+      foreach (array_keys($current) as $field)
       {
-        $listing_fields[$field]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
+        $listing_fields[$field] = L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $field));
       }
 
     }
@@ -178,13 +178,13 @@ 
     $this->edit();
   }
 
-  public function edit(){}
+  public function edit() {}
 
   public function save()
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
+    if (empty($this->errors()))
       $this->route_back($model);
     else
     {
@@ -195,21 +195,21 @@ 
 
   public function before_edit()
   {
-    if(!is_null($this->router()->params('id')) && is_null($this->load_model))
+    if (!is_null($this->router()->params('id')) && is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_class_name::model_type().'_INSTANCE']);
       $this->router()->hop($this->model_class_name::model_type());
     }
   }
 
-  public function before_save() : array { return [];}
+  public function before_save() : array { return []; }
 
   // default: hop to altered object
-  public function after_save() {$this->router()->hop($this->route_back());}
+  public function after_save() {$this->router()->hop($this->route_back()); }
 
   public function destroy_confirm()
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
@@ -222,12 +222,12 @@ 
 
   public function before_destroy() // default: checks for load_model and immortality, hops back to object on failure
   {
-    if(is_null($this->load_model))
+    if (is_null($this->load_model))
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
     }
-    elseif($this->load_model->immortal())
+    elseif ($this->load_model->immortal())
     {
 
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']);
@@ -237,10 +237,10 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
+    if (!$this->router()->submits())
       throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
 
-    if($this->load_model->destroy($this->operator()->operator_id()) === false)
+    if ($this->load_model->destroy($this->operator()->operator_id()) === false)
     {
       $this->logger()->info('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]);
       $this->route_back($this->load_model);
@@ -263,10 +263,10 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
+    if (isset($this->load_model))
       $this->viewport('load_model', $this->load_model);
 
-    if(isset($this->form_model))
+    if (isset($this->form_model))
       $this->viewport('form_model', $this->form_model);
   }
 
@@ -278,15 +278,15 @@ 
 
     $header = false;
 
-    foreach($collection as $line)
+    foreach ($collection as $line)
     {
       $line = get_object_vars($line);
-      if($header === false)
+      if ($header === false)
       {
-        fputcsv($fp,array_keys($line));
+        fputcsv($fp, array_keys($line));
         $header = true;
       }
-      fputcsv($fp,$line);
+      fputcsv($fp, $line);
     }
     fclose($fp);
 
@@ -296,7 +296,7 @@ 
   public function export()
   {
     $format = $this->router()->params('format');
-    switch($format)
+    switch ($format)
     {
       case null:
         $filename = $this->model_type;
@@ -325,33 +325,33 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
+    if ($model->is_new())
+      $route_name .= 'new';
     else
     {
-      $route_name.= 'default';
+      $route_name .= 'default';
       $route_params = ['id' => $model->get_id()];
     }
     $res = $this->router()->prehop($route_name, $route_params);
     return $res;
   }
 
-  public function route_factory($route=null, $route_params=[]) : string
+  public function route_factory($route = null, $route_params = []) : string
   {
-    if(is_null($route) && $this->router()->submits())
+    if (is_null($route) && $this->router()->submits())
       $route = $this->form_model;
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
+    if (!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
       $route = $this->route_model($route);
 
     return parent::route_factory($route, $route_params);
   }
 
-  private function sanitize_post_data($post_data=[])
+  private function sanitize_post_data($post_data = [])
   {
-    foreach($this->model_class_name::table()->columns() as $col)
+    foreach ($this->model_class_name::table()->columns() as $col)
     {
-      if($col->type()->is_boolean())
+      if ($col->type()->is_boolean())
       {
           $post_data[$col->name()] = !empty($post_data[$col->name()]);
       }

Braces +60 added lines, -43 removed lines

@@ -34,9 +34,12 @@ 
       {
         $res = $this->$chainling();
 
-        if($this->logger()->has_halting_messages()) // logger handled a critical error during the chailing execution
+        if($this->logger()->has_halting_messages()) {
+          // logger handled a critical error during the chailing execution
         {
-          break; // dont go on with other
+          break;
+        }
+        // dont go on with other
         }
 
         if($chainling === $method)
@@ -47,19 +50,23 @@ 
       }
     }
 
-    if(method_exists($this, 'conclude')) // conclude always executed, even with has_halting_messages
+    if(method_exists($this, 'conclude')) {
+      // conclude always executed, even with has_halting_messages
     	$this->conclude();
+    }
 
-    if(method_exists($this, 'display'))
-    	$template = $this->display($custom_template);
+    if(method_exists($this, 'display')) {
+        	$template = $this->display($custom_template);
+    }
   }
 
   public function prepare()
   {
     parent::prepare();
 
-    if(!class_exists($this->model_class_name = $this->class_name()))
-      throw new \Exception("!class_exists($this->model_class_name)");
+    if(!class_exists($this->model_class_name = $this->class_name())) {
+          throw new \Exception("!class_exists($this->model_class_name)");
+    }
 
     $this->model_type = $this->model_class_name::model_type();
 
@@ -74,17 +81,18 @@ 
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->submitted());
 
       $this->load_model = $this->model_class_name::exists($pk_values);
-    }
-    elseif($this->router()->requests())
+    } elseif($this->router()->requests())
     {
       $pk_values = $this->model_class_name::table()->primary_keys_match($this->router()->params());
 
-      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values)))
-        $this->form_model = clone $this->load_model;
+      if(!is_null($this->load_model = $this->model_class_name::exists($pk_values))) {
+              $this->form_model = clone $this->load_model;
+      }
     }
 
-    if(!is_null($this->load_model) && $this->load_model->traceable())
-      $this->viewport('load_model_history', $this->load_model->traces() ?? []);
+    if(!is_null($this->load_model) && $this->load_model->traceable()) {
+          $this->viewport('load_model_history', $this->load_model->traces() ?? []);
+    }
   }
 
   public function has_load_model()
@@ -112,8 +120,9 @@ 
       $this->logger()->nice('CRUDITES_INSTANCE_ALTERED', ['MODEL_'.get_class($model)::model_type().'_INSTANCE']);
       return $model;
     }
-    foreach($this->errors() as $field => $error_msg)
-      $this->logger()->warning($error_msg, [$field]);
+    foreach($this->errors() as $field => $error_msg) {
+          $this->logger()->warning($error_msg, [$field]);
+    }
 
     return null;
   }
@@ -127,8 +136,12 @@ 
   {
     $class_name = is_null($model) ? $this->model_class_name : get_class($model);
 
-    if(!isset($filters['date_start']))  $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
-    if(!isset($filters['date_stop']))   $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    if(!isset($filters['date_start'])) {
+      $filters['date_start'] = $this->box('StateAgent')->filters('date_start');
+    }
+    if(!isset($filters['date_stop'])) {
+      $filters['date_stop'] = $this->box('StateAgent')->filters('date_stop');
+    }
 
     // dd($filters);
     $listing = $class_name::filter($filters);
@@ -144,15 +157,16 @@ 
       foreach($class_name::table()->columns() as $column)
       {
 
-        if(!$column->is_auto_incremented() && !$column->is_hidden())
-          $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        if(!$column->is_auto_incremented() && !$column->is_hidden()) {
+                  $listing_fields[$column->name()]=L(sprintf('MODEL_%s_FIELD_%s', $class_name::model_type(), $column->name()));
+        }
       }
-    }
-    else
+    } else
     {
       $current = current($listing);
-      if(is_object($current))
-        $current = get_object_vars($current);
+      if(is_object($current)) {
+              $current = get_object_vars($current);
+      }
 
       foreach(array_keys($current) as $field)
       {
@@ -184,9 +198,9 @@ 
   {
     $model = $this->persist_model($this->form_model);
 
-    if(empty($this->errors()))
-      $this->route_back($model);
-    else
+    if(empty($this->errors())) {
+          $this->route_back($model);
+    } else
     {
       $this->edit();
       return 'edit';
@@ -226,8 +240,7 @@ 
     {
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_NOT_FOUND', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->router()->hop($this->model_type);
-    }
-    elseif($this->load_model->immortal())
+    } elseif($this->load_model->immortal())
     {
 
       $this->logger()->warning('CRUDITES_ERR_INSTANCE_IS_IMMORTAL', ['MODEL_'.$this->model_type.'_INSTANCE']);
@@ -237,15 +250,15 @@ 
 
   public function destroy()
   {
-    if(!$this->router()->submits())
-      throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    if(!$this->router()->submits()) {
+          throw new \Exception('KADRO_ROUTER_MUST_SUBMIT');
+    }
 
     if($this->load_model->destroy($this->operator()->operator_id()) === false)
     {
       $this->logger()->info('CRUDITES_ERR_INSTANCE_IS_UNDELETABLE', [''.$this->load_model]);
       $this->route_back($this->load_model);
-    }
-    else
+    } else
     {
       $this->logger()->nice('CRUDITES_INSTANCE_DESTROYED', ['MODEL_'.$this->model_type.'_INSTANCE']);
       $this->route_back($this->model_type);
@@ -263,11 +276,13 @@ 
 
     $this->viewport('form_model_type', $this->model_type);
 
-    if(isset($this->load_model))
-      $this->viewport('load_model', $this->load_model);
+    if(isset($this->load_model)) {
+          $this->viewport('load_model', $this->load_model);
+    }
 
-    if(isset($this->form_model))
-      $this->viewport('form_model', $this->form_model);
+    if(isset($this->form_model)) {
+          $this->viewport('form_model', $this->form_model);
+    }
   }
 
   public function collection_to_csv($collection, $filename)
@@ -325,9 +340,9 @@ 
     $route_params = [];
 
     $route_name = get_class($model)::model_type().'_';
-    if($model->is_new())
-      $route_name.= 'new';
-    else
+    if($model->is_new()) {
+          $route_name.= 'new';
+    } else
     {
       $route_name.= 'default';
       $route_params = ['id' => $model->get_id()];
@@ -338,11 +353,13 @@ 
 
   public function route_factory($route=null, $route_params=[]) : string
   {
-    if(is_null($route) && $this->router()->submits())
-      $route = $this->form_model;
+    if(is_null($route) && $this->router()->submits()) {
+          $route = $this->form_model;
+    }
 
-    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface'))
-      $route = $this->route_model($route);
+    if(!is_null($route) && is_subclass_of($route, '\HexMakina\Crudites\Interfaces\ModelInterface')) {
+          $route = $this->route_model($route);
+    }
 
     return parent::route_factory($route, $route_params);
   }