Commit 2b81d0f2 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Move core apps from private to public functions

Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
parent f5c7ba6b
......@@ -14,7 +14,7 @@
<h2>
<label for="webdavurl"><?php p($l->t('WebDAV'));?></label>
</h2>
<input id="webdavurl" type="text" readonly="readonly" value="<?php p(OC_Helper::linkToRemote('webdav')); ?>" />
<input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" />
<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
</div>
</div>
......
......@@ -395,7 +395,7 @@ class Helper {
}
}
$location = \OC_Helper::linkToAbsolute('apps/files_encryption/files', 'error.php');
$location = \OCP\Util::linkToAbsolute('apps/files_encryption/files', 'error.php');
$post = 0;
if(count($_POST) > 0) {
$post = 1;
......
......@@ -26,7 +26,7 @@
*/
// Add CSS stylesheet
\OC_Util::addStyle('files_encryption', 'settings-personal');
\OCP\Util::addStyle('files_encryption', 'settings-personal');
$tmpl = new OCP\Template('files_encryption', 'settings-personal');
......
<ul>
<li class='error'>
<?php $location = \OC_Helper::linkToRoute( "settings_personal" ).'#changePKPasswd' ?>
<?php $location = \OCP\Util::linkToRoute( "settings_personal" ).'#changePKPasswd' ?>
<?php p($_['message']); ?>
<br/>
......
......@@ -118,7 +118,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
$permissions |= \OCP\Constants::PERMISSION_DELETE;
}
if (\OC_Util::isSharingDisabledForUser()) {
if (\OCP\Util::isSharingDisabledForUser()) {
$permissions &= ~\OCP\Constants::PERMISSION_SHARE;
}
......
......@@ -990,6 +990,6 @@ class Trashbin {
* @return string
*/
public static function preview_icon($path) {
return \OC_Helper::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path));
return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path));
}
}
......@@ -33,6 +33,6 @@ OC_User::useBackend( "WEBDAVAUTH" );
$entry = array(
'id' => "user_webdavauth_settings",
'order'=>1,
'href' => OC_Helper::linkTo( "user_webdavauth", "settings.php" ),
'href' => \OCP\Util::linkTo( "user_webdavauth", "settings.php" ),
'name' => 'WEBDAVAUTH'
);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment