improves delete feed feature

2 files changed, 12 insertions, 10 deletions

diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index 65b9164de..73afa0e86 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -164,15 +164,14 @@ class OC_News_FeedMapper {
 		return deleteById($id);
 	}
 	
-	public function deleteAll($folderdid){
-		$id = $feed->getId();
-	
-		$stmt = OCP\DB::prepare("
-			DELETE FROM " . self::tableName . 
-			"WHERE id = $id
-			");
+	//it's more complicated tan this...recursive delete, or delete with a join
+	public function deleteAll($folderdid){	
+		if ($folderid == null) {
+			return false;
+		}
+		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE folder_id = ?');
 
-		$result = $stmt->execute();
+		$result = $stmt->execute(array($folderid));
 		
 		$itemMapper = new OC_News_ItemMapper();
 		//TODO: handle the value that the execute returns
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index ade54c72f..79115ec56 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -19,8 +19,11 @@ class OC_News_FolderMapper {
 	
 	private $userid;
 
-	public function __construct($userid){
-		$this->userid = $userid;
+	public function __construct($userid = null){
+		if ($userid !== null) {
+			$this->userid = $userid;
+		}
+		$userid = OCP\USER::getUser();
 	}
 	
 	public function root(){