eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

whitespace problems in lib/router

This commit is contained in:
Evan Prodromou 2010-12-07 16:23:12 -05:00
parent 57859a4bc8
commit db519d3ffb
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
lib/router.php
View File

@ -55,14 +55,14 @@ class StatusNet_URL_Mapper extends Net_URL_Mapper
$result = null; $result = null;
if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) { if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) {
$result = parent::connect($path, $defaults, $rules); $result = parent::connect($path, $defaults, $rules);
if (array_key_exists('action', $defaults)) { if (array_key_exists('action', $defaults)) {
$action = $defaults['action']; $action = $defaults['action'];
} elseif (array_key_exists('action', $rules)) { } elseif (array_key_exists('action', $rules)) {
$action = $rules['action']; $action = $rules['action'];
} else { } else {
$action = null; $action = null;
} }
$this->_mapAction($action, $result); $this->_mapAction($action, $result);
Event::handle('EndConnectPath', array($path, $defaults, $rules, $result)); Event::handle('EndConnectPath', array($path, $defaults, $rules, $result));
} }
return $result; return $result;
@ -70,31 +70,31 @@ class StatusNet_URL_Mapper extends Net_URL_Mapper
protected function _mapAction($action, $path) protected function _mapAction($action, $path)
{ {
if (!array_key_exists($action, $this->_actionToPath)) { if (!array_key_exists($action, $this->_actionToPath)) {
$this->_actionToPath[$action] = array(); $this->_actionToPath[$action] = array();
} }
$this->_actionToPath[$action][] = $path; $this->_actionToPath[$action][] = $path;
return; return;
} }
public function generate($values = array(), $qstring = array(), $anchor = '') public function generate($values = array(), $qstring = array(), $anchor = '')
{ {
if (!array_key_exists('action', $values)) { if (!array_key_exists('action', $values)) {
return parent::generate($values, $qstring, $anchor); return parent::generate($values, $qstring, $anchor);
} }
$action = $values['action']; $action = $values['action'];
if (!array_key_exists($action, $this->_actionToPath)) { if (!array_key_exists($action, $this->_actionToPath)) {
return parent::generate($values, $qstring, $anchor); return parent::generate($values, $qstring, $anchor);
} }
$oldPaths = $this->paths; $oldPaths = $this->paths;
$this->paths = $this->_actionToPath[$action]; $this->paths = $this->_actionToPath[$action];
$result = parent::generate($values, $qstring, $anchor); $result = parent::generate($values, $qstring, $anchor);
$this->paths = $oldPaths; $this->paths = $oldPaths;
return $result; return $result;
} }
} }
@ -127,19 +127,19 @@ class Router
function __construct() function __construct()
{ {
if (empty($this->m)) { if (empty($this->m)) {
if (!common_config('router', 'cache')) { if (!common_config('router', 'cache')) {
$this->m = $this->initialize(); $this->m = $this->initialize();
} else { } else {
$k = self::cacheKey(); $k = self::cacheKey();
$c = Cache::instance(); $c = Cache::instance();
$m = $c->get($k); $m = $c->get($k);
if (!empty($m)) { if (!empty($m)) {
$this->m = $m; $this->m = $m;
} else { } else {
$this->m = $this->initialize(); $this->m = $this->initialize();
$c->set($k, $this->m); $c->set($k, $this->m);
} }
} }
} }
} }
@ -199,7 +199,7 @@ class Router
'deleteuser', 'deleteuser',
'geocode', 'geocode',
'version', 'version',
); );
foreach ($main as $a) { foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a)); $m->connect('main/'.$a, array('action' => $a));
@ -222,8 +222,8 @@ class Router
array('action' => 'publicxrds')); array('action' => 'publicxrds'));
$m->connect('.well-known/host-meta', $m->connect('.well-known/host-meta',
array('action' => 'hostmeta')); array('action' => 'hostmeta'));
$m->connect('main/xrd', $m->connect('main/xrd',
array('action' => 'userxrd')); array('action' => 'userxrd'));
// these take a code // these take a code
@ -248,19 +248,19 @@ class Router
} }
$m->connect('settings/oauthapps/show/:id', $m->connect('settings/oauthapps/show/:id',
array('action' => 'showapplication'), array('action' => 'showapplication'),
array('id' => '[0-9]+') array('id' => '[0-9]+')
); );
$m->connect('settings/oauthapps/new', $m->connect('settings/oauthapps/new',
array('action' => 'newapplication') array('action' => 'newapplication')
); );
$m->connect('settings/oauthapps/edit/:id', $m->connect('settings/oauthapps/edit/:id',
array('action' => 'editapplication'), array('action' => 'editapplication'),
array('id' => '[0-9]+') array('id' => '[0-9]+')
); );
$m->connect('settings/oauthapps/delete/:id', $m->connect('settings/oauthapps/delete/:id',
array('action' => 'deleteapplication'), array('action' => 'deleteapplication'),
array('id' => '[0-9]+') array('id' => '[0-9]+')
); );
// search // search
@ -951,14 +951,14 @@ class Router
$qpos = strpos($url, '?'); $qpos = strpos($url, '?');
if ($qpos !== false) { if ($qpos !== false) {
$url = substr($url, 0, $qpos+1) . $url = substr($url, 0, $qpos+1) .
str_replace('?', '&', substr($url, $qpos+1)); str_replace('?', '&', substr($url, $qpos+1));
// @fixme this is a hacky workaround for http_build_query in the // @fixme this is a hacky workaround for http_build_query in the
// lower-level code and bad configs that set the default separator // lower-level code and bad configs that set the default separator
// to & instead of &. Encoded &s in parameters will not be // to & instead of &. Encoded &s in parameters will not be
// affected. // affected.
$url = substr($url, 0, $qpos+1) . $url = substr($url, 0, $qpos+1) .
str_replace('&', '&', substr($url, $qpos+1)); str_replace('&', '&', substr($url, $qpos+1));
} }