properly use OCP\Util instead of OC_Helper

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 92ae25de4ccb5a7165223cf80fd93c2c2322c722..efbc6bda1dbd3bcf2d27007508be170f510635b0 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -53,22 +53,6 @@ use Symfony\Component\Process\ExecutableFinder;
 class OC_Helper {
        private static $templateManager;
 
-       /**
-        * Creates an absolute url
-        * @param string $app app
-        * @param string $file file
-        * @param array $args array with param=>value, will be appended to the returned url
-        *    The value of $args will be urlencoded
-        * @return string the url
-        *
-        * Returns a absolute url to the given app and file.
-        */
-       public static function linkToAbsolute($app, $file, $args = array()) {
-               return OC::$server->getURLGenerator()->getAbsoluteURL(
-                       OC::$server->getURLGenerator()->linkTo($app, $file, $args)
-               );
-       }
-
        /**
         * Creates an url for remote use
         * @param string $service id

diff --git a/lib/private/util.php b/lib/private/util.php
index c63befb3f32d090a7b0a5bf83c44c2e31df9ab77..2ecacc53bd4f83dcbe320a807343b3b27204f5d9 100644 (file)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -974,7 +974,7 @@ class OC_Util {
         */
        public static function checkAppEnabled($app) {
                if (!OC_App::isEnabled($app)) {
-                       header('Location: ' . OC_Helper::linkToAbsolute('', 'index.php'));
+                       header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
                        exit();
                }
        }
@@ -988,7 +988,7 @@ class OC_Util {
        public static function checkLoggedIn() {
                // Check if we are a user
                if (!OC_User::isLoggedIn()) {
-                       header('Location: ' . OC_Helper::linkToAbsolute('', 'index.php',
+                       header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php',
                                        [
                                                'redirect_url' => \OC::$server->getRequest()->getRequestUri()
                                        ]
@@ -1006,7 +1006,7 @@ class OC_Util {
        public static function checkAdminUser() {
                OC_Util::checkLoggedIn();
                if (!OC_User::isAdminUser(OC_User::getUser())) {
-                       header('Location: ' . OC_Helper::linkToAbsolute('', 'index.php'));
+                       header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
                        exit();
                }
        }
@@ -1046,7 +1046,7 @@ class OC_Util {
                }
 
                if (!$isSubAdmin) {
-                       header('Location: ' . OC_Helper::linkToAbsolute('', 'index.php'));
+                       header('Location: ' . \OCP\Util::linkToAbsolute('', 'index.php'));
                        exit();
                }
                return true;

diff --git a/lib/public/util.php b/lib/public/util.php
index da4aa6e9debcfec969d74b88a4444ce449c72a00..6f5016fa4a12a57710d36e71ac8e5bca52193ca7 100644 (file)
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -269,7 +269,10 @@ class Util {
         * @since 4.0.0 - parameter $args was added in 4.5.0
         */
        public static function linkToAbsolute( $app, $file, $args = array() ) {
-               return(\OC_Helper::linkToAbsolute( $app, $file, $args ));
+               $urlGenerator = \OC::$server->getURLGenerator();
+               return $urlGenerator->getAbsoluteURL(
+                       $urlGenerator->linkTo($app, $file, $args)
+               );
        }
 
        /**

diff --git a/settings/help.php b/settings/help.php
index 21b48242706c75c9cf85e5bf1acbf638a08b7628..848ce06cf491ffcd1281c1daea052fc568c96d15 100644 (file)
--- a/settings/help.php
+++ b/settings/help.php
@@ -34,11 +34,11 @@ OC_Util::addStyle( "settings", "settings" );
 
 
 if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
-       $url=OC_Helper::linkToAbsolute( 'core', 'doc/admin/index.html' );
+       $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
        $style1='';
        $style2=' active';
 }else{
-       $url=OC_Helper::linkToAbsolute( 'core', 'doc/user/index.html' );
+       $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
        $style1=' active';
        $style2='';
 }

diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 794502e5e21ff78b33cefd9cde4f0d4f93e3abe7..22737f170d83787f230c0b60274260662ccf2a3e 100644 (file)
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -243,52 +243,6 @@ class Test_Helper extends \Test\TestCase {
 
        // Url generator methods
 
-       /**
-        * @small
-        * test linkToAbsolute URL construction
-        * @dataProvider provideDocRootAppAbsoluteUrlParts
-        */
-       public function testLinkToAbsoluteDocRoot($app, $file, $args, $expectedResult) {
-               \OC::$WEBROOT = '';
-               $result = \OC_Helper::linkToAbsolute($app, $file, $args);
-
-               $this->assertEquals($expectedResult, $result);
-       }
-
-       /**
-        * @small
-        * test linkToAbsolute URL construction in sub directory
-        * @dataProvider provideSubDirAppAbsoluteUrlParts
-        */
-       public function testLinkToAbsoluteSubDir($app, $file, $args, $expectedResult) {
-               \OC::$WEBROOT = '/owncloud';
-               $result = \OC_Helper::linkToAbsolute($app, $file, $args);
-
-               $this->assertEquals($expectedResult, $result);
-       }
-
-       /**
-        * @return array
-        */
-       public function provideDocRootAppAbsoluteUrlParts() {
-               return array(
-                       array('files', 'ajax/list.php', array(), 'http://localhost/index.php/apps/files/ajax/list.php'),
-                       array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
-                       array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/index.php?trut=trat&dut=dat'),
-               );
-       }
-
-       /**
-        * @return array
-        */
-       public function provideSubDirAppAbsoluteUrlParts() {
-               return array(
-                       array('files', 'ajax/list.php', array(), 'http://localhost/owncloud/index.php/apps/files/ajax/list.php'),
-                       array('files', 'ajax/list.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php/apps/files/ajax/list.php?trut=trat&dut=dat'),
-                       array('', 'index.php', array('trut' => 'trat', 'dut' => 'dat'), 'http://localhost/owncloud/index.php?trut=trat&dut=dat'),
-               );
-       }
-
        /**
         * @small
         * test linkToRemoteBase URL construction