From c193d2447d1e4e6407088d52f623fc5e68ad6161 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Wed, 15 Aug 2012 12:27:32 -0400
Subject: small fixes on model

---
 css/news.css             |  2 +-
 lib/foldermapper.php     | 12 +++++++++++-
 lib/utils.php            |  4 +++-
 templates/part.feeds.php |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/css/news.css b/css/news.css
index 14df7da8b..1f2b75a1b 100644
--- a/css/news.css
+++ b/css/news.css
@@ -500,7 +500,7 @@ ul.menu {
 }
 
 .popup.bottomleft {
-    left: 35.8em;
+    left: 3.8em;
 }
 
 
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 33a14a0c4..54ed1e8aa 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -68,7 +68,7 @@ class FolderMapper {
 		while( $row = $result->fetchRow()){
 			$folderid = $row['id'];
 			$folder = new Folder($row['name'], $folderid);
-			$children = self::childrenOf($folderid);
+			$children = self::childrenOfWithFeeds($folderid);
 			$folder->addChildren($children);
 			$collectionlist[] = $folder;
 		}
@@ -127,11 +127,21 @@ class FolderMapper {
 		return $folderid;
 	}
 
+	/**
+	 * @brief Delete the folder and all its feeds from the database
+	 * @param folder the folder to be deleted (an instance of OCA\News\Folder)
+	 * @returns true if the folder has been deleted, false if an error occurred
+	 */
 	public function delete(Folder $folder){
 		$folderid = $folder->getId();
 		return deleteById(folderid);
 	}
 
+	/**
+	 * @brief Delete the folder and all its feeds from the database
+	 * @param folder the folder to be deleted (an instance of OCA\News\Folder)
+	 * @returns true if the folder has been deleted, false if an error occurred
+	 */
 	public function deleteById($folderid){
 		if ($folderid == null){
 			return false;
diff --git a/lib/utils.php b/lib/utils.php
index 5def91e4a..7ad9f1929 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -46,7 +46,9 @@ class Utils {
 				$itemBody = $spitem->get_content();
 				$itemAuthor = $spitem->get_author();
 				$item = new Item($itemUrl, $itemTitle, $itemGUID, $itemBody);
-				$item->setAuthor($itemAuthor->get_name());
+				if ($itemAuthor !== null) {
+					$item->setAuthor($itemAuthor->get_name());
+				}
 				$items[] = $item;
 			}
 		}
diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index 044d954ab..683d535cd 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -21,7 +21,7 @@
 				}
 				$tmpl_feed = new OCP\Template("news", "part.listfeed");
 				$tmpl_feed->assign('feed', $collection);
-				$tmpl_feed->assign('unreadItems',$counter);
+				$tmpl_feed->assign('unreadItemsCount',$counter);
 				$tmpl_feed->printpage();
 			}
 			else {
-- 
cgit v1.2.3