Access query string params through argument

Author: jtojnar

controllers/Items.php

@@ -2,6 +2,8 @@
 
 namespace controllers;
 
+use Base;
+
 /**
  * Controller for item handling
  *
@@ -14,13 +16,16 @@ class Items extends BaseController {
      * mark items as read. Allows one id or an array of ids
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function mark() {
+    public function mark(Base $f3, array $params) {
         $this->needsLoggedIn();
 
-        if (\F3::get('PARAMS["item"]') !== null) {
-            $lastid = \F3::get('PARAMS["item"]');
+        if (isset($params['item'])) {
+            $lastid = $params['item'];
         } elseif (isset($_POST['ids'])) {
             $lastid = $_POST['ids'];
         }
@@ -45,12 +50,15 @@ public function mark() {
      * mark item as unread
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function unmark() {
+    public function unmark(Base $f3, array $params) {
         $this->needsLoggedIn();
 
-        $lastid = \F3::get('PARAMS["item"]');
+        $lastid = $params['item'];
 
         $itemDao = new \daos\Items();
 
@@ -69,12 +77,15 @@ public function unmark() {
      * starr item
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function starr() {
+    public function starr(Base $f3, array $params) {
         $this->needsLoggedIn();
 
-        $id = \F3::get('PARAMS["item"]');
+        $id = $params['item'];
 
         $itemDao = new \daos\Items();
 
@@ -92,12 +103,15 @@ public function starr() {
      * unstarr item
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function unstarr() {
+    public function unstarr(Base $f3, array $params) {
         $this->needsLoggedIn();
 
-        $id = \F3::get('PARAMS["item"]');
+        $id = $params['item'];
 
         $itemDao = new \daos\Items();
 

controllers/Rss.php

@@ -2,6 +2,7 @@
 
 namespace controllers;
 
+use Base;
 use FeedWriter\RSS2;
 
 /**
@@ -15,9 +16,12 @@ class Rss extends BaseController {
     /**
      * rss feed
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function rss() {
+    public function rss(Base $f3, array $params) {
         $this->needsLoggedInOrPublicMode();
 
         $feedWriter = new RSS2();
@@ -38,11 +42,11 @@ public function rss() {
             $options = $_GET;
         }
         $options['items'] = \F3::get('rss_max_items');
-        if (\F3::get('PARAMS["tag"]') !== null) {
-            $options['tag'] = \F3::get('PARAMS["tag"]');
+        if (isset($params['tag'])) {
+            $options['tag'] = $params['tag'];
         }
-        if (\F3::get('PARAMS["type"]') !== null) {
-            $options['type'] = \F3::get('PARAMS["type"]');
+        if (isset($params['type'])) {
+            $options['type'] = $params['type'];
         }
 
         // get items

controllers/Sources.php

@@ -2,6 +2,8 @@
 
 namespace controllers;
 
+use Base;
+
 /**
  * Controller for sources handling
  *
@@ -120,9 +122,12 @@ public function sourcesListAsString() {
      * render spouts params
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function write() {
+    public function write(Base $f3, array $params) {
         $this->needsLoggedIn();
 
         $sourcesDao = new \daos\Sources();
@@ -167,7 +172,7 @@ public function write() {
         unset($data['ajax']);
 
         // check if source already exists
-        $id = \F3::get('PARAMS["id"]');
+        $id = $params['id'];
         $sourceExists = $sourcesDao->isValid('id', $id);
 
         // load password value if not changed for spouts containing passwords
@@ -248,12 +253,15 @@ public function sourcesStats() {
      * delete source
      * json
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function remove() {
+    public function remove(Base $f3, array $params) {
         $this->needsLoggedIn();
 
-        $id = \F3::get('PARAMS["id"]');
+        $id = $params['id'];
 
         $sourceDao = new \daos\Sources();
 
@@ -277,10 +285,13 @@ public function remove() {
      * update source
      * text
      *
+     * @param Base $f3 fatfree base instance
+     * @param array $params query string parameters
+     *
      * @return void
      */
-    public function update() {
-        $id = \F3::get('PARAMS["id"]');
+    public function update(Base $f3, array $params) {
+        $id = $params['id'];
 
         // only allow access for localhost and authenticated users
         if (!$this->allowedToUpdate()) {