aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/user_status/css/user-status-menu.scss8
-rw-r--r--apps/user_status/img/app.svg2
-rw-r--r--apps/user_status/img/user-status-away.svg2
-rw-r--r--apps/user_status/img/user-status-dnd.svg2
-rw-r--r--apps/user_status/img/user-status-invisible.svg2
-rw-r--r--apps/user_status/img/user-status-online.svg2
-rw-r--r--lib/private/Route/Router.php26
-rw-r--r--lib/private/Server.php11
-rw-r--r--lib/private/URLGenerator.php17
-rw-r--r--tests/lib/Route/RouterTest.php52
-rw-r--r--tests/lib/UrlGeneratorTest.php29
11 files changed, 117 insertions, 36 deletions
diff --git a/apps/user_status/css/user-status-menu.scss b/apps/user_status/css/user-status-menu.scss
index e44a1c2a573..35cf0cb78ab 100644
--- a/apps/user_status/css/user-status-menu.scss
+++ b/apps/user_status/css/user-status-menu.scss
@@ -21,15 +21,15 @@
*/
.icon-user-status-away {
- @include icon-color('user-status-away', 'user_status', '#F4A331', 1);
+ @include icon-color('user-status-away', 'user_status', '#F4A331', 2);
}
.icon-user-status-dnd {
- @include icon-color('user-status-dnd', 'user_status', '#ED484C', 1);
+ @include icon-color('user-status-dnd', 'user_status', '#ED484C', 2);
}
-@include icon-black-white('user-status-invisible', 'user_status', 2);
+@include icon-black-white('user-status-invisible', 'user_status', 3);
.icon-user-status-online {
- @include icon-color('user-status-online', 'user_status', '#49B382', 2);
+ @include icon-color('user-status-online', 'user_status', '#49B382', 3);
}
diff --git a/apps/user_status/img/app.svg b/apps/user_status/img/app.svg
index a2044af4d82..9a7e19b23b4 100644
--- a/apps/user_status/img/app.svg
+++ b/apps/user_status/img/app.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><rect fill="none" height="24" width="24"/></g><g><g><g><path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z"/></g></g></g></svg> \ No newline at end of file
+<svg width="24" height="24" enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect width="24" height="24" fill="none"/><path d="m10.615 2.1094c-4.8491 0.68106-8.6152 4.8615-8.6152 9.8906 0 5.5 4.5 10 10 10 5.0292 0 9.2096-3.7661 9.8906-8.6152-1.4654 1.601-3.5625 2.6152-5.8906 2.6152-4.4 0-8-3.6-8-8 0-2.3281 1.0143-4.4252 2.6152-5.8906z"/></svg>
diff --git a/apps/user_status/img/user-status-away.svg b/apps/user_status/img/user-status-away.svg
index a181a626e81..ab308c29efa 100644
--- a/apps/user_status/img/user-status-away.svg
+++ b/apps/user_status/img/user-status-away.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><rect fill="none" height="24" width="24"/></g><g><g><g><path fill="#F4A331" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z"/></g></g></g></svg> \ No newline at end of file
+<svg width="24" height="24" enable-background="new 0 0 24 24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect width="24" height="24" fill="none"/><path d="m10.615 2.1094c-4.8491 0.68106-8.6152 4.8615-8.6152 9.8906 0 5.5 4.5 10 10 10 5.0292 0 9.2096-3.7661 9.8906-8.6152-1.4654 1.601-3.5625 2.6152-5.8906 2.6152-4.4 0-8-3.6-8-8 0-2.3281 1.0143-4.4252 2.6152-5.8906z" fill="#f4a331"/></svg>
diff --git a/apps/user_status/img/user-status-dnd.svg b/apps/user_status/img/user-status-dnd.svg
index 30f7ee515c8..d28e52c1293 100644
--- a/apps/user_status/img/user-status-dnd.svg
+++ b/apps/user_status/img/user-status-dnd.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path fill="#ED484C" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11H7v-2h10v2z"/></svg> \ No newline at end of file
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10z" fill="#ed484c"/><path d="m8 10h8c1.108 0 2 0.892 2 2s-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2s0.892-2 2-2z" fill="#fdffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke markers fill"/></svg>
diff --git a/apps/user_status/img/user-status-invisible.svg b/apps/user_status/img/user-status-invisible.svg
index f35034565e0..a5dc34cc976 100644
--- a/apps/user_status/img/user-status-invisible.svg
+++ b/apps/user_status/img/user-status-invisible.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/></svg> \ No newline at end of file
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="m12 2c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10zm0 4a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z"/></svg>
diff --git a/apps/user_status/img/user-status-online.svg b/apps/user_status/img/user-status-online.svg
index bf97c3dc9aa..baf93c22b6a 100644
--- a/apps/user_status/img/user-status-online.svg
+++ b/apps/user_status/img/user-status-online.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><path fill="#49B382" d="M8,16h8V8H8V16z M12,2C6.48,2,2,6.48,2,12s4.48,10,10,10s10-4.48,10-10 S17.52,2,12,2L12,2z"/></g></svg> \ No newline at end of file
+<svg width="24" height="24" enable-background="new 0 0 24 24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m8 16h8v-8h-8v8zm4-14c-5.52 0-10 4.48-10 10s4.48 10 10 10 10-4.48 10-10-4.48-10-10-10z" fill="#49B382"/></svg>
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php
index 6de581ffa96..94c637e5e0d 100644
--- a/lib/private/Route/Router.php
+++ b/lib/private/Route/Router.php
@@ -73,7 +73,7 @@ class Router implements IRouter {
$this->logger = $logger;
$baseUrl = \OC::$WEBROOT;
if (!(\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true')) {
- $baseUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
+ $baseUrl .= '/index.php';
}
if (!\OC::$CLI && isset($_SERVER['REQUEST_METHOD'])) {
$method = $_SERVER['REQUEST_METHOD'];
@@ -346,13 +346,27 @@ class Router implements IRouter {
public function generate($name,
$parameters = [],
$absolute = false) {
+ $referenceType = UrlGenerator::ABSOLUTE_URL;
+ if ($absolute === false) {
+ $referenceType = UrlGenerator::ABSOLUTE_PATH;
+ }
+ $name = $this->fixLegacyRootName($name);
+ if (strpos($name, '.') !== false) {
+ list($appName, $other) = explode('.', $name, 3);
+ // OCS routes are prefixed with "ocs."
+ if ($appName === 'ocs') {
+ $appName = $other;
+ }
+ $this->loadRoutes($appName);
+ try {
+ return $this->getGenerator()->generate($name, $parameters, $referenceType);
+ } catch (RouteNotFoundException $e) {
+ }
+ }
+
+ // Fallback load all routes
$this->loadRoutes();
try {
- $referenceType = UrlGenerator::ABSOLUTE_URL;
- if ($absolute === false) {
- $referenceType = UrlGenerator::ABSOLUTE_PATH;
- }
- $name = $this->fixLegacyRootName($name);
return $this->getGenerator()->generate($name, $parameters, $referenceType);
} catch (RouteNotFoundException $e) {
$this->logger->logException($e, ['level' => ILogger::INFO]);
diff --git a/lib/private/Server.php b/lib/private/Server.php
index a934628a047..9b452f21ce1 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -644,16 +644,7 @@ class Server extends ServerContainer implements IServerContainer {
/** @deprecated 19.0.0 */
$this->registerDeprecatedAlias('L10NFactory', IFactory::class);
- $this->registerService(IURLGenerator::class, function (Server $c) {
- $config = $c->getConfig();
- $cacheFactory = $c->getMemCacheFactory();
- $request = $c->getRequest();
- return new \OC\URLGenerator(
- $config,
- $cacheFactory,
- $request
- );
- });
+ $this->registerAlias(IURLGenerator::class, URLGenerator::class);
/** @deprecated 19.0.0 */
$this->registerDeprecatedAlias('URLGenerator', IURLGenerator::class);
diff --git a/lib/private/URLGenerator.php b/lib/private/URLGenerator.php
index e90d8cf1d1c..4da6a91b6c9 100644
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -44,6 +44,7 @@ use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IURLGenerator;
+use OCP\Route\IRouter;
use RuntimeException;
/**
@@ -56,18 +57,17 @@ class URLGenerator implements IURLGenerator {
private $cacheFactory;
/** @var IRequest */
private $request;
+ /** @var IRouter*/
+ private $router;
- /**
- * @param IConfig $config
- * @param ICacheFactory $cacheFactory
- * @param IRequest $request
- */
public function __construct(IConfig $config,
ICacheFactory $cacheFactory,
- IRequest $request) {
+ IRequest $request,
+ IRouter $router) {
$this->config = $config;
$this->cacheFactory = $cacheFactory;
$this->request = $request;
+ $this->router = $router;
}
/**
@@ -80,8 +80,7 @@ class URLGenerator implements IURLGenerator {
* Returns a url to the given route.
*/
public function linkToRoute(string $routeName, array $arguments = []): string {
- // TODO: mock router
- return \OC::$server->getRouter()->generate($routeName, $arguments);
+ return $this->router->generate($routeName, $arguments);
}
/**
@@ -97,7 +96,7 @@ class URLGenerator implements IURLGenerator {
}
public function linkToOCSRouteAbsolute(string $routeName, array $arguments = []): string {
- $route = \OC::$server->getRouter()->generate('ocs.'.$routeName, $arguments, false);
+ $route = $this->router->generate('ocs.'.$routeName, $arguments, false);
$indexPhpPos = strpos($route, '/index.php/');
if ($indexPhpPos !== false) {
diff --git a/tests/lib/Route/RouterTest.php b/tests/lib/Route/RouterTest.php
new file mode 100644
index 00000000000..4fcd9d65cd1
--- /dev/null
+++ b/tests/lib/Route/RouterTest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2019 Morris Jobke <hey@morrisjobke.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\Route;
+
+use OC\Route\Router;
+use OCP\ILogger;
+use Test\TestCase;
+
+/**
+ * Class RouterTest
+ *
+ * @package Test\Route
+ */
+class RouterTest extends TestCase {
+ public function testGenerateConsecutively(): void {
+ /** @var ILogger $logger */
+ $logger = $this->createMock(ILogger::class);
+ $router = new Router($logger);
+
+ $this->assertEquals('/index.php/apps/files/', $router->generate('files.view.index'));
+
+ // the OCS route is the prefixed one for the AppFramework - see /ocs/v1.php for routing details
+ $this->assertEquals('/index.php/ocsapp/apps/dav/api/v1/direct', $router->generate('ocs.dav.direct.getUrl'));
+
+ // special route name - should load all apps and then find the route
+ $this->assertEquals('/index.php/apps/files/ajax/list.php', $router->generate('files_ajax_list'));
+
+ // test caching
+ $this->assertEquals('/index.php/apps/files/', $router->generate('files.view.index'));
+ }
+}
diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php
index 46508a217d8..b5db39dbf39 100644
--- a/tests/lib/UrlGeneratorTest.php
+++ b/tests/lib/UrlGeneratorTest.php
@@ -12,9 +12,12 @@ use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IURLGenerator;
+use OCP\Route\IRouter;
/**
* Class UrlGeneratorTest
+ *
+ * @package Test
*/
class UrlGeneratorTest extends \Test\TestCase {
@@ -24,6 +27,8 @@ class UrlGeneratorTest extends \Test\TestCase {
private $cacheFactory;
/** @var \PHPUnit\Framework\MockObject\MockObject|IRequest */
private $request;
+ /** @var \PHPUnit\Framework\MockObject\MockObject|IRouter */
+ private $router;
/** @var IURLGenerator */
private $urlGenerator;
/** @var string */
@@ -34,10 +39,12 @@ class UrlGeneratorTest extends \Test\TestCase {
$this->config = $this->createMock(IConfig::class);
$this->cacheFactory = $this->createMock(ICacheFactory::class);
$this->request = $this->createMock(IRequest::class);
+ $this->router = $this->createMock(IRouter::class);
$this->urlGenerator = new \OC\URLGenerator(
$this->config,
$this->cacheFactory,
- $this->request
+ $this->request,
+ $this->router
);
$this->originalWebRoot = \OC::$WEBROOT;
}
@@ -84,14 +91,23 @@ class UrlGeneratorTest extends \Test\TestCase {
public function testLinkToRouteAbsolute($route, $expected) {
$this->mockBaseUrl();
\OC::$WEBROOT = '/nextcloud';
+ $this->router->expects($this->once())
+ ->method('generate')
+ ->willReturnCallback(function ($routeName, $parameters) {
+ if ($routeName === 'core.Preview.getPreview') {
+ return '/index.php/core/preview.png';
+ } elseif ($routeName === 'cloud_federation_api.requesthandlercontroller.addShare') {
+ return '/index.php/ocm/shares';
+ }
+ });
$result = $this->urlGenerator->linkToRouteAbsolute($route);
$this->assertEquals($expected, $result);
}
public function provideRoutes() {
return [
- ['files_ajax_list', 'http://localhost/nextcloud/index.php/apps/files/ajax/list.php'],
['core.Preview.getPreview', 'http://localhost/nextcloud/index.php/core/preview.png'],
+ ['cloud_federation_api.requesthandlercontroller.addShare', 'http://localhost/nextcloud/index.php/ocm/shares'],
];
}
@@ -169,6 +185,15 @@ class UrlGeneratorTest extends \Test\TestCase {
public function testLinkToOCSRouteAbsolute(string $route, string $expected) {
$this->mockBaseUrl();
\OC::$WEBROOT = '/nextcloud';
+ $this->router->expects($this->once())
+ ->method('generate')
+ ->willReturnCallback(function ($routeName, $parameters) {
+ if ($routeName === 'ocs.core.OCS.getCapabilities') {
+ return '/index.php/ocsapp/cloud/capabilities';
+ } elseif ($routeName === 'ocs.core.WhatsNew.dismiss') {
+ return '/index.php/ocsapp/core/whatsnew';
+ }
+ });
$result = $this->urlGenerator->linkToOCSRouteAbsolute($route);
$this->assertEquals($expected, $result);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-05 18:43:42 +0000