convert tabs indention to indention with 4 spaces because of mixing of both variants in code and better readability on github and websites because you cant set the indention width there and 8 spaces will be used for a tab

1 files changed, 269 insertions, 269 deletions

diff --git a/db/itemmapper.php b/db/itemmapper.php
index 636df0667..5923372b9 100644
--- a/db/itemmapper.php
+++ b/db/itemmapper.php
@@ -18,275 +18,275 @@ use \OCP\IDb;
 
 class ItemMapper extends NewsMapper {
 
-	public function __construct(IDb $db){
-		parent::__construct($db, 'news_items', '\OCA\News\Db\Item');
-	}
-
-
-	private function makeSelectQuery($prependTo, $oldestFirst=false){
-		if($oldestFirst) {
-			$ordering = 'ASC';
-		} else {
-			$ordering = 'DESC';
-		}
-
-		return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '.
-			'JOIN `*PREFIX*news_feeds` `feeds` ' .
-				'ON `feeds`.`id` = `items`.`feed_id` '.
-				'AND `feeds`.`deleted_at` = 0 ' .
-				'AND `feeds`.`user_id` = ? ' .
-				$prependTo .
-			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
-				'ON `folders`.`id` = `feeds`.`folder_id` ' .
-			'WHERE `feeds`.`folder_id` = 0 ' .
-				'OR `folders`.`deleted_at` = 0 ' .
-			'ORDER BY `items`.`id` ' . $ordering;
-	}
-
-	private function makeSelectQueryStatus($prependTo, $status, $oldestFirst=false) {
-		// Hi this is Ray and you're watching Jack Ass
-		// Now look closely: this is how we adults handle weird bugs in our
-		// code: we take them variables and we cast the shit out of them
-		$status = (int) $status;
-
-		// now im gonna slowly stick them in the query, be careful!
-		return $this->makeSelectQuery(
-
-			// WARNING: this is a desperate attempt at making this query work
-			// because prepared statements dont work. This is a possible
-			// SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
-			// think twice when changing this
-			'AND ((`items`.`status` & ' . $status . ') = ' . $status . ') ' .
-			$prependTo, $oldestFirst
-		);
-	}
-
-
-	public function find($id, $userId){
-		$sql = $this->makeSelectQuery('AND `items`.`id` = ? ');
-		return $this->findEntity($sql, [$userId, $id]);
-	}
-
-
-	public function starredCount($userId){
-		$sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_items` `items` '.
-			'JOIN `*PREFIX*news_feeds` `feeds` ' .
-				'ON `feeds`.`id` = `items`.`feed_id` '.
-				'AND `feeds`.`deleted_at` = 0 ' .
-				'AND `feeds`.`user_id` = ? ' .
-				'AND ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' .
-				StatusFlag::STARRED . ')' .
-			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
-				'ON `folders`.`id` = `feeds`.`folder_id` ' .
-			'WHERE `feeds`.`folder_id` = 0 ' .
-				'OR `folders`.`deleted_at` = 0';
-
-		$params = [$userId];
-
-		$result = $this->execute($sql, $params)->fetch();
-
-		return (int) $result['size'];
-	}
-
-
-	public function readAll($highestItemId, $time, $userId) {
-		$sql = 'UPDATE `*PREFIX*news_items` ' .
-			'SET `status` = `status` & ? ' .
-			', `last_modified` = ? ' .
-			'WHERE `feed_id` IN (' .
-				'SELECT `id` FROM `*PREFIX*news_feeds` ' .
-					'WHERE `user_id` = ? ' .
-				') '.
-			'AND `id` <= ?';
-		$params = [~StatusFlag::UNREAD, $time, $userId, $highestItemId];
-		$this->execute($sql, $params);
-	}
-
-
-	public function readFolder($folderId, $highestItemId, $time, $userId) {
-		$sql = 'UPDATE `*PREFIX*news_items` ' .
-			'SET `status` = `status` & ? ' .
-			', `last_modified` = ? ' .
-			'WHERE `feed_id` IN (' .
-				'SELECT `id` FROM `*PREFIX*news_feeds` ' .
-					'WHERE `folder_id` = ? ' .
-					'AND `user_id` = ? ' .
-				') '.
-			'AND `id` <= ?';
-		$params = [~StatusFlag::UNREAD, $time, $folderId, $userId,
-			$highestItemId];
-		$this->execute($sql, $params);
-	}
-
-
-	public function readFeed($feedId, $highestItemId, $time, $userId){
-		$sql = 'UPDATE `*PREFIX*news_items` ' .
-			'SET `status` = `status` & ? ' .
-			', `last_modified` = ? ' .
-				'WHERE `feed_id` = ? ' .
-				'AND `id` <= ? ' .
-				'AND EXISTS (' .
-					'SELECT * FROM `*PREFIX*news_feeds` ' .
-					'WHERE `user_id` = ? ' .
-					'AND `id` = ? ) ';
-		$params = [~StatusFlag::UNREAD, $time, $feedId, $highestItemId,
-			$userId, $feedId];
-
-		$this->execute($sql, $params);
-	}
-
-
-	private function getOperator($oldestFirst) {
-		if($oldestFirst) {
-			return '>';
-		} else {
-			return '<';
-		}
-	}
-
-
-	public function findAllNew($updatedSince, $status, $userId){
-		$sql = $this->makeSelectQueryStatus(
-			'AND `items`.`last_modified` >= ? ', $status);
-		$params = [$userId, $updatedSince];
-		return $this->findEntities($sql, $params);
-	}
-
-
-	public function findAllNewFolder($id, $updatedSince, $status, $userId){
-		$sql = 'AND `feeds`.`folder_id` = ? ' .
-				'AND `items`.`last_modified` >= ? ';
-		$sql = $this->makeSelectQueryStatus($sql, $status);
-		$params = [$userId, $id, $updatedSince];
-		return $this->findEntities($sql, $params);
-	}
-
-
-	public function findAllNewFeed($id, $updatedSince, $status, $userId){
-		$sql = 'AND `items`.`feed_id` = ? ' .
-				'AND `items`.`last_modified` >= ? ';
-		$sql = $this->makeSelectQueryStatus($sql, $status);
-		$params = [$userId, $id, $updatedSince];
-		return $this->findEntities($sql, $params);
-	}
-
-
-	public function findAllFeed($id, $limit, $offset, $status, $oldestFirst, $userId){
-		$params = [$userId, $id];
-		$sql = 'AND `items`.`feed_id` = ? ';
-		if($offset !== 0){
-			$sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
-			$params[] = $offset;
-		}
-		$sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
-		return $this->findEntities($sql, $params, $limit);
-	}
-
-
-	public function findAllFolder($id, $limit, $offset, $status, $oldestFirst, $userId){
-		$params = [$userId, $id];
-		$sql = 'AND `feeds`.`folder_id` = ? ';
-		if($offset !== 0){
-			$sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
-			$params[] = $offset;
-		}
-		$sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
-		return $this->findEntities($sql, $params, $limit);
-	}
-
-
-	public function findAll($limit, $offset, $status, $oldestFirst, $userId){
-		$params = [$userId];
-		$sql = '';
-		if($offset !== 0){
-			$sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
-			$params[] = $offset;
-		}
-		$sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
-		return $this->findEntities($sql, $params, $limit);
-	}
-
-
-	public function findAllUnreadOrStarred($userId) {
-		$params = [$userId];
-		$status = StatusFlag::UNREAD | StatusFlag::STARRED;
-		$sql = 'AND ((`items`.`status` & ' . $status . ') > 0) ';
-		$sql = $this->makeSelectQuery($sql);
-		return $this->findEntities($sql, $params);
-	}
-
-
-	public function findByGuidHash($guidHash, $feedId, $userId){
-		$sql = $this->makeSelectQuery(
-			'AND `items`.`guid_hash` = ? ' .
-			'AND `feeds`.`id` = ? ');
-
-		return $this->findEntity($sql, [$userId, $guidHash, $feedId]);
-	}
-
-
-	/**
-	 * Delete all items for feeds that have over $threshold unread and not
-	 * starred items
-	 */
-	public function deleteReadOlderThanThreshold($threshold){
-		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
-		$sql = 'SELECT COUNT(*) - `feeds`.`articles_per_update` AS `size`, ' .
-		'`items`.`feed_id` AS `feed_id` ' .
-			'FROM `*PREFIX*news_items` `items` ' .
-			'JOIN `*PREFIX*news_feeds` `feeds` ' .
-				'ON `feeds`.`id` = `items`.`feed_id` ' .
-			'WHERE NOT ((`items`.`status` & ?) > 0) ' .
-			'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' .
-			'HAVING COUNT(*) > ?';
-		$params = [$status, $threshold];
-		$result = $this->execute($sql, $params);
-
-		while($row = $result->fetch()) {
-
-			$size = (int) $row['size'];
-			$limit = $size - $threshold;
-
-			if($limit > 0) {
-				$params = [$status, $row['feed_id']];
-
-				$sql = 'DELETE FROM `*PREFIX*news_items` ' .
-				'WHERE NOT ((`status` & ?) > 0) ' .
-				'AND `feed_id` = ? ' .
-				'ORDER BY `id` ASC';
-
-				$this->execute($sql, $params, $limit);
-			}
-		}
-	}
-
-
-	public function getNewestItemId($userId) {
-		$sql = 'SELECT MAX(`items`.`id`) AS `max_id` FROM `*PREFIX*news_items` `items` '.
-			'JOIN `*PREFIX*news_feeds` `feeds` ' .
-				'ON `feeds`.`id` = `items`.`feed_id` '.
-				'AND `feeds`.`user_id` = ?';
-		$params = [$userId];
-
-		$result = $this->findOneQuery($sql, $params);
-
-		return (int) $result['max_id'];
-	}
-
-
-	/**
-	 * Deletes all items of a user
-	 * @param string $userId the name of the user
-	 */
-	public function deleteUser($userId) {
-		$sql = 'DELETE FROM `*PREFIX*news_items` ' .
-			'WHERE `feed_id` IN (' .
-				'SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds` ' .
-					'WHERE `feeds`.`user_id` = ?' .
-				')';
-
-		$this->execute($sql, [$userId]);
-	}
+    public function __construct(IDb $db){
+        parent::__construct($db, 'news_items', '\OCA\News\Db\Item');
+    }
+
+
+    private function makeSelectQuery($prependTo, $oldestFirst=false){
+        if($oldestFirst) {
+            $ordering = 'ASC';
+        } else {
+            $ordering = 'DESC';
+        }
+
+        return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '.
+            'JOIN `*PREFIX*news_feeds` `feeds` ' .
+                'ON `feeds`.`id` = `items`.`feed_id` '.
+                'AND `feeds`.`deleted_at` = 0 ' .
+                'AND `feeds`.`user_id` = ? ' .
+                $prependTo .
+            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
+                'ON `folders`.`id` = `feeds`.`folder_id` ' .
+            'WHERE `feeds`.`folder_id` = 0 ' .
+                'OR `folders`.`deleted_at` = 0 ' .
+            'ORDER BY `items`.`id` ' . $ordering;
+    }
+
+    private function makeSelectQueryStatus($prependTo, $status, $oldestFirst=false) {
+        // Hi this is Ray and you're watching Jack Ass
+        // Now look closely: this is how we adults handle weird bugs in our
+        // code: we take them variables and we cast the shit out of them
+        $status = (int) $status;
+
+        // now im gonna slowly stick them in the query, be careful!
+        return $this->makeSelectQuery(
+
+            // WARNING: this is a desperate attempt at making this query work
+            // because prepared statements dont work. This is a possible
+            // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT.
+            // think twice when changing this
+            'AND ((`items`.`status` & ' . $status . ') = ' . $status . ') ' .
+            $prependTo, $oldestFirst
+        );
+    }
+
+
+    public function find($id, $userId){
+        $sql = $this->makeSelectQuery('AND `items`.`id` = ? ');
+        return $this->findEntity($sql, [$userId, $id]);
+    }
+
+
+    public function starredCount($userId){
+        $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_items` `items` '.
+            'JOIN `*PREFIX*news_feeds` `feeds` ' .
+                'ON `feeds`.`id` = `items`.`feed_id` '.
+                'AND `feeds`.`deleted_at` = 0 ' .
+                'AND `feeds`.`user_id` = ? ' .
+                'AND ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' .
+                StatusFlag::STARRED . ')' .
+            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
+                'ON `folders`.`id` = `feeds`.`folder_id` ' .
+            'WHERE `feeds`.`folder_id` = 0 ' .
+                'OR `folders`.`deleted_at` = 0';
+
+        $params = [$userId];
+
+        $result = $this->execute($sql, $params)->fetch();
+
+        return (int) $result['size'];
+    }
+
+
+    public function readAll($highestItemId, $time, $userId) {
+        $sql = 'UPDATE `*PREFIX*news_items` ' .
+            'SET `status` = `status` & ? ' .
+            ', `last_modified` = ? ' .
+            'WHERE `feed_id` IN (' .
+                'SELECT `id` FROM `*PREFIX*news_feeds` ' .
+                    'WHERE `user_id` = ? ' .
+                ') '.
+            'AND `id` <= ?';
+        $params = [~StatusFlag::UNREAD, $time, $userId, $highestItemId];
+        $this->execute($sql, $params);
+    }
+
+
+    public function readFolder($folderId, $highestItemId, $time, $userId) {
+        $sql = 'UPDATE `*PREFIX*news_items` ' .
+            'SET `status` = `status` & ? ' .
+            ', `last_modified` = ? ' .
+            'WHERE `feed_id` IN (' .
+                'SELECT `id` FROM `*PREFIX*news_feeds` ' .
+                    'WHERE `folder_id` = ? ' .
+                    'AND `user_id` = ? ' .
+                ') '.
+            'AND `id` <= ?';
+        $params = [~StatusFlag::UNREAD, $time, $folderId, $userId,
+            $highestItemId];
+        $this->execute($sql, $params);
+    }
+
+
+    public function readFeed($feedId, $highestItemId, $time, $userId){
+        $sql = 'UPDATE `*PREFIX*news_items` ' .
+            'SET `status` = `status` & ? ' .
+            ', `last_modified` = ? ' .
+                'WHERE `feed_id` = ? ' .
+                'AND `id` <= ? ' .
+                'AND EXISTS (' .
+                    'SELECT * FROM `*PREFIX*news_feeds` ' .
+                    'WHERE `user_id` = ? ' .
+                    'AND `id` = ? ) ';
+        $params = [~StatusFlag::UNREAD, $time, $feedId, $highestItemId,
+            $userId, $feedId];
+
+        $this->execute($sql, $params);
+    }
+
+
+    private function getOperator($oldestFirst) {
+        if($oldestFirst) {
+            return '>';
+        } else {
+            return '<';
+        }
+    }
+
+
+    public function findAllNew($updatedSince, $status, $userId){
+        $sql = $this->makeSelectQueryStatus(
+            'AND `items`.`last_modified` >= ? ', $status);
+        $params = [$userId, $updatedSince];
+        return $this->findEntities($sql, $params);
+    }
+
+
+    public function findAllNewFolder($id, $updatedSince, $status, $userId){
+        $sql = 'AND `feeds`.`folder_id` = ? ' .
+                'AND `items`.`last_modified` >= ? ';
+        $sql = $this->makeSelectQueryStatus($sql, $status);
+        $params = [$userId, $id, $updatedSince];
+        return $this->findEntities($sql, $params);
+    }
+
+
+    public function findAllNewFeed($id, $updatedSince, $status, $userId){
+        $sql = 'AND `items`.`feed_id` = ? ' .
+                'AND `items`.`last_modified` >= ? ';
+        $sql = $this->makeSelectQueryStatus($sql, $status);
+        $params = [$userId, $id, $updatedSince];
+        return $this->findEntities($sql, $params);
+    }
+
+
+    public function findAllFeed($id, $limit, $offset, $status, $oldestFirst, $userId){
+        $params = [$userId, $id];
+        $sql = 'AND `items`.`feed_id` = ? ';
+        if($offset !== 0){
+            $sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
+            $params[] = $offset;
+        }
+        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
+        return $this->findEntities($sql, $params, $limit);
+    }
+
+
+    public function findAllFolder($id, $limit, $offset, $status, $oldestFirst, $userId){
+        $params = [$userId, $id];
+        $sql = 'AND `feeds`.`folder_id` = ? ';
+        if($offset !== 0){
+            $sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
+            $params[] = $offset;
+        }
+        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
+        return $this->findEntities($sql, $params, $limit);
+    }
+
+
+    public function findAll($limit, $offset, $status, $oldestFirst, $userId){
+        $params = [$userId];
+        $sql = '';
+        if($offset !== 0){
+            $sql .= 'AND `items`.`id` ' . $this->getOperator($oldestFirst) . ' ? ';
+            $params[] = $offset;
+        }
+        $sql = $this->makeSelectQueryStatus($sql, $status, $oldestFirst);
+        return $this->findEntities($sql, $params, $limit);
+    }
+
+
+    public function findAllUnreadOrStarred($userId) {
+        $params = [$userId];
+        $status = StatusFlag::UNREAD | StatusFlag::STARRED;
+        $sql = 'AND ((`items`.`status` & ' . $status . ') > 0) ';
+        $sql = $this->makeSelectQuery($sql);
+        return $this->findEntities($sql, $params);
+    }
+
+
+    public function findByGuidHash($guidHash, $feedId, $userId){
+        $sql = $this->makeSelectQuery(
+            'AND `items`.`guid_hash` = ? ' .
+            'AND `feeds`.`id` = ? ');
+
+        return $this->findEntity($sql, [$userId, $guidHash, $feedId]);
+    }
+
+
+    /**
+     * Delete all items for feeds that have over $threshold unread and not
+     * starred items
+     */
+    public function deleteReadOlderThanThreshold($threshold){
+        $status = StatusFlag::STARRED | StatusFlag::UNREAD;
+        $sql = 'SELECT COUNT(*) - `feeds`.`articles_per_update` AS `size`, ' .
+        '`items`.`feed_id` AS `feed_id` ' .
+            'FROM `*PREFIX*news_items` `items` ' .
+            'JOIN `*PREFIX*news_feeds` `feeds` ' .
+                'ON `feeds`.`id` = `items`.`feed_id` ' .
+            'WHERE NOT ((`items`.`status` & ?) > 0) ' .
+            'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' .
+            'HAVING COUNT(*) > ?';
+        $params = [$status, $threshold];
+        $result = $this->execute($sql, $params);
+
+        while($row = $result->fetch()) {
+
+            $size = (int) $row['size'];
+            $limit = $size - $threshold;
+
+            if($limit > 0) {
+                $params = [$status, $row['feed_id']];
+
+                $sql = 'DELETE FROM `*PREFIX*news_items` ' .
+                'WHERE NOT ((`status` & ?) > 0) ' .
+                'AND `feed_id` = ? ' .
+                'ORDER BY `id` ASC';
+
+                $this->execute($sql, $params, $limit);
+            }
+        }
+    }
+
+
+    public function getNewestItemId($userId) {
+        $sql = 'SELECT MAX(`items`.`id`) AS `max_id` FROM `*PREFIX*news_items` `items` '.
+            'JOIN `*PREFIX*news_feeds` `feeds` ' .
+                'ON `feeds`.`id` = `items`.`feed_id` '.
+                'AND `feeds`.`user_id` = ?';
+        $params = [$userId];
+
+        $result = $this->findOneQuery($sql, $params);
+
+        return (int) $result['max_id'];
+    }
+
+
+    /**
+     * Deletes all items of a user
+     * @param string $userId the name of the user
+     */
+    public function deleteUser($userId) {
+        $sql = 'DELETE FROM `*PREFIX*news_items` ' .
+            'WHERE `feed_id` IN (' .
+                'SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds` ' .
+                    'WHERE `feeds`.`user_id` = ?' .
+                ')';
+
+        $this->execute($sql, [$userId]);
+    }
 
 
 }