require_once 'Net/URL/Mapper.php';
class StatusNet_URL_Mapper extends Net_URL_Mapper {
-
private static $_singleton = null;
private function __construct()
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-
class Router
{
var $m = null;
'format' => '(xml|json)'));
// blocks
+ $m->connect('api/blocks/create.:format',
+ array('action' => 'ApiBlockCreate',
+ 'format' => '(xml|json)'));
+
$m->connect('api/blocks/create/:id.:format',
array('action' => 'ApiBlockCreate',
'id' => '[a-zA-Z0-9]+',
'format' => '(xml|json)'));
+ $m->connect('api/blocks/destroy.:format',
+ array('action' => 'ApiBlockDestroy',
+ 'format' => '(xml|json)'));
+
$m->connect('api/blocks/destroy/:id.:format',
array('action' => 'ApiBlockDestroy',
'id' => '[a-zA-Z0-9]+',
$m->connect('admin/snapshot', array('action' => 'snapshotadminpanel'));
$m->connect('admin/license', array('action' => 'licenseadminpanel'));
-
$m->connect('getfile/:filename',
array('action' => 'getfile'),
array('filename' => '[A-Za-z0-9._-]+'));
$m->connect('',
array('action' => 'showstream',
'nickname' => $nickname));
-
} else {
-
$m->connect('', array('action' => 'public'));
$m->connect('rss', array('action' => 'publicrss'));
$m->connect('featuredrss', array('action' => 'featuredrss'));
} catch (Net_URL_Mapper_InvalidException $e) {
common_log(LOG_ERR, "Problem getting route for $path - " .
$e->getMessage());
- $cac = new ClientErrorAction("Page not found.", 404);
+ // TRANS: Client error on action trying to visit a non-existing page.
+ $cac = new ClientErrorAction(_('Page not found.'), 404);
$cac->showPage();
}
if ($qpos !== false) {
$url = substr($url, 0, $qpos+1) .
str_replace('?', '&', substr($url, $qpos+1));
+
+ // @fixme this is a hacky workaround for http_build_query in the
+ // lower-level code and bad configs that set the default separator
+ // to & instead of &. Encoded &s in parameters will not be
+ // affected.
+ $url = substr($url, 0, $qpos+1) .
+ str_replace('&', '&', substr($url, $qpos+1));
+
}
+
return $url;
}
}