HexMakina / kadro

StorageManager/__DEL__FileManager.class.php

Indentation +1 added lines, -1 removed lines

@@ -100,4 +100,4 @@
 
 }
 
- ?>
+  ?>

StorageManager/SnapshotManager.class.php

Indentation +1 added lines, -1 removed lines

@@ -15,4 +15,4 @@
   }
 }
 
- ?>
+  ?>

StorageManager/PictureManager.class.php

Indentation +47 added lines, -47 removed lines

@@ -29,8 +29,8 @@ 
   {
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			throw new PictureManagerException("directory '$picture_directory' does not exist");
+    if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+      throw new PictureManagerException("directory '$picture_directory' does not exist");
 
     $filenames = self::preg_scandir($picture_directory, self::FILENAME_REGEX);
 
@@ -87,11 +87,11 @@ 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+    if(file_exists($filepath))
       throw new PictureManagerException($this->get_type()." new path '$filepath' already exists");
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new PictureManagerException(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+    if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
+      throw new PictureManagerException(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
   }
@@ -107,64 +107,64 @@ 
   }
 
   public function make_thumbnail($filepath)
-	{
+  {
     global $settings;
 
-		$cover_iri = null;
-
-		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
-		{
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$cover_iri = imagecreatefromjpeg($filepath);
-			break;
+    $cover_iri = null;
 
-			case 'image/png':
-				$cover_iri = imagecreatefrompng($filepath);
-			break;
-
-			case 'image/gif':
-				$cover_iri = imagecreatefromgif($filepath);
-			break;
-		}
+    $mime_type = mime_content_type($filepath);
+    switch($mime_type)
+    {
+      case 'image/jpeg':
+      case 'image/pjpeg':
+        $cover_iri = imagecreatefromjpeg($filepath);
+      break;
+
+      case 'image/png':
+        $cover_iri = imagecreatefrompng($filepath);
+      break;
+
+      case 'image/gif':
+        $cover_iri = imagecreatefromgif($filepath);
+      break;
+    }
 
-		if(!is_null($cover_iri))
-		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+    if(!is_null($cover_iri))
+    {
+      $width = imagesx( $cover_iri );
+      $height = imagesy( $cover_iri );
 
-			// calculate thumbnail size
+      // calculate thumbnail size
       
-			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+      $new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
+      $new_height = floor( $height * ( $new_width / $width ) );
 
-			// create a new temporary image
-			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
+      // create a new temporary image
+      $thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
-			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+      // copy and resize old image into new image
+      imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
 
-			// save thumbnail into a file
+      // save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
-		}
-	}
+    }
+  }
 
   public function remove_all()
   {
     $filenames = $this->filenames();
 
     foreach($filenames as $filename)
-				$this->remove($filename);
+        $this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+    if(file_exists($directory) === true)
     {
       if(is_dir($directory) === false)
         throw new PictureManagerException($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
-  			throw new PictureManagerException("rmdir($directory) failed like a bitch");
+        if(rmdir($directory) === false)
+        throw new PictureManagerException("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
@@ -181,7 +181,7 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+      if(!file_exists($path))
         $error = 'file does not exist';
       elseif(unlink($path)===false)
         $error = 'unlink() failed';
@@ -235,16 +235,16 @@ 
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
 
-		$pictures = $pi_manager->filenames();
+    $pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
     if(count($pictures)===0)
       return hopper::file_uri($settings[$item_model_type][$picture_type]['generic_picture']);
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+    if($settings[$item_model_type][$picture_type]['cycle_on_load'])
+      $filename = $pictures[array_rand($pictures, 1)];
+    else
+      $filename = array_shift($pictures);
 
     return hopper::file_uri( $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename));
   }

Auth/ACL.class.php

Indentation +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
   const TABLE_ALIAS = 'acl';
 
   public function traceable() : bool
-	{
-		return false;
-	}
+  {
+    return false;
+  }
 
   public static function match(OperatorInterface $op, $permission_name)
   {

Auth/Operatorability.class.php

Indentation +9 added lines, -9 removed lines

@@ -45,8 +45,8 @@ 
 
   public static function enhance_query_retrieve($Query, $filters, $options)
   {
-		$joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
-		$joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
+    $joined_alias = $Query->auto_join([ACL::table(),'ACL'], null, 'LEFT OUTER');
+    $joined_alias = $Query->auto_join([Permission::table(), 'permission'], null, 'LEFT OUTER');
 
     $permission_ids_and_names = [];
     $permission_ids_and_names []= sprintf('GROUP_CONCAT(DISTINCT %s.%s) as %s', $joined_alias, 'id', $joined_alias.'_ids');
@@ -67,7 +67,7 @@ 
     return $Query;
   }
 
-	public function is_active() : bool
+  public function is_active() : bool
   {
     return is_null($this->operator()) ? false : $this->operator()->is_active();
   }
@@ -77,12 +77,12 @@ 
     return is_null($this->operator()) ? null : $this->operator()->operator_id();
   }
 
-	public function username()
+  public function username()
   {
     return is_null($this->operator()) ? null : $this->operator()->username();
   }
 
-	public function password()
+  public function password()
   {
     return is_null($this->operator()) ? null : $this->operator()->password();
   }
@@ -97,22 +97,22 @@ 
     return $this->operator()->password_verify($string);
   }
 
-	public function name()
+  public function name()
   {
     return is_null($this->operator()) ? null : $this->operator()->name();
   }
 
-	public function email()
+  public function email()
   {
     return is_null($this->operator()) ? null : $this->operator()->email();
   }
 
-	public function phone()
+  public function phone()
   {
     return is_null($this->operator()) ? null : $this->operator()->phone();
   }
 
-	public function language_code()
+  public function language_code()
   {
     return is_null($this->operator()) ? null : $this->operator()->language_code();
   }

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/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')
   {