X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp%2FRouter.php;h=b3df8a14d294c8477e1ed92859ad900b2f5b83f8;hb=64f30d3627117037b0a8088bb5c5c2710b4ef3d3;hp=1dffb6b406f0d3b22bd75880710bd56a5eee8437;hpb=155d5418602b2e6c8bd2e17a87d8a2a51d39d684;p=friendica.git diff --git a/src/App/Router.php b/src/App/Router.php index 1dffb6b406..b3df8a14d2 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -47,6 +47,10 @@ class Router $collector->addRoute(['GET'], '/webfinger' , Module\Xrd::class); $collector->addRoute(['GET'], '/x-social-relay' , Module\WellKnown\XSocialRelay::class); }); + $this->routeCollector->addGroup('/2fa', function (RouteCollector $collector) { + $collector->addRoute(['GET', 'POST'], '[/]' , Module\TwoFactor\Verify::class); + $collector->addRoute(['GET', 'POST'], '/recovery' , Module\TwoFactor\Recovery::class); + }); $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); @@ -88,13 +92,30 @@ class Router $this->routeCollector->addRoute(['GET'], '/allfriends/{id:\d+}', Module\AllFriends::class); $this->routeCollector->addRoute(['GET'], '/apps', Module\Apps::class); $this->routeCollector->addRoute(['GET'], '/attach/{item:\d+}', Module\Attach::class); - $this->routeCollector->addRoute(['GET'], '/babel', Module\Babel::class); - $this->routeCollector->addRoute(['GET'], '/bookmarklet', Module\BookMarklet::class); + $this->routeCollector->addRoute(['GET'], '/babel', Module\Debug\Babel::class); + $this->routeCollector->addRoute(['GET'], '/bookmarklet', Module\Bookmarklet::class); + $this->routeCollector->addRoute(['GET', 'POST'], '/compose[/{type}]', Module\Item\Compose::class); $this->routeCollector->addGroup('/contact', function (RouteCollector $collector) { $collector->addRoute(['GET'], '[/]', Module\Contact::class); - $collector->addRoute(['GET'], '/{id:\d+}[/posts|conversations]', Module\Contact::class); + $collector->addRoute(['GET', 'POST'], '/{id:\d+}[/]', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/archive', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/block', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/conversations', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/drop', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/ignore', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/posts', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/update', Module\Contact::class); + $collector->addRoute(['GET'], '/{id:\d+}/updateprofile', Module\Contact::class); + $collector->addRoute(['GET'], '/archived', Module\Contact::class); + $collector->addRoute(['GET', 'POST'], '/batch', Module\Contact::class); + $collector->addRoute(['GET'], '/pending', Module\Contact::class); + $collector->addRoute(['GET'], '/blocked', Module\Contact::class); + $collector->addRoute(['GET'], '/hidden', Module\Contact::class); + $collector->addRoute(['GET'], '/ignored', Module\Contact::class); }); $this->routeCollector->addRoute(['GET'], '/credits', Module\Credits::class); + $this->routeCollector->addRoute(['GET'], '/dirfind', Module\Search\Directory::class); + $this->routeCollector->addRoute(['GET'], '/directory', Module\Directory::class); $this->routeCollector->addGroup('/feed', function (RouteCollector $collector) { $collector->addRoute(['GET'], '/{nickname}', Module\Feed::class); $collector->addRoute(['GET'], '/{nickname}/posts', Module\Feed::class); @@ -102,16 +123,18 @@ class Router $collector->addRoute(['GET'], '/{nickname}/replies', Module\Feed::class); $collector->addRoute(['GET'], '/{nickname}/activity', Module\Feed::class); }); - $this->routeCollector->addRoute(['GET'], '/directory', Module\Directory::class); - $this->routeCollector->addRoute(['GET'], '/feedtest', Module\Feedtest::class); + $this->routeCollector->addRoute(['GET'], '/feedtest', Module\Debug\Feed::class); $this->routeCollector->addGroup('/fetch', function (RouteCollector $collector) { - $collector->addRoute(['GET'], '/{guid}/post', Module\Diaspora\Fetch::class); - $collector->addRoute(['GET'], '/{guid}/status_message', Module\Diaspora\Fetch::class); - $collector->addRoute(['GET'], '/{guid}/reshare', Module\Diaspora\Fetch::class); + $collector->addRoute(['GET'], '/post/{guid}', Module\Diaspora\Fetch::class); + $collector->addRoute(['GET'], '/status_message/{guid}', Module\Diaspora\Fetch::class); + $collector->addRoute(['GET'], '/reshare/{guid}', Module\Diaspora\Fetch::class); }); - $this->routeCollector->addRoute(['GET'], '/filer[/{id:\d+}]', Module\Filer::class); + $this->routeCollector->addRoute(['GET'], '/filer[/{id:\d+}]', Module\Filer\SaveTag::class); + $this->routeCollector->addRoute(['GET'], '/filerm/{id:\d+}', Module\Filer\RemoveTag::class); + $this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm', Module\FollowConfirm::class); $this->routeCollector->addRoute(['GET'], '/followers/{owner}', Module\Followers::class); $this->routeCollector->addRoute(['GET'], '/following/{owner}', Module\Following::class); + $this->routeCollector->addRoute(['GET'], '/friendica[/json]', Module\Friendica::class); $this->routeCollector->addGroup('/group', function (RouteCollector $collector) { $collector->addRoute(['GET', 'POST'], '[/]', Module\Group::class); $collector->addRoute(['GET', 'POST'], '/{group:\d+}', Module\Group::class); @@ -120,8 +143,8 @@ class Router $collector->addRoute(['GET', 'POST'], '/drop/{group:\d+}', Module\Group::class); $collector->addRoute(['GET', 'POST'], '/{group:\d+}/{contact:\d+}', Module\Group::class); - $collector->addRoute(['POST'], '/{group:\d+}/add/{contact:\d+}', Module\Group::class); - $collector->addRoute(['POST'], '/{group:\d+}/remove/{contact:\d+}', Module\Group::class); + $collector->addRoute(['GET', 'POST'], '/{group:\d+}/add/{contact:\d+}', Module\Group::class); + $collector->addRoute(['GET', 'POST'], '/{group:\d+}/remove/{contact:\d+}', Module\Group::class); }); $this->routeCollector->addRoute(['GET'], '/hashtag', Module\Hashtag::class); $this->routeCollector->addRoute(['GET'], '/home', Module\Home::class); @@ -132,29 +155,42 @@ class Router $collector->addRoute(['GET', 'POST'], '[/]', Module\Install::class); $collector->addRoute(['GET'], '/testrewrite', Module\Install::class); }); - $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class); $this->routeCollector->addRoute(['GET'], '/like/{item:\d+}', Module\Like::class); - $this->routeCollector->addRoute(['GET', 'POST'], '/localtime', Module\Localtime::class); + $this->routeCollector->addRoute(['GET', 'POST'], '/localtime', Module\Debug\Localtime::class); $this->routeCollector->addRoute(['GET', 'POST'], '/login', Module\Login::class); $this->routeCollector->addRoute(['GET', 'POST'], '/logout', Module\Logout::class); $this->routeCollector->addRoute(['GET'], '/magic', Module\Magic::class); + $this->routeCollector->addRoute(['GET'], '/maintenance', Module\Maintenance::class); $this->routeCollector->addRoute(['GET'], '/manifest', Module\Manifest::class); + $this->routeCollector->addRoute(['GET'], '/modexp/{nick}', Module\PublicRSAKey::class); + $this->routeCollector->addRoute(['GET'], '/newmember', Module\Welcome::class); $this->routeCollector->addRoute(['GET'], '/nodeinfo/1.0', Module\NodeInfo::class); $this->routeCollector->addRoute(['GET'], '/nogroup', Module\Group::class); + $this->routeCollector->addGroup('/notify', function (RouteCollector $collector) { + $collector->addRoute(['GET'], '[/]', Module\Notifications\Notify::class); + $collector->addRoute(['GET'], '/view/{id:\d+}', Module\Notifications\Notify::class); + $collector->addRoute(['GET'], '/mark/all', Module\Notifications\Notify::class); + }); $this->routeCollector->addRoute(['GET'], '/objects/{guid}', Module\Objects::class); $this->routeCollector->addGroup('/oembed', function (RouteCollector $collector) { - $collector->addRoute(['GET'], '/[b2h|h2b]', Module\Oembed::class); + $collector->addRoute(['GET'], '/b2h', Module\Oembed::class); + $collector->addRoute(['GET'], '/h2b', Module\Oembed::class); $collector->addRoute(['GET'], '/{hash}', Module\Oembed::class); }); $this->routeCollector->addRoute(['GET'], '/outbox/{owner}', Module\Outbox::class); $this->routeCollector->addRoute(['GET'], '/owa', Module\Owa::class); + $this->routeCollector->addRoute(['GET'], '/opensearch', Module\OpenSearch::class); $this->routeCollector->addGroup('/photo', function (RouteCollector $collector) { $collector->addRoute(['GET'], '/{name}', Module\Photo::class); $collector->addRoute(['GET'], '/{type}/{name}', Module\Photo::class); $collector->addRoute(['GET'], '/{type}/{customize}/{name}', Module\Photo::class); }); + $this->routeCollector->addRoute(['GET'], '/pretheme', Module\ThemeDetails::class); + $this->routeCollector->addRoute(['GET'], '/probe', Module\Debug\Probe::class); $this->routeCollector->addGroup('/profile', function (RouteCollector $collector) { $collector->addRoute(['GET'], '/{nickname}', Module\Profile::class); + $collector->addRoute(['GET'], '/{nickname}/{to:\d{4}-\d{2}-\d{2}}/{from:\d{4}-\d{2}-\d{2}}', Module\Profile::class); + $collector->addRoute(['GET'], '/{nickname}/contacts[/{type}]', Module\Profile\Contacts::class); $collector->addRoute(['GET'], '/{profile:\d+}/view', Module\Profile::class); }); $this->routeCollector->addGroup('/proxy', function (RouteCollector $collector) { @@ -163,21 +199,33 @@ class Router $collector->addRoute(['GET'], '/{sub1}/{url}' , Module\Proxy::class); $collector->addRoute(['GET'], '/{sub1}/{sub2}/{url}' , Module\Proxy::class); }); + + $this->routeCollector->addGroup('/settings', function (RouteCollector $collector) { + $collector->addGroup('/2fa', function (RouteCollector $collector) { + $collector->addRoute(['GET', 'POST'], '[/]' , Module\Settings\TwoFactor\Index::class); + $collector->addRoute(['GET', 'POST'], '/recovery' , Module\Settings\TwoFactor\Recovery::class); + $collector->addRoute(['GET', 'POST'], '/app_specific' , Module\Settings\TwoFactor\AppSpecific::class); + $collector->addRoute(['GET', 'POST'], '/verify' , Module\Settings\TwoFactor\Verify::class); + }); + }); + $this->routeCollector->addRoute(['GET'], '/randprof', Module\RandomProfile::class); $this->routeCollector->addRoute(['GET', 'POST'], '/register', Module\Register::class); + $this->routeCollector->addRoute(['GET'], '/robots.txt', Module\RobotsTxt::class); $this->routeCollector->addRoute(['GET'], '/rsd.xml', Module\ReallySimpleDiscovery::class); + $this->routeCollector->addRoute(['GET'], '/smilies[/json]', Module\Smilies::class); $this->routeCollector->addRoute(['GET'], '/statistics.json', Module\Statistics::class); + $this->routeCollector->addRoute(['GET'], '/starred/{item:\d+}', Module\Starred::class); + $this->routeCollector->addRoute(['GET'], '/toggle_mobile', Module\ToggleMobile::class); $this->routeCollector->addRoute(['GET'], '/tos', Module\Tos::class); - $this->routeCollector->addRoute(['GET'], '/webfinger', Module\WebFinger::class); + $this->routeCollector->addRoute(['GET'], '/view/theme/{theme}/style.pcss', Module\Theme::class); + $this->routeCollector->addRoute(['GET'], '/viewsrc/{item:\d+}', Module\Debug\ItemBody::class); + $this->routeCollector->addRoute(['GET'], '/webfinger', Module\Debug\WebFinger::class); $this->routeCollector->addRoute(['GET'], '/xrd', Module\Xrd::class); } - public function __construct(RouteCollector $routeCollector = null) + public function __construct() { - if (!$routeCollector) { - $routeCollector = new RouteCollector(new Std(), new GroupCountBased()); - } - - $this->routeCollector = $routeCollector; + $this->routeCollector = new RouteCollector(new Std(), new GroupCountBased()); } public function getRouteCollector()