Merge pull request #7857 from nextcloud/dep_template

Remove deprecated template functions from OCP directly
This commit is contained in:
Morris Jobke 2018-01-15 00:01:49 +01:00 committed by GitHub
commit c14dad90e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 114 deletions

View File

@ -30,7 +30,7 @@
<span class="selectedActions"><a href="" class="delete-selected"> <span class="selectedActions"><a href="" class="delete-selected">
<?php p($l->t('Delete'))?> <?php p($l->t('Delete'))?>
<img class="svg" alt="" <img class="svg" alt=""
src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" /> src="<?php print_unescaped(OCP\Template::image_path("core", "actions/delete.svg")); ?>" />
</a></span> </a></span>
</th> </th>
</tr> </tr>

View File

@ -28,121 +28,8 @@
* *
*/ */
/**
* Public interface of ownCloud for apps to use.
* Template Class
*
*/
// use OCP namespace for all classes that are considered public.
// This means that they should be used by apps instead of the internal ownCloud classes
namespace OCP; namespace OCP;
/**
* Make OC_Helper::imagePath available as a simple function
* @param string $app
* @param string $image
* @return string to the image
*
* @see \OCP\IURLGenerator::imagePath
* @deprecated 8.0.0 Use \OCP\Template::image_path() instead
* @suppress PhanDeprecatedFunction
*/
function image_path($app, $image) {
return \image_path($app, $image);
}
/**
* Make OC_Helper::mimetypeIcon available as a simple function
* @param string $mimetype
* @return string to the image of this file type.
* @deprecated 8.0.0 Use \OCP\Template::mimetype_icon() instead
* @suppress PhanDeprecatedFunction
*/
function mimetype_icon($mimetype) {
return \mimetype_icon($mimetype);
}
/**
* Make preview_icon available as a simple function
* @param string $path path to file
* @return string to the preview of the image
* @deprecated 8.0.0 Use \OCP\Template::preview_icon() instead
* @suppress PhanDeprecatedFunction
*/
function preview_icon($path) {
return \preview_icon($path);
}
/**
* Make publicpreview_icon available as a simple function
* Returns the path to the preview of the image.
* @param string $path of file
* @param string $token
* @return string link to the preview
* @deprecated 8.0.0 Use \OCP\Template::publicPreview_icon() instead
* @suppress PhanDeprecatedFunction
*/
function publicPreview_icon($path, $token) {
return \publicPreview_icon($path, $token);
}
/**
* Make OC_Helper::humanFileSize available as a simple function
* Example: 2048 to 2 kB.
* @param int $bytes in bytes
* @return string size as string
* @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead
* @suppress PhanDeprecatedFunction
*/
function human_file_size($bytes) {
return \human_file_size($bytes);
}
/**
* Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
* @param int $timestamp unix timestamp
* @param boolean $dateOnly
* @return string human readable interpretation of the timestamp
*
* @deprecated 8.0.0 Use \OCP\Template::relative_modified_date() instead
* @suppress PhanDeprecatedFunction
* @suppress PhanTypeMismatchArgument
*/
function relative_modified_date($timestamp, $dateOnly = false) {
return \relative_modified_date($timestamp, null, $dateOnly);
}
/**
* Return a human readable outout for a file size.
* @param integer $bytes size of a file in byte
* @return string human readable interpretation of a file size
* @deprecated 8.0.0 Use \OCP\Template::human_file_size() instead
* @suppress PhanDeprecatedFunction
*/
function simple_file_size($bytes) {
return \human_file_size($bytes);
}
/**
* Generate html code for an options block.
* @param array $options the options
* @param mixed $selected which one is selected?
* @param array $params the parameters
* @return string html options
* @deprecated 8.0.0 Use \OCP\Template::html_select_options() instead
* @suppress PhanDeprecatedFunction
*/
function html_select_options($options, $selected, $params=array()) {
return \html_select_options($options, $selected, $params);
}
/** /**
* This class provides the template system for owncloud. You can use it to load * This class provides the template system for owncloud. You can use it to load
* specific templates, add data and generate the html code * specific templates, add data and generate the html code