aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-08-06 15:45:13 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-08-06 15:45:13 +0000
commitb723058fb08cd225f5ff440ac648a3c5dc33b35b (patch)
tree757a95deab50d86806eb5a18c4eb9f4ee673e650 /phpBB/includes/functions_admin.php
parent76ace1d15461d98b693d7e7c905c0f5b9533c622 (diff)
downloadforums-b723058fb08cd225f5ff440ac648a3c5dc33b35b.tar
forums-b723058fb08cd225f5ff440ac648a3c5dc33b35b.tar.gz
forums-b723058fb08cd225f5ff440ac648a3c5dc33b35b.tar.bz2
forums-b723058fb08cd225f5ff440ac648a3c5dc33b35b.tar.xz
forums-b723058fb08cd225f5ff440ac648a3c5dc33b35b.zip
A fair amount of additional working or semi-working stuff ... template stored db source (when appropriate), switch theme/templates between DB/filesystem (if available), import, upload templates, imagesets, themes (if available ... i.e. no safe mode), etc. still a fair amount of stuff to do but getting there ... take care using this, backup any themes/templates/imagesets before fiddling and let me know of issues
git-svn-id: file:///svn/phpbb/trunk@4343 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index de9eb95dd9..85378c2491 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -165,15 +165,13 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
while ($fname = readdir($dh))
{
- if (is_file($rootdir . $dir . '/' . $fname) &&
- preg_match('#\.' . $type . '$#i', $fname) &&
- filesize($rootdir . $dir . '/' . $fname))
+ if (is_file("$rootdir$dir/$fname") && filesize("$rootdir$dir/$fname") && preg_match('#\.' . $type . '$#i', $fname))
{
$matches[$dir][] = $fname;
}
- else if ($fname{0} != '.' && is_dir($rootdir . $dir . '/' . $fname))
+ else if ($fname{0} != '.' && is_dir("$rootdir$dir/$fname"))
{
- $matches += filelist($rootdir, $dir . '/'. $fname, $type);
+ $matches += filelist($rootdir, "$dir/$fname", $type);
}
}