Changeset 863220d612ed27e28b1e8e1f6e4c3d95efb8d35f

Timestamp:

01/29/12 17:55:46 (4 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

7016eb4cb4364248b02c2b3336aff5da9a22e032

Parents:

0736ab3ac681bfd827d0973122d3a48e4b39594e

git-committer:

Xemle <xemle@phtagr.org> / 2012-01-29T17:55:46Z+0100

Message:

Use request object instead of controller's params

Location:

Controller

Files:

• AppController.php (modified) (1 diff)
• BrowserController.php (modified) (1 diff)
• CommentsController.php (modified) (1 diff)
• Component/SearchComponent.php (modified) (2 diffs)
• ExplorerController.php (modified) (7 diffs)
• ImagesController.php (modified) (2 diffs)
• SetupController.php (modified) (1 diff)
• UsersController.php (modified) (1 diff)

Controller/AppController.php

@@ -124 +124 @@
 
   function _checkKey() {
-    if (!isset($this->params['named']['key'])) {
+    if (!isset($this->request->params['named']['key'])) {
       return false;
     }
 
     // fetch and delete key from passed parameters
-    $key = $this->params['named']['key'];
-    unset($this->params['named']['key']);
+    $key = $this->request->params['named']['key'];
+    unset($this->request->params['named']['key']);
 
     $data = $this->User->findByKey($key, array('User.id'));

Controller/BrowserController.php

@@ -105 +105 @@
   function _getPathFromUrl($strip = 0, $len = false) {
     $strip = max(0, $strip);
-    if (count($this->params['pass']) - $strip - abs($len) > 0) {
+    if (count($this->request->params['pass']) - $strip - abs($len) > 0) {
       if ($len) {
-        $dirs = array_slice($this->params['pass'], $strip, $len);
+        $dirs = array_slice($this->request->params['pass'], $strip, $len);
       } else {
-        $dirs = array_slice($this->params['pass'], $strip);
+        $dirs = array_slice($this->request->params['pass'], $strip);
       }
       $path = '/'.implode('/', $dirs).'/';

Controller/CommentsController.php

@@ -42 +42 @@
 
     $params = array();
-    foreach ($this->params['named'] as $key => $value) {
+    foreach ($this->request->params['named'] as $key => $value) {
       $params[] = $key.':'.$value;
     }

Controller/Component/SearchComponent.php

@@ -84 +84 @@
     );
 
+  /** List of chars to escape on setParam() */
+  var $escapeChars = '=,/';
+
   function initialize(&$controller) {
     $this->controller = &$controller;
@@ -182 +185 @@
       unset($this->_data[$name]);
     }
+  }
+
+  function encode($input) {
+    $out = '';
+    $input = (string)$input;
+    $len = strlen($input);
+    for ($i = 0; $i < $len; $i++) {
+      $c = substr($input, $i, 1);
+      if (strpos($this->escapeChars, $c) !== false) {
+        $c = '=' . dechex(ord($c));
+      }
+      $out = $out . $c;
+    }
+    return $out;
   }
 

Controller/ExplorerController.php

@@ -382 +382 @@
         $crumbs[] = "$param:$value";
       }
-      $crumbs = am($crumbs, $this->Search->urlToCrumbs($this->params['url']['url'], 5));
+      $crumbs = am($crumbs, $this->Search->urlToCrumbs($this->request->url, 5));
     } elseif ($param == 'folder') {
-      $folder = implode('/', array_slice($this->params['pass'], 2));
+      $folder = implode('/', array_slice($this->request->params['pass'], 2));
       $fsRoot = $this->User->getRootDir($user);
-      $fsFolder = implode(DS, array_slice($this->params['pass'], 2));
+      $fsFolder = implode(DS, array_slice($this->request->params['pass'], 2));
       $fsFolder = Folder::slashTerm(Folder::addPathElement($fsRoot, $fsFolder));
       if (is_dir($fsRoot) && is_dir($fsFolder)) {
@@ -396 +396 @@
       }
     } else {
-      $crumbs = am($crumbs, $this->Search->urlToCrumbs($this->params['url']['url'], 3));
+      $crumbs = am($crumbs, $this->Search->urlToCrumbs($this->request->url, 3));
     }
     $this->crumbs = $crumbs;
@@ -403 +403 @@
 
   function group($name) {
-    $this->crumbs = am(array('group:' . $name), $this->Search->urlToCrumbs($this->params['url']['url'], 3));
+    $this->crumbs = am(array('group:' . $name), $this->Search->urlToCrumbs($this->request->url, 3));
     $this->render('index');
   }
@@ -456 +456 @@
       $crumbs[] = 'tag:' . $tag;
     }
-    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->params['url']['url'], 3));
+    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->request->url, 3));
     $this->render('index');
   }
@@ -466 +466 @@
       $crumbs[] = 'category:' . $category;
     }
-    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->params['url']['url'], 3));
+    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->request->url, 3));
     $this->render('index');
   }
@@ -476 +476 @@
       $crumbs[] = 'location:' . $location;
     }
-    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->params['url']['url'], 3));
+    $this->crumbs = am($crumbs, $this->Search->urlToCrumbs($this->request->url, 3));
     $this->render('index');
   }
@@ -482 +482 @@
  
   function edit() {
-    if (isset($this->request->data)) {
+    if (!empty($this->request->data)) {
       $ids = preg_split('/\s*,\s*/', $this->request->data['Media']['ids']);
       $ids = array_unique($ids);

Controller/ImagesController.php

@@ -44 +44 @@
     }
 
-    $encoded = array_splice(split('/', $this->params['url']['url']), 3);
+    $encoded = array_splice(split('/', $this->request->url), 3);
     foreach ($encoded as $crumb) {
       $this->crumbs[] = $this->Search->decode($crumb);
@@ -53 +53 @@
     parent::beforeRender();
     $this->set('crumbs', $this->crumbs);
-    $this->params['crumbs'] = $this->crumbs;
+    $this->request->params['crumbs'] = $this->crumbs;
   }
 

Controller/SetupController.php

@@ -47 +47 @@
     $this->dbConfig = CONFIGS.'database.php';
     $this->paths = array(TMP, USER_DIR);
-    if (isset($this->params['admin']) && $this->params['admin'] && $this->__hasSysOp()) {
+    if (isset($this->request->params['admin']) && $this->request->params['admin'] && $this->__hasSysOp()) {
       parent::beforeFilter();
     } else {

Controller/UsersController.php

@@ -337 +337 @@
 
     $id = intval($id);
-    $dirs = $this->params['pass'];
+    $dirs = $this->request->params['pass'];
     unset($dirs[0]);
     $fsroot = implode(DS, $dirs);