HexMakina / kadro

PSR4Autoloader.class.php

Indentation +45 added lines, -45 removed lines

@@ -7,18 +7,18 @@ 
 {
   
   /**
-  * An associative array where the key is a namespace prefix and the value
-  * is an array of base directories for classes in that namespace.
-  *
-  * @var array
-  */
+   * An associative array where the key is a namespace prefix and the value
+   * is an array of base directories for classes in that namespace.
+   *
+   * @var array
+   */
   protected $prefixes = [];
 
   /**
-  * Register loader with SPL autoloader stack.
-  *
-  * @return void
-  */
+   * Register loader with SPL autoloader stack.
+   *
+   * @return void
+   */
 
   public function register()
   {
@@ -26,28 +26,28 @@ 
   }
 
   /**
-  * Adds a base directory for a namespace prefix.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $base_dir A base directory for class files in the
-  * namespace.
-  * @param bool $prepend If true, prepend the base directory to the stack
-  * instead of appending it; this causes it to be searched first rather
-  * than last.
-  * @return void
-  */
+   * Adds a base directory for a namespace prefix.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $base_dir A base directory for class files in the
+   * namespace.
+   * @param bool $prepend If true, prepend the base directory to the stack
+   * instead of appending it; this causes it to be searched first rather
+   * than last.
+   * @return void
+   */
   public function addNamespaceTree($base_dir, $prepend = false)
   {
-  	$dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
+    $dir_content = FileSystem::preg_scandir($base_dir, '/^[A-Z]{1}[A-Za-z]+(?!\.class.\.php)$/');
     
-  	foreach($dir_content as $res)
-  	{
-  		if(is_dir($fullpath = $base_dir.'/'.$res))
-  		{
-  			$this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
+    foreach($dir_content as $res)
+    {
+      if(is_dir($fullpath = $base_dir.'/'.$res))
+      {
+        $this->addNamespace('HexMakina\kadro\\'.$res, $fullpath);
         $this->addNamespaceTree($fullpath);
-  		}
-  	}
+      }
+    }
   }
   
   public function addNamespace($prefix, $base_dir, $prepend = false)
@@ -73,12 +73,12 @@ 
   }
 
   /**
-  * Loads the class file for a given class name.
-  *
-  * @param string $class The fully-qualified class name.
-  * @return mixed The mapped file name on success, or boolean false on
-  * failure.
-  */
+   * Loads the class file for a given class name.
+   *
+   * @param string $class The fully-qualified class name.
+   * @return mixed The mapped file name on success, or boolean false on
+   * failure.
+   */
   public function loadClass($class)
   {
     // var_dump(__FUNCTION__."($class)");
@@ -110,13 +110,13 @@ 
   }
 
   /**
-  * Load the mapped file for a namespace prefix and relative class.
-  *
-  * @param string $prefix The namespace prefix.
-  * @param string $relative_class The relative class name.
-  * @return mixed Boolean false if no mapped file can be loaded, or the
-  * name of the mapped file that was loaded.
-  */
+   * Load the mapped file for a namespace prefix and relative class.
+   *
+   * @param string $prefix The namespace prefix.
+   * @param string $relative_class The relative class name.
+   * @return mixed Boolean false if no mapped file can be loaded, or the
+   * name of the mapped file that was loaded.
+   */
   protected function loadMappedFile($prefix, $relative_class)
   {
     // are there any base directories for this namespace prefix?
@@ -147,11 +147,11 @@ 
   }
 
   /**
-  * If a file exists, require it from the file system.
-  *
-  * @param string $file The file to require.
-  * @return bool True if the file exists, false if not.
-  */
+   * If a file exists, require it from the file system.
+   *
+   * @param string $file The file to require.
+   * @return bool True if the file exists, false if not.
+   */
   protected function requireFile($file)
   {
     // var_dump(__FUNCTION__."($file)");

Router/hopper.class.php

Indentation +2 added lines, -2 removed lines

@@ -192,8 +192,8 @@
 
   public function hop_url($url)
   {
-  	header('Cache-Control: no-cache, must-revalidate');
-  	header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
+    header('Cache-Control: no-cache, must-revalidate');
+    header('Expires: Mon, 01 Jan 1970 00:00:00 GMT');
     header('Location: '.$url);
     exit();
   }

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";
+  }
 }

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);
   }
 
 }

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
   {

Models/Lingvo.class.php

Indentation +7 added lines, -7 removed lines

@@ -31,10 +31,10 @@ 
     return $this->iso_name().' ('.$this->Part3.')';
   }
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
 
   public function iso_name()
   {
@@ -102,9 +102,9 @@ 
   public static function search_language($term, $authority=null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
-		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+    $ret = [];
+    foreach($rows as $row)
+        $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
   }

Models/Traduko.class.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
   const TABLE_NAME = 'kadro_traduki';
   const TABLE_ALIAS = 'traduko';
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
   
   public function immortal() : bool
   {

Models/Abilities/Event.class.php

Indentation +12 added lines, -12 removed lines

@@ -23,22 +23,22 @@
 
   public static function today($format=Dato::FORMAT)
   {
-		return Dato::today($format);
-	}
+    return Dato::today($format);
+  }
 
   public static function date($date=null, $format=Dato::FORMAT) : string
-	{
-		return Dato::format($date);
-	}
+  {
+    return Dato::format($date);
+  }
   //
   // //------------------------------------------------------------  MySQL DateTime helpers
   // public static function year($date=null) : string
-	// {
-	// 	return Dato::format($date, Dato::FORMAT_YEAR);
-	// }
+  // {
+  // 	return Dato::format($date, Dato::FORMAT_YEAR);
+  // }
   //
-	// public static function datetime($date=null) : string
-	// {
-	// 	return DatoTempo::format($date);
-	// }
+  // public static function datetime($date=null) : string
+  // {
+  // 	return DatoTempo::format($date);
+  // }
 }

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;
 }