1 files changed, 15 insertions, 18 deletions

diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index f78f641d8..044d954ab 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -1,26 +1,26 @@
 <?php
 
-	function print_folder(OCA\News\Folder $folder){
-		$tmpl_folder = new OCP\Template("news", "part.listfolder");
-		$tmpl_folder->assign('folder', $folder);
-		$tmpl_folder->printpage();
-
-		$children = $folder->getChildren();
-		foreach($children as $child) {
-			if ($child instanceOf OCA\News\Folder){
-				print_folder($child);
+	function print_collection_list($list) {
+		
+		foreach($list as $collection) {
+			if ($collection instanceOf OCA\News\Folder){
+				$tmpl_folder = new OCP\Template("news", "part.listfolder");
+				$tmpl_folder->assign('folder', $collection);
+				$tmpl_folder->printpage();
+				print_collection_list($collection->getChildren());
+				echo '</ul></li>';
 			}
-			elseif ($child instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID');
+			elseif ($collection instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID');
 				$itemmapper = new OCA\News\ItemMapper();
 
-				$items = $itemmapper->findAll($child->getId());
+				$items = $itemmapper->findAll($collection->getId());
 				$counter = 0;
 				foreach($items as $item) {
 					if(!$item->isRead())
 						++$counter;
 				}
 				$tmpl_feed = new OCP\Template("news", "part.listfeed");
-				$tmpl_feed->assign('child', $child);
+				$tmpl_feed->assign('feed', $collection);
 				$tmpl_feed->assign('unreadItems',$counter);
 				$tmpl_feed->printpage();
 			}
@@ -28,12 +28,9 @@
 			//TODO:handle error in this case
 			}
 		}
-		echo '</ul></li>';
+	
 	}
 
 	$allfeeds = isset($_['allfeeds']) ? $_['allfeeds'] : '';
-?>
-
-<?php
-print_folder($allfeeds);
-?>
\ No newline at end of file
+	
+	print_collection_list($allfeeds);