Browse Source

Continue url-import even when an error occurs

Tobias Reich 11 years ago
parent
commit
5d7328613d
1 changed files with 14 additions and 8 deletions
  1. 14 8
      php/modules/Import.php

+ 14 - 8
php/modules/Import.php

@@ -30,25 +30,31 @@ class Import extends Module {
 
 	static function url($urls, $albumID = 0) {
 
+		$error = false;
+
 		# Parse
 		$urls = str_replace(' ', '%20', $urls);
 		$urls = explode(',', $urls);
 
 		foreach ($urls as &$url) {
 
-			if (@exif_imagetype($url)!==false) {
+			if (@exif_imagetype($url)===false) {
+				$error = true;
+				continue;
+			}
 
-				$pathinfo	= pathinfo($url);
-				$filename	= $pathinfo['filename'] . '.' . $pathinfo['extension'];
-				$tmp_name	= LYCHEE_DATA . $filename;
+			$pathinfo	= pathinfo($url);
+			$filename	= $pathinfo['filename'] . '.' . $pathinfo['extension'];
+			$tmp_name	= LYCHEE_DATA . $filename;
 
-				if (!@copy($url, $tmp_name)) return false;
-
-			}
+			if (@copy($url, $tmp_name)===false) $error = true;
 
 		}
 
-		return Import::server($albumID, LYCHEE_DATA);
+		$import = Import::server($albumID, LYCHEE_DATA);
+
+		if ($error===false&&$import===true) return true;
+		else return false;
 
 	}