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

Fixed ML exclude path to not show/proceed ckeditor/kcfinders .thumbs dir

Browse Source 
this also did some tab2whitespace cleanup
and also fixed serendipity_fetchImages() to skip .htaccess files for ckeditor/kcfinder usage
This commit is contained in:
Ian 2013-06-04 19:23:21 +02:00
parent 230175edd4
commit 1082a5c266
2 changed files with 52 additions and 50 deletions

2
docs/NEWS

@ -3,6 +3,8 @@
Version 1.7.1 () Version 1.7.1 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fixed Media Library exclude path to not show/proceed ckeditor/kcfinders .thumbs dir
* Fixed bulletproof->colorset GET mismatch with categorytemplates plugin * Fixed bulletproof->colorset GET mismatch with categorytemplates plugin
config.inc.php [Line 29] config.inc.php [Line 29]

100
include/functions_images.inc.php

@ -384,16 +384,16 @@ function serendipity_fetchImages($group = false, $start = 0, $end = 20, $images
$basedir = $serendipity['serendipityPath'] . $serendipity['uploadPath']; $basedir = $serendipity['serendipityPath'] . $serendipity['uploadPath'];
$images = array(); $images = array();
if ($dir = @opendir($basedir . $odir)) { if ($dir = @opendir($basedir . $odir)) {
$aTempArray = array(); $aTempArray = array();
while (($file = @readdir($dir)) !== false) { while (($file = @readdir($dir)) !== false) {
if ($file == '.svn' || $file == 'CVS' || $file == '.' || $file == '..') { if ($file == '.svn' || $file == 'CVS' || $file == '.htaccess' || $file == '.' || $file == '..') {
continue; continue; // 2013/06/05 added exclude .htaccess for ckeditor/kcfinder usage
} }
array_push($aTempArray, $file); array_push($aTempArray, $file);
} }
@closedir($dir); @closedir($dir);
sort($aTempArray); sort($aTempArray);
foreach($aTempArray AS $f) { foreach($aTempArray AS $f) {
if (strpos($f, $serendipity['thumbSuffix']) !== false) { if (strpos($f, $serendipity['thumbSuffix']) !== false) {
// This is a s9y thumbnail, skip it. // This is a s9y thumbnail, skip it.
continue; continue;
@ -1472,7 +1472,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa
if ($manage && $limit_path == NULL) { if ($manage && $limit_path == NULL) {
## SYNCH START ## ## SYNCH START ##
$aExclude = array("CVS" => true, ".svn" => true); $aExclude = array("CVS" => true, ".svn" => true, ".thumbs" => true); // last one dropped in by ckeditor/kcfinder image browser
serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude); serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude);
$paths = array(); $paths = array();
$aFilesOnDisk = array(); $aFilesOnDisk = array();
@ -1804,11 +1804,11 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
while (($file = @readdir($dh)) !== false) { while (($file = @readdir($dh)) !== false) {
if ($file != '.' && $file != '..') { if ($file != '.' && $file != '..') {
$bPatternMatch = (is_null($pattern) || preg_match($pattern, $file)); $bPatternMatch = (is_null($pattern) || preg_match($pattern, $file));
$sFullPath = $odir . $file; $sFullPath = $odir . $file;
$bIsDir = is_dir($sFullPath); $bIsDir = is_dir($sFullPath);
if ($onlyDirs === false || $bIsDir) { if ($onlyDirs === false || $bIsDir) {
if ($bPatternMatch && if ($bPatternMatch &&
(!$bIsDir || $aExcludeDirs == null || !isset($aExcludeDirs[$file]))) { (!$bIsDir || $aExcludeDirs == null || !isset($aExcludeDirs[$file]))) {
$files[] = array( $files[] = array(
'name' => $file, 'name' => $file,
'depth' => $depth, 'depth' => $depth,
@ -1819,10 +1819,10 @@ function serendipity_traversePath($basedir, $dir='', $onlyDirs = true, $pattern
} }
if ($bIsDir && if ($bIsDir &&
($max_depth === null || $depth < $max_depth) && ($max_depth === null || $depth < $max_depth) &&
($aExcludeDirs == null || !isset($aExcludeDirs[$file]))) { ($aExcludeDirs == null || !isset($aExcludeDirs[$file]))) {
$next_dir = serendipity_dirSlash('end', $dir) . basename($file); $next_dir = serendipity_dirSlash('end', $dir) . basename($file);
$files = array_merge($files, serendipity_traversePath($basedir, $next_dir, $onlyDirs, $pattern, ($depth+1), $max_depth, $apply_ACL, $aExcludeDirs)); $files = array_merge($files, serendipity_traversePath($basedir, $next_dir, $onlyDirs, $pattern, ($depth+1), $max_depth, $apply_ACL, $aExcludeDirs));
} }
} }
} }
@ -2699,22 +2699,22 @@ function serendipity_prepareMedia(&$file, $url = '') {
$full_perm = serendipity_checkPermission('adminImagesMaintainOthers'); $full_perm = serendipity_checkPermission('adminImagesMaintainOthers');
} }
$sThumbSource = serendipity_getThumbNailPath($file['path'], $file['name'], $file['extension'], $file['thumbnail_name']); $sThumbSource = serendipity_getThumbNailPath($file['path'], $file['name'], $file['extension'], $file['thumbnail_name']);
$file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource; $file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource;
$file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource; $file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource;
if ($file['hotlink']) { if ($file['hotlink']) {
$file['full_file'] = $file['path']; $file['full_file'] = $file['path'];
$file['show_thumb'] = $file['path']; $file['show_thumb'] = $file['path'];
if (!isset($file['imgsrc'])) { if (!isset($file['imgsrc'])) {
$file['imgsrc'] = $file['show_thumb']; $file['imgsrc'] = $file['show_thumb'];
} }
} else { } else {
$file['full_file'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (empty($file['extension']) ? '' : '.' . $file['extension']); $file['full_file'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (empty($file['extension']) ? '' : '.' . $file['extension']);
$file['show_thumb'] = $file['full_thumbHTTP']; $file['show_thumb'] = $file['full_thumbHTTP'];
if (!isset($file['imgsrc'])) { if (!isset($file['imgsrc'])) {
$file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension']); $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . (!empty($file['thumbnail_name']) ? '.' . $file['thumbnail_name'] : '') . (empty($file['extension']) ? '' : '.' . $file['extension']);
} }
} }
// Detect PDF thumbs // Detect PDF thumbs
@ -2732,8 +2732,8 @@ function serendipity_prepareMedia(&$file, $url = '') {
$file['links'] = array('imagelinkurl' => $file['full_file']); $file['links'] = array('imagelinkurl' => $file['full_file']);
$file['dim'] = @getimagesize($file['full_thumb'], $file['thumb_header']); $file['dim'] = @getimagesize($file['full_thumb'], $file['thumb_header']);
$file['dim_orig'] = @getimagesize($serendipity['serendipityPath'] . $file['full_file'], $file['header']); $file['dim_orig'] = @getimagesize($serendipity['serendipityPath'] . $file['full_file'], $file['header']);
$file['is_image'] = serendipity_isImage($file); $file['is_image'] = serendipity_isImage($file);
if ($file['is_image']) { if ($file['is_image']) {
@ -3484,27 +3484,27 @@ function serendipity_moveMediaDirectory($oldDir, $newDir, $type = 'dir', $item_i
function &serendipity_getMediaPaths() { function &serendipity_getMediaPaths() {
global $serendipity; global $serendipity;
$aExclude = array("CVS" => true, ".svn" => true); $aExclude = array("CVS" => true, ".svn" => true, ".thumbs" => true); // last one dropped in by ckeditor/kcfinder image browser
serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude); serendipity_plugin_api::hook_event('backend_media_path_exclude_directories', $aExclude);
$paths = array(); $paths = array();
$aResultSet = serendipity_traversePath( $aResultSet = serendipity_traversePath(
$serendipity['serendipityPath'] . $serendipity['uploadPath'], $serendipity['serendipityPath'] . $serendipity['uploadPath'],
'', '',
false, false,
NULL, NULL,
1, 1,
NULL, NULL,
FALSE, FALSE,
$aExclude $aExclude
); );
foreach ($aResultSet AS $sKey => $sFile) { foreach ($aResultSet AS $sKey => $sFile) {
if ($sFile['directory']) { if ($sFile['directory']) {
array_push($paths, $sFile); array_push($paths, $sFile);
} }
unset($aResultSet[$sKey]); unset($aResultSet[$sKey]);
} }
serendipity_directoryACL($paths, 'read'); serendipity_directoryACL($paths, 'read');
usort($paths, 'serendipity_sortPath'); usort($paths, 'serendipity_sortPath');