From 3829a746a154863dc264bc83aa8bde4970d59949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 7 Oct 2013 00:32:39 +0200 Subject: [PATCH] moving file to the right location --- lib/{ => private}/apphelper.php | 0 lib/{ => private}/l10n/factory.php | 2 +- lib/{ => private}/urlgenerator.php | 18 +++++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) rename lib/{ => private}/apphelper.php (100%) rename lib/{ => private}/l10n/factory.php (96%) rename lib/{ => private}/urlgenerator.php (91%) diff --git a/lib/apphelper.php b/lib/private/apphelper.php similarity index 100% rename from lib/apphelper.php rename to lib/private/apphelper.php diff --git a/lib/l10n/factory.php b/lib/private/l10n/factory.php similarity index 96% rename from lib/l10n/factory.php rename to lib/private/l10n/factory.php index ba168872ac..8c65f36817 100644 --- a/lib/l10n/factory.php +++ b/lib/private/l10n/factory.php @@ -22,7 +22,7 @@ class Factory { * get an L10N instance * @param $app string * @param $lang string|null - * @return OC_L10N + * @return \OC_L10N */ public function get($app) { if (!isset($this->instances[$app])) { diff --git a/lib/urlgenerator.php b/lib/private/urlgenerator.php similarity index 91% rename from lib/urlgenerator.php rename to lib/private/urlgenerator.php index 1db4c36cc5..5c1d9d825b 100644 --- a/lib/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -8,18 +8,20 @@ */ namespace OC; +use OCP\IURLGenerator; +use RuntimeException; /** * Class to generate URLs */ -class URLGenerator { +class URLGenerator implements IURLGenerator { /** * @brief Creates an url using a defined route * @param $route * @param array $parameters * @return * @internal param array $args with param=>value, will be appended to the returned url - * @returns the url + * @returns string the url * * Returns a url to the given app and file. */ @@ -97,15 +99,13 @@ class URLGenerator { } } + /** - * @brief Makes an $url absolute - * @param string $url the url - * @return string the absolute url - * - * Returns a absolute url to the given app and file. + * Makes an URL absolute + * @param string $url the url in the owncloud host + * @return string the absolute version of the url */ - public function makeURLAbsolute($url) { + public function getAbsoluteURL($url) { return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $url; } - }