From 75e6734ef4374fb8d12cab9aaafcc7fc24ea9f0d Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 22 Jan 2016 11:18:42 +0100 Subject: [PATCH] Remove OC_Helper::imagePath and use the proper public interface --- apps/files/templates/list.php | 4 ++-- apps/files_sharing/templates/public.php | 4 ++-- apps/files_trashbin/templates/index.php | 4 ++-- core/templates/layout.user.php | 2 +- lib/private/app.php | 21 +++++++++++---------- lib/private/helper.php | 13 ------------- lib/private/template/functions.php | 10 +++++----- lib/public/template.php | 4 ++-- 8 files changed, 25 insertions(+), 37 deletions(-) diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 7906dfc64e..ea3e6c61d4 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -53,7 +53,7 @@ " /> + src="" /> t('Download'))?> @@ -67,7 +67,7 @@ t('Delete'))?> " /> + src="" /> diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index e6c4f57009..ae00b01dca 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -81,7 +81,7 @@ $thumbSize = 1024; - "/> + "/> t('Download'))?> @@ -105,7 +105,7 @@ $thumbSize = 1024;
- "/> + "/> t('Download %s', array($_['filename'])))?> ()
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index b5c1c62215..a7c1df93af 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -31,7 +31,7 @@ " /> + src="" /> t('Restore'))?> @@ -43,7 +43,7 @@ t('Delete'))?> " /> + src="" /> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 714525cf87..7fe67159bb 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -131,7 +131,7 @@
  • class="active"> - + t('Apps')); ?> diff --git a/lib/private/app.php b/lib/private/app.php index b4856f1186..f49db15def 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -371,6 +371,7 @@ class OC_App { */ public static function getSettingsNavigation() { $l = \OC::$server->getL10N('lib'); + $urlGenerator = \OC::$server->getURLGenerator(); $settings = array(); // by default, settings only contain the help menu @@ -381,9 +382,9 @@ class OC_App { array( "id" => "help", "order" => 1000, - "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_help'), + "href" => $urlGenerator->linkToRoute('settings_help'), "name" => $l->t("Help"), - "icon" => OC_Helper::imagePath("settings", "help.svg") + "icon" => $urlGenerator->imagePath("settings", "help.svg") ) ); } @@ -394,9 +395,9 @@ class OC_App { $settings[] = array( "id" => "personal", "order" => 1, - "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_personal'), + "href" => $urlGenerator->linkToRoute('settings_personal'), "name" => $l->t("Personal"), - "icon" => OC_Helper::imagePath("settings", "personal.svg") + "icon" => $urlGenerator->imagePath("settings", "personal.svg") ); //SubAdmins are also allowed to access user management @@ -410,9 +411,9 @@ class OC_App { $settings[] = array( "id" => "core_users", "order" => 2, - "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_users'), + "href" => $urlGenerator->linkToRoute('settings_users'), "name" => $l->t("Users"), - "icon" => OC_Helper::imagePath("settings", "users.svg") + "icon" => $urlGenerator->imagePath("settings", "users.svg") ); } @@ -422,9 +423,9 @@ class OC_App { $settings[] = array( "id" => "admin", "order" => 1000, - "href" => \OC::$server->getURLGenerator()->linkToRoute('settings_admin'), + "href" => $urlGenerator->linkToRoute('settings_admin'), "name" => $l->t("Admin"), - "icon" => OC_Helper::imagePath("settings", "admin.svg") + "icon" => $urlGenerator->imagePath("settings", "admin.svg") ); } } @@ -813,12 +814,12 @@ class OC_App { $appIcon = self::getAppPath($app) . '/img/' . $app . '.svg'; if (file_exists($appIcon)) { - $info['preview'] = OC_Helper::imagePath($app, $app . '.svg'); + $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, $app . '.svg'); $info['previewAsIcon'] = true; } else { $appIcon = self::getAppPath($app) . '/img/app.svg'; if (file_exists($appIcon)) { - $info['preview'] = OC_Helper::imagePath($app, 'app.svg'); + $info['preview'] = \OC::$server->getURLGenerator()->imagePath($app, 'app.svg'); $info['previewAsIcon'] = true; } } diff --git a/lib/private/helper.php b/lib/private/helper.php index c387cd40a2..495f95e72d 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -68,19 +68,6 @@ class OC_Helper { return $url . (($add_slash && $service[strlen($service) - 1] != '/') ? '/' : ''); } - /** - * Creates path to an image - * @param string $app app - * @param string $image image name - * @return string the url - * @deprecated Use \OC::$server->getURLGenerator()->imagePath($app, $image) - * - * Returns the path to the image. - */ - public static function imagePath($app, $image) { - return OC::$server->getURLGenerator()->imagePath($app, $image); - } - /** * get path to preview of file * @param string $path path diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index 5c8cb72c12..a57b3575ba 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -138,13 +138,13 @@ function component($app, $file) { } /** - * make OC_Helper::linkTo available as a simple function + * make \OCP\IURLGenerator::linkTo available as a simple function * @param string $app app * @param string $file file * @param array $args array with param=>value, will be appended to the returned url * @return string link to the file * - * For further information have a look at OC_Helper::linkTo + * For further information have a look at \OCP\IURLGenerator::linkTo */ function link_to( $app, $file, $args = array() ) { return \OC::$server->getURLGenerator()->linkTo($app, $file, $args); @@ -159,15 +159,15 @@ function link_to_docs($key) { } /** - * make OC_Helper::imagePath available as a simple function + * make \OCP\IURLGenerator::imagePath available as a simple function * @param string $app app * @param string $image image * @return string link to the image * - * For further information have a look at OC_Helper::imagePath + * For further information have a look at \OCP\IURLGenerator::imagePath */ function image_path( $app, $image ) { - return OC_Helper::imagePath( $app, $image ); + return \OC::$server->getURLGenerator()->imagePath( $app, $image ); } /** diff --git a/lib/public/template.php b/lib/public/template.php index 35b2c26b3a..7e46745c9d 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -45,7 +45,7 @@ namespace OCP; * @param string $image * @return string to the image * - * @see OC_Helper::imagePath + * @see \OCP\IURLGenerator::imagePath * @deprecated 8.0.0 Use \OCP\Template::image_path() instead */ function image_path( $app, $image ) { @@ -144,7 +144,7 @@ class Template extends \OC_Template { /** * Make OC_Helper::imagePath available as a simple function * - * @see OC_Helper::imagePath + * @see \OCP\IURLGenerator::imagePath * * @param string $app * @param string $image