button to remove folder

3 files changed, 28 insertions, 22 deletions

diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index 1073bd288..65b9164de 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -145,15 +145,13 @@ class OC_News_FeedMapper {
 		return $feedid;
 	}
 	
-	public function delete(OC_News_Feed $feed){
-		$id = $feed->getId();
-	
-		$stmt = OCP\DB::prepare("
-			DELETE FROM " . self::tableName . 
-			"WHERE id = $id
-			");
+	public function deleteById($id){
+		if ($id == null) {
+			return false;
+		}
+		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
 
-		$result = $stmt->execute();
+		$result = $stmt->execute(array($id));
 		
 		$itemMapper = new OC_News_ItemMapper();
 		//TODO: handle the value that the execute returns
@@ -161,6 +159,10 @@ class OC_News_FeedMapper {
 		
 		return true;
 	}
+	public function delete(OC_News_Feed $feed){
+		$id = $feed->getId();
+		return deleteById($id);
+	}
 	
 	public function deleteAll($folderdid){
 		$id = $feed->getId();
diff --git a/lib/foldermapper.php b/lib/foldermapper.php
index 48c4b18ad..ade54c72f 100644
--- a/lib/foldermapper.php
+++ b/lib/foldermapper.php
@@ -116,20 +116,24 @@ class OC_News_FolderMapper {
 		return $folderid;
 	}
 	
-	//TODO: replace it with a DELETE INNER JOIN operation
 	public function delete(OC_News_Folder $folder){
-		$id = $folder->getId();
-	
-		$stmt = OCP\DB::prepare("
-			DELETE FROM " . self::tableName . 
-			"WHERE id = $id
-			");
+		$folderid = $folder->getId();
+		return deleteById(folderid);
+	}
+  
+	//TODO: replace it with a DELETE INNER JOIN operation
+	public function deleteById($folderid){
+		if ($folderid == null){
+			return false;
+		}
+
+		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE id = ?');
 
-		$result = $stmt->execute();
+		$result = $stmt->execute(array($folderid));
 		
 		$feedMapper = new OC_News_FeedMapper();
 		//TODO: handle the value that the execute returns
-		$feedMapper->deleteAll($id);
+		$feedMapper->deleteAll($folderid);
 		
 		return true;
 	}
diff --git a/lib/itemmapper.php b/lib/itemmapper.php
index b08dcd86b..db2dd0056 100644
--- a/lib/itemmapper.php
+++ b/lib/itemmapper.php
@@ -139,12 +139,12 @@ class OC_News_ItemMapper {
 	 * @return 
 	 */
 	public function deleteAll($feedid){
-		$stmt = OCP\DB::prepare("
-			DELETE FROM " . self::tableName . 
-			"WHERE feedid = $id
-			");
+		if ($feedid == null) {
+			return false;
+		}
+		$stmt = OCP\DB::prepare('DELETE FROM ' . self::tableName .' WHERE feed_id = ?');
 
-		$result = $stmt->execute();
+		$result = $stmt->execute(array($feedid));
 		
 		return $result;
 	}