From 2e8ed8479b0770cc7e398d8817d28ade466f6ccd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Oct 2009 17:14:18 +0000 Subject: update --- perl-install/standalone/po/fr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/po/fr.po b/perl-install/standalone/po/fr.po index ed6bffb26..6a55243d6 100644 --- a/perl-install/standalone/po/fr.po +++ b/perl-install/standalone/po/fr.po @@ -76,7 +76,7 @@ msgstr "" "Project-Id-Version: DrakX-fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-29 18:09+0100\n" -"PO-Revision-Date: 2009-09-26 19:16+0200\n" +"PO-Revision-Date: 2009-10-29 18:12+0100\n" "Last-Translator: Christophe Berthelé \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -328,9 +328,9 @@ msgid "Find Package" msgstr "Rechercher des Paquetages" #: drakbug:118 -#, fuzzy, c-format +#, c-format msgid "Browse" -msgstr "naviguer" +msgstr "Naviguer" #: drakbug:120 #, c-format @@ -2105,9 +2105,9 @@ msgid "the PCI domain of the device" msgstr "le domaine PCI de ce périphérique" #: harddrake2:60 -#, fuzzy, c-format +#, c-format msgid "PCI revision" -msgstr "Permissions" +msgstr "Révision PCI" #: harddrake2:61 #, c-format @@ -3090,7 +3090,7 @@ msgstr "" #: notify-x11-free-driver-switch:21 #, c-format msgid "Reason: %s." -msgstr "" +msgstr "Raison : %s." #: scannerdrake:51 #, c-format @@ -3641,14 +3641,14 @@ msgstr "" "Impossible d'installer les paquetages nécessaires au partage de vos scanners." #: service_harddrake:138 -#, fuzzy, c-format +#, c-format msgid "The graphic card '%s' is no more supported by the '%s' driver" -msgstr "%s n'est pas supporté par cette version de %s." +msgstr "La carte « %s » n'est plus supportée par le pilote « %s »" #: service_harddrake:167 #, c-format msgid "The proprietary kernel driver was not found for '%s' xorg driver" -msgstr "" +msgstr "Le pilote noyau propriétaire n'a pas été trouvé pour le pilote xorg « %s »" #: service_harddrake:206 #, c-format -- cgit v1.2.1 ='committer'>committer
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-08-09 11:18:05 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-08-09 11:18:05 +0000
commitf41a46c92f0915384cf9d8bd3e274071094fb74f (patch)
treea28fefb1ad47bd085dd2973c3238597252dfb587 /phpBB/includes/functions_admin.php
parentd85c1e052d0da513d3fd56c67a70a0d464cb75f5 (diff)
downloadforums-f41a46c92f0915384cf9d8bd3e274071094fb74f.tar
forums-f41a46c92f0915384cf9d8bd3e274071094fb74f.tar.gz
forums-f41a46c92f0915384cf9d8bd3e274071094fb74f.tar.bz2
forums-f41a46c92f0915384cf9d8bd3e274071094fb74f.tar.xz
forums-f41a46c92f0915384cf9d8bd3e274071094fb74f.zip
Ensure consistent output from filelist
git-svn-id: file:///svn/phpbb/trunk@4354 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php23
1 files changed, 17 insertions, 6 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 85378c2491..c1d329f60b 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -161,20 +161,31 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
{
$matches = array();
- $dh = opendir($rootdir . $dir);
+ // Remove initial / if present
+ $rootdir = (substr($rootdir, 0, 1) == '/') ? substr($rootdir, 1) : $rootdir;
+ // Add closing / if present
+ $rootdir = ($rootdir && substr($rootdir, -1) != '/') ? $rootdir . '/' : $rootdir;
+
+ // Remove initial / if present
+ $dir = (substr($dir, 0, 1) == '/') ? substr($dir, 1) : $dir;
+ // Add closing / if present
+ $dir = ($dir && substr($dir, -1) != '/') ? $dir . '/' : $dir;
+ $dh = opendir($rootdir . $dir);
while ($fname = readdir($dh))
{
- if (is_file("$rootdir$dir/$fname") && filesize("$rootdir$dir/$fname") && preg_match('#\.' . $type . '$#i', $fname))
+ if (is_file("$rootdir$dir$fname"))
{
- $matches[$dir][] = $fname;
+ if (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);
}
}
-
closedir($dh);
return $matches;