From e4278574a8806b4748d132adb5f29fb61e6c6058 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 03:23:22 +0200
Subject: [PATCH 01/11] fixed sorting errors and missbehaviours - now sorting
 like file browser

---
 apps/gallery/lib/tiles.php       | 39 +++++++++++++-------
 apps/gallery/templates/index.php | 61 ++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index e43c99bb76..48b54f0cf0 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -63,7 +63,7 @@ class TilesLine {
 				$img_w = $this->tiles_array[$i]->getWidth();
 				$extra = '';
 				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
-			$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
+				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
 		}
 		
 		$r .= '</div>';
@@ -122,7 +122,7 @@ class TileStack extends TileBase {
 		$this->tiles_array = array();
 		$this->stack_name = $stack_name;
 		for ($i = 0; $i < count($path_array) && $i < self::STACK_REPRESENTATIVES; $i++) {
-		$tile = new TileSingle($path_array[$i]);
+			$tile = new TileSingle($path_array[$i]);
 			array_push($this->tiles_array, $tile);
 		}
 	}
@@ -134,32 +134,47 @@ class TileStack extends TileBase {
 
 	public function getWidth() {
 		$max = 0;
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$max = max($max, $this->tiles_array[$i]->getWidth());
+		if(count($this->tiles_array) == 0) {
+			$max = IMAGE_WIDTH;
+		} else {
+			for ($i = 0; $i < count($this->tiles_array); $i++) {
+				$max = max($max, $this->tiles_array[$i]->getWidth());
+			}
 		}
 		return min(IMAGE_WIDTH, $max);
 	}
 
 	public function get() {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
-		for ($i = 0; $i < count($this->tiles_array); $i++) {
-			$top = rand(-5, 5);
-			$left = rand(-5, 5);
-			$img_w = $this->tiles_array[$i]->getWidth();
-			$extra = '';
-			if ($img_w < IMAGE_WIDTH) {
-				$extra = 'width:'.$img_w.'px;';
+		if(count($this->tiles_array) == 0) {
+			// aint no pictures in this folder...
+			$r.='<div class="miniature_border gallery_div" style="border:2px solid; margin-right: 2px;"></div>';
+		} else {
+			for ($i = 0; $i < count($this->tiles_array); $i++) {
+				$top = rand(-5, 5);
+				$left = rand(-5, 5);
+				$img_w = $this->tiles_array[$i]->getWidth();
+				$extra = '';
+				if ($img_w < IMAGE_WIDTH) {
+					$extra = 'width:'.$img_w.'px;';
+				}
+				$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 			}
-			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 		}
 		return $r;
 	}
 
 	public function getOnHoverAction() {
+		if(count($this->tiles_array) == 0) {
+			return 'javascript:explode_empty(this);return false;';
+		}
 		return 'javascript:explode(this);return false;';
 	}
 	
 	public function getOnOutAction() {
+		if(count($this->tiles_array) == 0) {
+			return 'javascript:deplode_empty(this);return false;';
+		}
 		return 'javascript:deplode(this);return false;';
 	}
 
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index f992604549..930f80238b 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -16,6 +16,14 @@ div.visible { opacity: 0.8;}
 
 var root = "<?php echo htmlentities($root); ?>";
 
+function explode_empty(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).addClass('visible');
+		}
+	});
+}
+
 function explode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -28,6 +36,14 @@ function explode(element) {
 	});
 }
 
+function deplode_empty(element) {
+	$('div', element).each(function(index, elem) {
+		if ($(elem).hasClass('title')) {
+			$(elem).removeClass('visible');
+		}
+	});
+}
+
 function deplode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -79,41 +95,40 @@ $root = empty($_GET['root'])?'/':$_GET['root'];
 $images = \OC_FileCache::searchByMime('image', null, '/'.\OCP\USER::getUser().'/files'.$root);
 sort($images);
 
-$arr = array();
 $tl = new \OC\Pictures\TilesLine();
 $ts = new \OC\Pictures\TileStack(array(), '');
 $previous_element = @$images[0];
+
+$root_images = array();
+$second_level_images = array();
+
 for($i = 0; $i < count($images); $i++) {
 	$prev_dir_arr = explode('/', $previous_element);
 	$dir_arr = explode('/', $images[$i]);
 
-	if (count($dir_arr)==1) {
-		$tl->addTile(new \OC\Pictures\TileSingle($root.$images[$i]));
-		continue;
+	if(count($dir_arr) == 1) { // getting the images in this directory
+		$root_images[] = $root.$images[$i];
+	} else {
+		if (count($dir_arr) == 2) { // These are the pics in that subdir
+			$second_level_images[] = $root.$images[$i];
+		}
+		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
+			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+			$second_level_images = array();
+		}
+		// have us a little something to compare against
+		$previous_element = $images[$i];
 	}
-	if (strcmp($prev_dir_arr[0], $dir_arr[0])!=0) {
-		$tl->addTile(new \OC\Pictures\TileStack($arr, $prev_dir_arr[0]));
-		$arr = array();
-	}
-	$arr[] = $root.$images[$i];
-	$previous_element = $images[$i];
 }
 
-$dir_arr = explode('/', $previous_element);
-
-if (count($images)>1) {
-  if (count($dir_arr)==0) {
-    $tl->addTile(new \OC\Pictures\TileSingle($previous_element));
-  } else if (count($dir_arr) && $ts->getCount() == 0){
-      $ts = new \OC\Pictures\TileStack(array($root.$previous_element), $dir_arr[0]);
-  } else {
-    $arr[] = $previous_element;
-    $ts->addTile($arr);
-  }
+// if last element in the directory was a directory we don't want to miss it :)
+if(count($second_level_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 }
 
-if ($ts->getCount() != 0) {
-	$tl->addTile($ts);
+// and finally our images actually stored in the root folder
+for($i = 0; $i<count($root_images); $i++) {
+	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));
 }
 
 echo $tl->get();

From 4711c2bb412749100fa53d8e1684154b87846092 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 13:05:25 +0200
Subject: [PATCH 02/11] fixed second_level_images issue

---
 apps/gallery/templates/index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 930f80238b..5a9aba9ea0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -109,12 +109,11 @@ for($i = 0; $i < count($images); $i++) {
 	if(count($dir_arr) == 1) { // getting the images in this directory
 		$root_images[] = $root.$images[$i];
 	} else {
-		if (count($dir_arr) == 2) { // These are the pics in that subdir
-			$second_level_images[] = $root.$images[$i];
-		}
 		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
 			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 			$second_level_images = array();
+		} else if (count($dir_arr) == 2) { // These are the pics in that subdir
+			$second_level_images[] = $root.$images[$i];
 		}
 		// have us a little something to compare against
 		$previous_element = $images[$i];

From e99a95a756b15028b11871c3c7350066f2751964 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 14:06:56 +0200
Subject: [PATCH 03/11] now also working for directories only containing one
 image

---
 apps/gallery/templates/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 5a9aba9ea0..5cff2c65a0 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -112,7 +112,8 @@ for($i = 0; $i < count($images); $i++) {
 		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
 			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 			$second_level_images = array();
-		} else if (count($dir_arr) == 2) { // These are the pics in that subdir
+		}
+		if (count($dir_arr) == 2) { // These are the pics in that subdir
 			$second_level_images[] = $root.$images[$i];
 		}
 		// have us a little something to compare against

From 9f59cc5eb0069f28fc17eebc2adb3a62a13f95bd Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 14:38:12 +0200
Subject: [PATCH 04/11] improved look of directories not containing images
 directly

---
 apps/gallery/lib/tiles.php       | 4 ++--
 apps/gallery/templates/index.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 48b54f0cf0..817939759d 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -63,7 +63,7 @@ class TilesLine {
 				$img_w = $this->tiles_array[$i]->getWidth();
 				$extra = '';
 				if ($img_w != IMAGE_WIDTH) $extra = ' style="width:'.$img_w.'px"';
-				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'">'.$this->tiles_array[$i]->get().'</div>';
+				$r .= '<div class="gallery_div" '.$extra.' onmouseover="'.$this->tiles_array[$i]->getOnHoverAction().'" onmouseout="'.$this->tiles_array[$i]->getOnOutAction().'" onclick="'.$this->tiles_array[$i]->getOnClickAction().'" style="background-color:#ddd">'.$this->tiles_array[$i]->get().'</div>';
 		}
 		
 		$r .= '</div>';
@@ -148,7 +148,7 @@ class TileStack extends TileBase {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
 		if(count($this->tiles_array) == 0) {
 			// aint no pictures in this folder...
-			$r.='<div class="miniature_border gallery_div" style="border:2px solid; margin-right: 2px;"></div>';
+			$r.='<div class="miniature_border gallery_div"></div>';
 		} else {
 			for ($i = 0; $i < count($this->tiles_array); $i++) {
 				$top = rand(-5, 5);
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 5cff2c65a0..42ef9f6587 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -9,7 +9,7 @@ div.miniature_border {position:absolute; height: 150px; -moz-transition-duration
 div.line {display:inline-block; border: 0; width: auto; height: 160px}
 div.gallery_div img{position:absolute; top: 1; left: 0; -moz-transition-duration: 0.3s; -o-transition-duration:0.3s; -webkit-transition-duration: 0.3s; height:150px; width: auto;}
 div.gallery_div img.shrinker {width:80px !important;}
-div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; left:5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
+div.title { opacity: 0; text-align: center; vertical-align: middle; font-family: Arial; font-size: 12px; border: 0; position: absolute; text-overflow: ellipsis; bottom: 20px; right:-5px; height:auto; padding: 5px; width: 140px; background-color: black; color: white; -webkit-transition: opacity 0.5s;  z-index:1000; border-radius: 7px}
 div.visible { opacity: 0.8;}
 </style>
 <script type="text/javascript">
@@ -59,7 +59,7 @@ function deplode(element) {
 function openNewGal(album_name) {
 	root = root + album_name + "/";
 	var url = window.location.toString().replace(window.location.search, '');
-  url = url + "?app=gallery&root="+encodeURIComponent(root);
+	url = url + "?app=gallery&root="+encodeURIComponent(root);
 	
 	window.location = url;
 }

From 22cd610a795e1960f1bb5746908848affd5cb587 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 15:20:45 +0200
Subject: [PATCH 05/11] use images from deeper directories for preview if the
 actual directory doesn't contain any

---
 apps/gallery/templates/index.php | 45 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 42ef9f6587..a74f4c4a40 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -102,23 +102,36 @@ $previous_element = @$images[0];
 $root_images = array();
 $second_level_images = array();
 
-for($i = 0; $i < count($images); $i++) {
-	$prev_dir_arr = explode('/', $previous_element);
-	$dir_arr = explode('/', $images[$i]);
+$fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
 
-	if(count($dir_arr) == 1) { // getting the images in this directory
-		$root_images[] = $root.$images[$i];
-	} else {
-		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) {
-			$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-			$second_level_images = array();
-		}
-		if (count($dir_arr) == 2) { // These are the pics in that subdir
-			$second_level_images[] = $root.$images[$i];
-		}
-		// have us a little something to compare against
-		$previous_element = $images[$i];
-	}
+for($i = 0; $i < count($images); $i++) {
+        $prev_dir_arr = explode('/', $previous_element);
+        $dir_arr = explode('/', $images[$i]);
+
+        if(count($dir_arr) == 1) { // getting the images in this directory
+                $root_images[] = $root.$images[$i];
+        } else {
+                if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+                        if(count($second_level_images) == 0) { // if we don't have images in this directory
+                                if(count($fallback_images) != 0) { // but have fallback_images
+                                        $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+                                        $fallback_images = array();
+                                }
+                        } else { // if we collected images for this directory
+                                $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+                                echo print_r($fallback_images)."\n";
+                                $fallback_images = array();
+                                $second_level_images = array();
+                        }
+                }
+                if (count($dir_arr) == 2) { // These are the pics in our current subdir
+                        $second_level_images[] = $root.$images[$i];
+                } else { // These are images from the deeper directories
+                        $fallback_images[] = $root.$images[$i];
+                }
+                // have us a little something to compare against
+                $previous_element = $images[$i];
+        }
 }
 
 // if last element in the directory was a directory we don't want to miss it :)

From 56d2e99239f0bd3221162d719a958494534c2080 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Tue, 12 Jun 2012 15:23:05 +0200
Subject: [PATCH 06/11] deleted some debugging output

---
 apps/gallery/templates/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index a74f4c4a40..0eda1ca050 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -119,7 +119,6 @@ for($i = 0; $i < count($images); $i++) {
                                 }
                         } else { // if we collected images for this directory
                                 $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-                                echo print_r($fallback_images)."\n";
                                 $fallback_images = array();
                                 $second_level_images = array();
                         }

From b32afd1331ee881dedf4ed0467b468248ebba16b Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 12:39:18 +0200
Subject: [PATCH 07/11] we don't have empty previewstacks any more - code
 cleaned up

---
 apps/gallery/lib/tiles.php | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 817939759d..2ff4fa5647 100644
--- a/apps/gallery/lib/tiles.php
+++ b/apps/gallery/lib/tiles.php
@@ -134,47 +134,32 @@ class TileStack extends TileBase {
 
 	public function getWidth() {
 		$max = 0;
-		if(count($this->tiles_array) == 0) {
-			$max = IMAGE_WIDTH;
-		} else {
-			for ($i = 0; $i < count($this->tiles_array); $i++) {
-				$max = max($max, $this->tiles_array[$i]->getWidth());
-			}
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$max = max($max, $this->tiles_array[$i]->getWidth());
 		}
 		return min(IMAGE_WIDTH, $max);
 	}
 
 	public function get() {
 		$r = '<div class="title gallery_div">'.$this->stack_name.'</div>';
-		if(count($this->tiles_array) == 0) {
-			// aint no pictures in this folder...
-			$r.='<div class="miniature_border gallery_div"></div>';
-		} else {
-			for ($i = 0; $i < count($this->tiles_array); $i++) {
-				$top = rand(-5, 5);
-				$left = rand(-5, 5);
-				$img_w = $this->tiles_array[$i]->getWidth();
-				$extra = '';
-				if ($img_w < IMAGE_WIDTH) {
-					$extra = 'width:'.$img_w.'px;';
-				}
-				$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
+		for ($i = 0; $i < count($this->tiles_array); $i++) {
+			$top = rand(-5, 5);
+			$left = rand(-5, 5);
+			$img_w = $this->tiles_array[$i]->getWidth();
+			$extra = '';
+			if ($img_w < IMAGE_WIDTH) {
+				$extra = 'width:'.$img_w.'px;';
 			}
+			$r .= '<div class="miniature_border gallery_div" style="background-image:url(\''.$this->tiles_array[$i]->getMiniatureSrc().'\');margin-top:'.$top.'px; margin-left:'.$left.'px;'.$extra.'"></div>';
 		}
 		return $r;
 	}
 
 	public function getOnHoverAction() {
-		if(count($this->tiles_array) == 0) {
-			return 'javascript:explode_empty(this);return false;';
-		}
 		return 'javascript:explode(this);return false;';
 	}
 	
 	public function getOnOutAction() {
-		if(count($this->tiles_array) == 0) {
-			return 'javascript:deplode_empty(this);return false;';
-		}
 		return 'javascript:deplode(this);return false;';
 	}
 

From bc6884b17623cc7aaf008fba6a162b551aeb7adc Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 12:51:27 +0200
Subject: [PATCH 08/11] we don't neede the functions for empty stacks any more

---
 apps/gallery/templates/index.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 0eda1ca050..148c3df225 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -16,14 +16,6 @@ div.visible { opacity: 0.8;}
 
 var root = "<?php echo htmlentities($root); ?>";
 
-function explode_empty(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).addClass('visible');
-		}
-	});
-}
-
 function explode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {
@@ -36,14 +28,6 @@ function explode(element) {
 	});
 }
 
-function deplode_empty(element) {
-	$('div', element).each(function(index, elem) {
-		if ($(elem).hasClass('title')) {
-			$(elem).removeClass('visible');
-		}
-	});
-}
-
 function deplode(element) {
 	$('div', element).each(function(index, elem) {
 	 	if ($(elem).hasClass('title')) {

From fa67927eb5084161b0dba26dbbfa92b362985b8e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 15:14:36 +0200
Subject: [PATCH 09/11] fixed bug #996: first picture in folder is repeated in
 the last position behaving like a directory

Conflicts:
	apps/gallery/templates/index.php
---
 apps/gallery/templates/index.php | 50 ++++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 148c3df225..e7b7f2e187 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -89,32 +89,32 @@ $second_level_images = array();
 $fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
 
 for($i = 0; $i < count($images); $i++) {
-        $prev_dir_arr = explode('/', $previous_element);
-        $dir_arr = explode('/', $images[$i]);
+	$prev_dir_arr = explode('/', $previous_element);
+	$dir_arr = explode('/', $images[$i]);
 
-        if(count($dir_arr) == 1) { // getting the images in this directory
-                $root_images[] = $root.$images[$i];
-        } else {
-                if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
-                        if(count($second_level_images) == 0) { // if we don't have images in this directory
-                                if(count($fallback_images) != 0) { // but have fallback_images
-                                        $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-                                        $fallback_images = array();
-                                }
-                        } else { // if we collected images for this directory
-                                $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-                                $fallback_images = array();
-                                $second_level_images = array();
-                        }
-                }
-                if (count($dir_arr) == 2) { // These are the pics in our current subdir
-                        $second_level_images[] = $root.$images[$i];
-                } else { // These are images from the deeper directories
-                        $fallback_images[] = $root.$images[$i];
-                }
-                // have us a little something to compare against
-                $previous_element = $images[$i];
-        }
+	if(count($dir_arr) == 1) { // getting the images in this directory
+		$root_images[] = $root.$images[$i];
+	} else {
+		if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+			if(count($second_level_images) == 0) { // if we don't have images in this directory
+				if(count($fallback_images) != 0) { // but have fallback_images
+					$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+					$fallback_images = array();
+				}
+			} else { // if we collected images for this directory
+				$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+				$fallback_images = array();
+				$second_level_images = array();
+			}
+		}
+		if (count($dir_arr) == 2) { // These are the pics in our current subdir
+			$second_level_images[] = $root.$images[$i];
+		} else { // These are images from the deeper directories
+			$fallback_images[] = $root.$images[$i];
+		}
+		// have us a little something to compare against
+		$previous_element = $images[$i];
+	}
 }
 
 // if last element in the directory was a directory we don't want to miss it :)

From a3afd51b9401ea03a50d7555ad724a64820c8674 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 18:02:07 +0200
Subject: [PATCH 10/11] fixed one issue with last directory in structure having
 a lot of subdirectories and finally some pictures

---
 apps/gallery/templates/index.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index e7b7f2e187..544875a9ef 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -122,6 +122,11 @@ if(count($second_level_images)>0) {
 	$tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
 }
 
+// if last element in the directory was a directory with no second_level_images we also don't want to miss it ...
+if(count($fallback_images)>0) {
+	$tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+}
+
 // and finally our images actually stored in the root folder
 for($i = 0; $i<count($root_images); $i++) {
 	$tl->addTile(new \OC\Pictures\TileSingle($root_images[$i]));

From 4eb0c270aa902bd5d84edb2500f866fed4e6e9ab Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <st.bergemann@htw-berlin.de>
Date: Thu, 14 Jun 2012 19:38:43 +0200
Subject: [PATCH 11/11] fixed handling of fallback_images

---
 apps/gallery/templates/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 544875a9ef..bf4f117c7d 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -109,8 +109,11 @@ for($i = 0; $i < count($images); $i++) {
 		}
 		if (count($dir_arr) == 2) { // These are the pics in our current subdir
 			$second_level_images[] = $root.$images[$i];
+			$fallback_images = array();
 		} else { // These are images from the deeper directories
-			$fallback_images[] = $root.$images[$i];
+			if(count($second_level_images) == 0) {
+				$fallback_images[] = $root.$images[$i];
+			}
 		}
 		// have us a little something to compare against
 		$previous_element = $images[$i];