Move reading images from folder to central function inside lib/db.php

Author: andi34

api/chromakeying/save.php

@@ -9,14 +9,7 @@
     if ($config['database']['enabled']) {
         $images = getImagesFromDB();
     } else {
-        $directory = $config['foldersAbs']['images'];
-        $dh = opendir($directory);
-
-        while (false !== ($filename = readdir($dh))) {
-            $files[] = $filename;
-        }
-        closedir($dh);
-        $images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+        $images = getImagesFromDirectory($config['foldersAbs']['images']);
     }
     $img_number = count($images);
     $files = str_pad(++$img_number, 4, '0', STR_PAD_LEFT);

api/takePic.php

@@ -60,14 +60,7 @@ function takePicture($filename) {
     if ($config['database']['enabled']) {
         $images = getImagesFromDB();
     } else {
-        $directory = $config['foldersAbs']['images'];
-        $dh = opendir($directory);
-
-        while (false !== ($filename = readdir($dh))) {
-            $files[] = $filename;
-        }
-        closedir($dh);
-        $images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+        $images = getImagesFromDirectory($config['foldersAbs']['images']);
     }
     $img_number = count($images);
     $files = str_pad(++$img_number, 4, '0', STR_PAD_LEFT);

gallery.php

@@ -15,14 +15,7 @@
 if ($config['database']['enabled']) {
 	$images = getImagesFromDB();
 } else {
-	$directory = $config['foldersAbs']['images'];
-	$dh = opendir($directory);
-
-	while (false !== ($filename = readdir($dh))) {
-		$files[] = $filename;
-	}
-	closedir($dh);
-	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+	$images = getImagesFromDirectory($config['foldersAbs']['images']);
 }
 
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;

index.php

@@ -8,14 +8,7 @@
 if ($config['database']['enabled']) {
 	$images = getImagesFromDB();
 } else {
-	$directory = $config['foldersAbs']['images'];
-	$dh = opendir($directory);
-
-	while (false !== ($filename = readdir($dh))) {
-		$files[] = $filename;
-	}
-	closedir($dh);
-	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+	$images = getImagesFromDirectory($config['foldersAbs']['images']);
 }
 
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;

lib/db.php

@@ -14,6 +14,17 @@ function getImagesFromDB() {
     return [];
 }
 
+function getImagesFromDirectory($directory) {
+    $dh = opendir($directory);
+
+    while (false !== ($filename = readdir($dh))) {
+        $files[] = $filename;
+    }
+    closedir($dh);
+    $images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+    return $images;
+}
+
 function appendImageToDB($filename) {
     $images = getImagesFromDB();
 

livechroma.php

@@ -7,14 +7,7 @@
 if ($config['database']['enabled']) {
 	$images = getImagesFromDB();
 } else {
-	$directory = $config['foldersAbs']['images'];
-	$dh = opendir($directory);
-
-	while (false !== ($filename = readdir($dh))) {
-		$files[] = $filename;
-	}
-	closedir($dh);
-	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+	$images = getImagesFromDirectory($config['foldersAbs']['images']);
 }
 $imagelist = ($config['gallery']['newest_first'] === true) ? array_reverse($images) : $images;
 

slideshow/index.php

@@ -7,14 +7,7 @@
 if ($config['database']['enabled']) {
 	$images = getImagesFromDB();
 } else {
-	$directory = $config['foldersAbs']['images'];
-	$dh = opendir($directory);
-
-	while (false !== ($filename = readdir($dh))) {
-		$files[] = $filename;
-	}
-	closedir($dh);
-	$images = preg_grep('/\.(jpg|jpeg|JPG|JPEG)$/i', $files);
+	$images = getImagesFromDirectory($config['foldersAbs']['images']);
 }
 $imagelist = array_reverse($images);