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

Patch by Matthew: Allow strict dirs

Browse Source
This commit is contained in:
Garvin Hicking 2006-08-16 10:39:06 +00:00
parent c2257500e1
commit df75b36325
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/functions_images.inc.php
View File

@ -36,9 +36,11 @@ function serendipity_isActiveFile($file) {
* @param string Only fetch files from a specific directory
* @param string Only fetch specific filenames
* @param string Only fetch media with specific keyword
* @param array An array of restricting filter sets
* @param boolean Apply strict directory checks, or include subdirectories?
* @return array Resultset of images
*/
function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order = false, $ordermode = false, $directory = '', $filename = '', $keywords = '', $filter = array()) {
function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order = false, $ordermode = false, $directory = '', $filename = '', $keywords = '', $filter = array(), $strict_directory = false) {
global $serendipity;
$cond = array(
@ -68,7 +70,11 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
}
if (!empty($directory)) {
$cond['parts']['directory'] = " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "%'\n";
if ($strict_directory) {
$cond['parts']['directory'] = " AND i.path = '" . serendipity_db_escape_string($directory) . "'\n";
} else {
$cond['parts']['directory'] = " AND i.path LIKE '" . serendipity_db_escape_string($directory) . "%'\n";
}
}
if (!empty($filename)) {