New: Autodetection with recursive scan of subdirectories.

SammysHP · SammysHP · commit 8a00b7844a55 · 2012-09-29T14:33:41.000+02:00
diff --git a/config.php.skel b/config.php.skel
@@ -4,7 +4,10 @@
  * If true, this script tries to find all directories in "autodetectroot".
  * (See next option "autodetectroot".)
  * 
- * WARNING: Not yet implemented!
+ * WARNING: Scans all subdirectories of $config['autodetectroot'] on each
+ *          request!
+ * 
+ *          Experimental, use with care!
  * 
  * Values: true, false
  */
diff --git a/index.php b/index.php
@@ -30,13 +30,39 @@ function generateImageUrl($album, $image = null, $html = true) {
     return $url;
 }
 
+function directoryScanner($directory) {
+    $result = array();
+    $containsImage = false;
+    $content = scandir($directory);
+    
+    foreach ($content as $entry) {
+        if (strstr($entry, ".jpg")
+                || strstr($entry, ".jpeg")
+                || strstr($entry, ".png")
+                || strstr($entry, ".gif")) {
+            $containsImage = true;
+        }
+        
+        if (is_dir($directory . '/' . $entry) && substr($entry, 0, 1) != ".") {
+            $result = $result + directoryScanner($directory . '/' . $entry);
+        }
+    }
+    
+    if ($containsImage) {
+        $title = substr(strrchr("/" . $directory, "/"), 1);
+        $result[$title] = $directory;
+    }
+    
+    return $result;
+}
+
 // Redirect to selected album
 if (isset($_POST['album'])) {
     header('Location: ' . generateImageUrl($_POST['album']));
     die();
 }
 
-$directories = $config['albums'];
+$directories = $config['autodetect'] ? directoryScanner($config['autodetectroot']) : $config['albums'];
 
 $album = $_GET['album'];
 $image = $_GET['image'];

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,10 @@`
`4`	`4`	`* If true, this script tries to find all directories in "autodetectroot".`
`5`	`5`	`* (See next option "autodetectroot".)`
`6`	`6`	`*`
`7`		`- * WARNING: Not yet implemented!`
	`7`	`+ * WARNING: Scans all subdirectories of $config['autodetectroot'] on each`
	`8`	`+ * request!`
	`9`	`+ *`
	`10`	`+ * Experimental, use with care!`
`8`	`11`	`*`
`9`	`12`	`* Values: true, false`
`10`	`13`	`*/`