mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Drop use of serendipity_admin_image_selector.php

Browse Source 
Enhance admin/images.inc.tpl instead. Gets rid of the fieldset-construct (#30)
This commit is contained in:
onli
2013-07-23 03:06:27 +02:00
parent f744ef7464
commit 731b044d50
4 changed files with 94 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/admin/images.inc.php
View File

@ -639,13 +639,40 @@ switch ($serendipity['GET']['adminAction']) {
$data['file'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
break;
case 'choose':
$media['case'] = 'choose';
$file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
$media['file'] = &$file;
if (!is_array($file)) {
$media['perm_denied'] = true;
break;
}
serendipity_prepareMedia($file);
$media['file']['props'] =& serendipity_fetchMediaProperties((int)$serendipity['GET']['fid']);
serendipity_plugin_api::hook_event('media_getproperties_cached', $media['file']['props']['base_metadata'], $media['file']['realfile']);
if ($file['is_image']) {
$file['finishJSFunction'] = $file['origfinishJSFunction'] = 'serendipity.serendipity_imageSelector_done(\'' . htmlspecialchars($serendipity['GET']['textarea']) . '\')';
if (!empty($serendipity['GET']['filename_only']) && $serendipity['GET']['filename_only'] !== 'true') {
$file['fast_select'] = true;
}
}
$media = array_merge($serendipity['GET'], $media);
$serendipity['smarty']->assignByRef('media', $media);
echo serendipity_smarty_show('admin/media_choose.tpl', $data);
return;
default:
$data['case_default'] = true;
$data['showML_def'] = showMediaLibrary();
break;
}
function showMediaLibrary($messages=false, $addvar_check = false) {
function showMediaLibrary($messages=false, $addvar_check = false, $smarty_vars = array()) {
global $serendipity;
if (!serendipity_checkPermission('adminImagesView')) {
@ -669,11 +696,20 @@ function showMediaLibrary($messages=false, $addvar_check = false) {
if (!isset($serendipity['thumbPerPage'])) {
$serendipity['thumbPerPage'] = 2;
}
$smarty_vars = array(
'textarea' => isset($serendipity['GET']['textarea']) ? $serendipity['GET']['textarea'] : false,
'htmltarget' => isset($serendipity['GET']['htmltarget']) ? $serendipity['GET']['htmltarget'] : '',
'filename_only' => isset($serendipity['GET']['filename_only']) ? $serendipity['GET']['filename_only'] : false,
);
$output .= serendipity_displayImageList(
isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1,
$serendipity['thumbPerPage'],
true
isset($serendipity['GET']['showMediaToolbar']) ? serendipity_db_bool($serendipity['GET']['showMediaToolbar']) : true,
NULL,
false,
NULL,
$smarty_vars
);
return $output;
}

9
include/functions_images.inc.php
View File

@ -1436,9 +1436,10 @@ function serendipity_calculate_aspect_size($width, $height, $size, $constraint =
* @param string The URL to use for pagination
* @param boolean Show the "upload media item" feature?
* @param boolean Restrict viewing images to a specific directory
* @param array Map of smarty vars transported into all following templates
* @return string Generated HTML
*/
function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false, $limit_path = NULL) {
function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = false, $url = NULL, $show_upload = false, $limit_path = NULL, $smarty_vars = array()) {
global $serendipity;
static $debug = false;
@ -1648,7 +1649,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
}
}
$smarty_vars = array(
$smarty_vars = array_merge($smarty_vars, array(
'limit_path' => $limit_path,
'perPage' => $perPage,
'show_upload' => $show_upload,
@ -1657,8 +1658,8 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
'linkNext' => $linkNext,
'linkPrevious' => $linkPrevious,
'extraParems' => $extraParems,
'totalImages' => $totalImages
);
'totalImages' => $totalImages,
));
return serendipity_showMedia(
$serendipity['imageList'],
$paths,