X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FPathRouter.php;h=d367e4da3aafdf85579c1b3528851eb6e933901a;hb=69e1dc6f9ddcacadfd8d48aa589ea363ee6f6593;hp=3be504a78586048dc69cb45af60d61b0e39c27f9;hpb=dbdaa71fd28eb54cdf1135fd3cddf6a37275e39f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/PathRouter.php b/includes/PathRouter.php index 3be504a785..d367e4da3a 100644 --- a/includes/PathRouter.php +++ b/includes/PathRouter.php @@ -27,7 +27,7 @@ * * $router->add( "/wiki/$1" ); * - Matches /wiki/Foo style urls and extracts the title - * $router->add( array( 'edit' => "/edit/$1" ), array( 'action' => '$key' ) ); + * $router->add( array( 'edit' => "/edit/$key" ), array( 'action' => '$key' ) ); * - Matches /edit/Foo style urls and sets action=edit * $router->add( '/$2/$1', * array( 'variant' => '$2' ), @@ -141,10 +141,10 @@ class PathRouter { } $pattern = (object)array( - 'path' => $path, - 'params' => $params, + 'path' => $path, + 'params' => $params, 'options' => $options, - 'key' => $key, + 'key' => $key, ); $pattern->weight = self::makeWeight( $pattern ); $this->patterns[] = $pattern; @@ -153,9 +153,9 @@ class PathRouter { /** * Add a new path pattern to the path router * - * @param $path string|array The path pattern to add - * @param $params array The params for this path pattern - * @param $options array The options for this path pattern + * @param string|array $path The path pattern to add + * @param array $params The params for this path pattern + * @param array $options The options for this path pattern */ public function add( $path, $params = array(), $options = array() ) { if ( is_array( $path ) ) { @@ -185,7 +185,7 @@ class PathRouter { */ protected function sortByWeight() { $weights = array(); - foreach( $this->patterns as $key => $pattern ) { + foreach ( $this->patterns as $key => $pattern ) { $weights[$key] = $pattern->weight; } array_multisort( $weights, SORT_DESC, SORT_NUMERIC, $this->patterns ); @@ -203,7 +203,7 @@ class PathRouter { $path = explode( '/', $pattern->path ); # For each level of the path - foreach( $path as $piece ) { + foreach ( $path as $piece ) { if ( preg_match( '/^\$(\d+|key)$/u', $piece ) ) { # For a piece that is only a $1 variable add 1 points of weight $weight += 1; @@ -232,7 +232,7 @@ class PathRouter { /** * Parse a path and return the query matches for the path * - * @param $path string The path to parse + * @param string $path The path to parse * @return Array The array of matches for the path */ public function parse( $path ) {