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

remove to API

Browse Source
This commit is contained in:
Ian
2015-09-23 17:49:23 +02:00
parent d9b48b8efe
commit 9e49ecc8c3
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -707,52 +707,6 @@ switch ($serendipity['GET']['adminAction']) {
break;
}
/**
* Show the Media Library
*
* @access public
* @param bool default false
* @param array $smarty_vars
* @return string Image list
*/
function showMediaLibrary($addvar_check = false, $smarty_vars = array()) {
global $serendipity;
if (!serendipity_checkPermission('adminImagesView')) {
return;
}
$output = '';
// After upload, do not show the list to be able to proceed to
// media selection.
if ($addvar_check && !empty($GLOBALS['image_selector_addvars'])) {
return true;
}
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,
);
$show_upload = isset($serendipity['GET']['showUpload']) ? $serendipity['GET']['showUpload'] : false;
$output .= serendipity_displayImageList(
isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1,
$serendipity['thumbPerPage'],
isset($serendipity['GET']['showMediaToolbar']) ? serendipity_db_bool($serendipity['GET']['showMediaToolbar']) : true,
NULL,
$show_upload,
NULL,
$smarty_vars
);
return $output;
}
if (! isset($data['showML'])) {
if (isset($_REQUEST['go_properties'])) {
$data['showMLbutton'] = true;

46
include/functions_images.inc.php
View File

@ -3618,6 +3618,52 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
return true;
}
/**
* Show the Media Library
*
* @access public
* @param bool default false
* @param array $smarty_vars
* @return string Image list
*/
function showMediaLibrary($addvar_check = false, $smarty_vars = array()) {
global $serendipity;
if (!serendipity_checkPermission('adminImagesView')) {
return;
}
$output = '';
// After upload, do not show the list to be able to proceed to
// media selection.
if ($addvar_check && !empty($GLOBALS['image_selector_addvars'])) {
return true;
}
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,
);
$show_upload = isset($serendipity['GET']['showUpload']) ? $serendipity['GET']['showUpload'] : false;
$output .= serendipity_displayImageList(
isset($serendipity['GET']['page']) ? $serendipity['GET']['page'] : 1,
$serendipity['thumbPerPage'],
isset($serendipity['GET']['showMediaToolbar']) ? serendipity_db_bool($serendipity['GET']['showMediaToolbar']) : true,
NULL,
$show_upload,
NULL,
$smarty_vars
);
return $output;
}
/**
* Gets all available media directories
*