[Tikiwiki-cvs] tiki/lib/admin adminlib.php,1.24,1.25

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26431/lib/admin

Modified Files:
	adminlib.php 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: adminlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/admin/adminlib.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- adminlib.php	9 Sep 2005 12:59:43 -0000	1.24
+++ adminlib.php	3 Oct 2005 17:21:45 -0000	1.25
@@ -174,12 +174,19 @@
 		$pictures = array();
 
 		while ($res = $result->fetchRow()) {
-			preg_match_all("/\{picture file=([^\}]+)\}/", $res["data"], $pics);
+			preg_match_all("/\{(picture |img )([^\}]+)\}/ixs", $res['data'], $pics); // to be fixed: pick also the picture into ~np~
 
-			foreach (array_unique($pics[1])as $pic) {
-				$pictures[] = $pic;
+			foreach (array_unique($pics[2])as $pic) {
+				if (preg_match("/(src|file)=\"([^\"]+)\"/xis", $pic, $matches))
+					$pictures[] = $matches[2];
+				if (preg_match("/(src|file)="([^&]+)"/xis", $pic, $matches))
+					$pictures[] = $matches[2];
+				if (preg_match("/(src|file)=([^&\"\s,]+)/xis", $pic, $matches))
+					$pictures[] = $matches[2];
+				
 			}
 		}
+		$pictures = array_unique($pictures);
 
 		$path = "img/wiki_up";
 		if ($tikidomain) {
@@ -188,7 +195,7 @@
 		$h = opendir($path);
 
 		while (($file = readdir($h)) !== false) {
-			if (is_file("$path/$file") && ($file != 'license.txt')) {
+			if (is_file("$path/$file") && $file != 'license.txt' && $file != 'index.php' && $file != '.cvsignore' && $file != 'README') {
 				$filename = "$path/$file";
 
 				if (!in_array($filename, $pictures)) {