Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v14.0.0beta1
@@ -43,7 +43,7 @@ try { | |||
} | |||
$data = array(); | |||
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; | |||
$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir='; | |||
$permissions = $dirInfo->getPermissions(); | |||
@@ -81,7 +81,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); | |||
<input type="hidden" name="dir" id="dir" value="" /> | |||
<div class="hiddenuploadfield"> | |||
<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]" | |||
data-url="<?php p(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" /> | |||
data-url="<?php p(\OC::$server->getURLGenerator()->linkTo('files', 'ajax/upload.php')); ?>" /> | |||
</div> | |||
<?php endif; ?> | |||
@@ -1000,6 +1000,6 @@ class Trashbin { | |||
* @return string | |||
*/ | |||
public static function preview_icon($path) { | |||
return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 32, 'y' => 32, 'file' => $path)); | |||
return \OC::$server->getURLGenerator()->linkToRoute('core_ajax_trashbin_preview', array('x' => 32, 'y' => 32, 'file' => $path)); | |||
} | |||
} |
@@ -10,7 +10,7 @@ | |||
<?php p($l->t('Depending on your configuration, this button could also work to trust the domain:')); ?> | |||
</p> | |||
<p style="text-align:center;"> | |||
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->getAbsoluteURL(\OCP\Util::linkToRoute('settings.AdminSettings.index'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button"> | |||
<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->getAbsoluteURL(\OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button"> | |||
<?php p($l->t('Add "%s" as trusted domain', array($_['domain']))); ?> | |||
</a> | |||
</p> |
@@ -233,33 +233,6 @@ class Util { | |||
return \OC_Helper::linkToPublic($service); | |||
} | |||
/** | |||
* Creates an url using a defined route | |||
* @param string $route | |||
* @param array $parameters | |||
* @internal param array $args with param=>value, will be appended to the returned url | |||
* @return string the url | |||
* @deprecated 8.1.0 Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters) | |||
* @since 5.0.0 | |||
*/ | |||
public static function linkToRoute( $route, $parameters = array() ) { | |||
return \OC::$server->getURLGenerator()->linkToRoute($route, $parameters); | |||
} | |||
/** | |||
* Creates an url to the given app and file | |||
* @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 | |||
* @deprecated 8.1.0 Use \OC::$server->getURLGenerator()->linkTo($app, $file, $args) | |||
* @since 4.0.0 - parameter $args was added in 4.5.0 | |||
*/ | |||
public static function linkTo( $app, $file, $args = array() ) { | |||
return \OC::$server->getURLGenerator()->linkTo($app, $file, $args); | |||
} | |||
/** | |||
* Returns the server host name without an eventual port number | |||
* @return string the server hostname | |||
@@ -307,18 +280,6 @@ class Util { | |||
return $user_part.'@localhost.localdomain'; | |||
} | |||
/** | |||
* Creates path to an image | |||
* @param string $app app | |||
* @param string $image image name | |||
* @return string the url | |||
* @deprecated 8.1.0 Use \OC::$server->getURLGenerator()->imagePath($app, $image) | |||
* @since 4.0.0 | |||
*/ | |||
public static function imagePath( $app, $image ) { | |||
return \OC::$server->getURLGenerator()->imagePath($app, $image); | |||
} | |||
/** | |||
* Make a human file size (2048 to 2 kB) | |||
* @param int $bytes file size in bytes |