GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper)

This commit is contained in:
Zach Copley 2011-09-15 16:16:58 -07:00
parent 6e480d2458
commit 0bd26ed3f0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/urlmapper.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc. * Copyright (C) 2011, StatusNet, Inc.
* *
* URL mapper * URL mapper
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
* Converts a path into a set of parameters, and vice versa * Converts a path into a set of parameters, and vice versa
* *
* We used to use Net_URL_Mapper, so there's a wrapper class at Router, q.v. * We used to use Net_URL_Mapper, so there's a wrapper class at Router, q.v.
* *
* NUM's vagaries are the main reason we have weirdnesses here. * NUM's vagaries are the main reason we have weirdnesses here.
* *
* @category URL * @category URL
@ -58,6 +58,7 @@ class URLMapper
protected $statics = array(); protected $statics = array();
protected $variables = array(); protected $variables = array();
protected $reverse = array(); protected $reverse = array();
protected $allpaths = array();
function connect($path, $args, $paramPatterns=array()) function connect($path, $args, $paramPatterns=array())
{ {
@ -65,6 +66,8 @@ class URLMapper
throw new Exception(sprintf("Can't connect %s; path has no action.", $path)); throw new Exception(sprintf("Can't connect %s; path has no action.", $path));
} }
$allpaths[] = $path;
$action = $args[self::ACTION]; $action = $args[self::ACTION];
$paramNames = $this->getParamNames($path); $paramNames = $this->getParamNames($path);
@ -119,7 +122,7 @@ class URLMapper
return $results; return $results;
} }
} }
throw new Exception(sprintf('No match for path "%s"', $path)); throw new Exception(sprintf('No match for path "%s"', $path));
} }
@ -173,7 +176,7 @@ class URLMapper
$path = vsprintf($format, $toFormat); $path = vsprintf($format, $toFormat);
} }
if (!empty($qstring)) { if (!empty($qstring)) {
$formatted = http_build_query($qstring); $formatted = http_build_query($qstring);
$path .= '?' . $formatted; $path .= '?' . $formatted;
} }
@ -223,6 +226,11 @@ class URLMapper
return $format; return $format;
} }
public function getPaths()
{
return $this->allpaths;
}
} }
class PatternReplacer class PatternReplacer