use a deleted flag for deleted feeds to handle undo

1 files changed, 20 insertions, 2 deletions

diff --git a/db/foldermapper.php b/db/foldermapper.php
index 8978bb45b..f8d088cdb 100644
--- a/db/foldermapper.php
+++ b/db/foldermapper.php
@@ -65,7 +65,8 @@ class FolderMapper extends Mapper implements IMapper {
 
 	public function findAllFromUser($userId){
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-			'WHERE `user_id` = ?';
+			'WHERE `user_id` = ? ' .
+			'AND `deleted_at` = 0';
 		$params = array($userId);
 
 		return $this->findAllRows($sql, $params);
@@ -74,7 +75,7 @@ class FolderMapper extends Mapper implements IMapper {
 
 	public function findByName($folderName, $userId){
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-			'WHERE `name` = ?' .
+			'WHERE `name` = ? ' .
 			'AND `user_id` = ?';
 		$params = array($folderName, $userId);
 
@@ -96,4 +97,21 @@ class FolderMapper extends Mapper implements IMapper {
 	}
 
 
+	public function getToDelete($deleteOlderThan, $userId=null) {
+		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ?';
+		$params = array($deleteOlderThan);
+
+		// we need to sometimes only delete feeds of a user
+		if($userId !== null) {
+			$sql .= ' AND `user_id` = ?';
+			array_push($params, $userId);
+		}
+		
+		return $this->findAllRows($sql, $params);
+	}
+
+
+
 }
\ No newline at end of file