introduces field userid in the feed table to fix a bug in the update functions

6 files changed, 38 insertions, 12 deletions

diff --git a/ajax/feedlist.php b/ajax/feedlist.php
index 9f50a88fa..a1a6b7190 100644
--- a/ajax/feedlist.php
+++ b/ajax/feedlist.php
@@ -17,8 +17,8 @@ OCP\JSON::callCheck();
 
 $userid = OCP\USER::getUser();
 
-$feedmapper = new OC_News_FeedMapper();
-$feeds = $feedmapper->findAll($userid);
+$feedmapper = new OC_News_FeedMapper($userid);
+$feeds = $feedmapper->findAll();
 
 $l = OC_L10N::get('news');
 
diff --git a/appinfo/database.xml b/appinfo/database.xml
index dc3a2b606..cbb8baf1e 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -64,6 +64,13 @@
 				<length>4</length>
 			</field>
 			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+			<field>
 				<name>url</name>
 				<type>text</type>
 				<notnull>true</notnull>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 1e5215550..9d20afde0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>news</id>
 	<name>News</name>
 	<description>An RSS/Atom feed reader</description>
-	<version>6.1</version>
+	<version>6.2</version>
 	<licence>AGPL</licence>
 	<author>Alessandro Cosentino</author>
 	<require>4</require>
diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index 80afcb481..7b544c3cf 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -16,18 +16,31 @@
 class OC_News_FeedMapper {
 
 	const tableName = '*PREFIX*news_feeds';
+	private $userid;
+
+	public function __construct($userid = null){
+		if ($userid !== null) {
+			$this->userid = $userid;
+		}
+		$this->userid = OCP\USER::getUser();
+	}
+
+	/**
+	 * @brief 
+	 * @param row a row from the feeds table of the database
+	 * @returns an object of the class OC_News_Feed
+	 */
+	public function fromRow($row){
+	}
 
 	/**
 	 * @brief 
 	 * @param userid 
 	 * @returns  
 	 */
-	public function findAll($userid){
-		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . 
-					' JOIN ' . OC_News_FolderMapper::tableName . 
-					' ON ' . self::tableName. '.folder_id=' . OC_News_FolderMapper::tableName . '.id' .
-					' WHERE user_id = ?');
-		$result = $stmt->execute(array($userid));
+	public function findAll(){
+		$stmt = OCP\DB::prepare('SELECT * FROM ' . self::tableName . ' WHERE user_id = ?');
+		$result = $stmt->execute(array($this->userid));
 		$feeds = array();
 		while ($row = $result->fetchRow()) {
 			$url = $row['url'];
@@ -142,8 +155,8 @@ class OC_News_FeedMapper {
 		if ($feedid == null){
 			$query = OCP\DB::prepare('
 				INSERT INTO ' . self::tableName .
-				'(url, title, favicon_link, folder_id, added, lastmodified)
-				VALUES (?, ?, ?, ?, ?, ?)
+				'(url, title, favicon_link, folder_id, added, lastmodified, user_id)
+				VALUES (?, ?, ?, ?, ?, ?, ?)
 				');
 
 			$params=array(
@@ -153,6 +166,7 @@ class OC_News_FeedMapper {
 				$folderid,
 				$_ut, 
 				$_ut,
+				$this->userid
 			);
 			$query->execute($params);
 			
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 01dce13d7..19d7e56a5 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -23,7 +23,7 @@ class OC_News_FolderMapper {
 		if ($userid !== null) {
 			$this->userid = $userid;
 		}
-		$userid = OCP\USER::getUser();
+		$this->userid = OCP\USER::getUser();
 	}
 
 	/**
diff --git a/lib/itemmapper.php b/lib/itemmapper.php
index 8d6a755b1..b20387192 100644
--- a/lib/itemmapper.php
+++ b/lib/itemmapper.php
@@ -18,6 +18,11 @@ class OC_News_ItemMapper {
 
 	const tableName = '*PREFIX*news_items';
 
+	/**
+	 * @brief 
+	 * @param row a row from the items table of the database
+	 * @returns an object of the class OC_News_Item
+	 */
 	public function fromRow($row){
 		$url = $row['url'];
 		$title = $row['title'];