Changeset ee4c2b7fedeac65c7bf3af2de933963981702433

Timestamp:

01/28/12 16:33:14 (4 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

a42ace5079b711cff1c0078740ad0bb7a735e0fc

Parents:

0fb8d7c9464f805d666366ee2f31f047ee138b3a

git-committer:

Xemle <xemle@phtagr.org> / 2012-01-28T16:33:14Z+0100

Message:

Migration to CakePHP 2.0 almost complete

Files:

• Controller/AppController.php (modified) (1 diff)
• Controller/BrowserController.php (modified) (19 diffs)
• Controller/CommentsController.php (modified) (8 diffs)
• Controller/Component/BaseFilterComponent.php (modified) (1 diff)
• Controller/Component/FileManagerComponent.php (modified) (8 diffs)
• Controller/Component/FilterManagerComponent.php (modified) (6 diffs)
• Controller/Component/GpsFilterComponent.php (modified) (3 diffs)
• Controller/Component/ImageFilterComponent.php (modified) (7 diffs)
• Controller/Component/MenuComponent.php (modified) (1 diff)
• Controller/Component/SimpleImageFilterComponent.php (modified) (3 diffs)
• Controller/Component/UploadComponent.php (modified) (1 diff)
• Controller/Component/VideoFilterComponent.php (modified) (12 diffs)
• Controller/Component/WebdavServerComponent.php (modified) (3 diffs)
• Controller/ExplorerController.php (modified) (35 diffs)
• Controller/GroupsController.php (modified) (15 diffs)
• Controller/GuestsController.php (modified) (12 diffs)
• Controller/HomeController.php (modified) (1 diff)
• Controller/ImagesController.php (modified) (10 diffs)
• Controller/OptionsController.php (modified) (5 diffs)
• Controller/SetupController.php (modified) (9 diffs)
• Controller/SystemController.php (modified) (5 diffs)
• Controller/UsersController.php (modified) (24 diffs)
• Model/AppModel.php (modified) (1 diff)
• Model/MyFile.php (modified) (1 diff)
• View/Browser/folder.ctp (modified) (1 diff)
• View/Browser/sync.ctp (modified) (1 diff)
• View/Browser/upload.ctp (modified) (1 diff)
• View/Comments/index.ctp (modified) (4 diffs)
• View/Comments/rss.ctp (modified) (1 diff)
• View/Elements/Explorer/description.ctp (modified) (1 diff)
• View/Elements/Explorer/media.ctp (modified) (1 diff)
• View/Elements/Explorer/menu.ctp (modified) (4 diffs)
• View/Elements/comment.ctp (modified) (3 diffs)
• View/Elements/footer.ctp (modified) (1 diff)
• View/Elements/single_acl_form.ctp (modified) (1 diff)
• View/Elements/single_meta_form.ctp (modified) (1 diff)
• View/Explorer/autocomplete.ctp (modified) (1 diff)
• View/Explorer/editacl.ctp (modified) (1 diff)
• View/Explorer/editmeta.ctp (modified) (1 diff)
• View/Explorer/index.ctp (modified) (3 diffs)
• View/Explorer/media.ctp (modified) (1 diff)
• View/Explorer/points.ctp (modified) (1 diff)
• View/Explorer/quicksearch.ctp (modified) (5 diffs)
• View/Explorer/rss.ctp (modified) (1 diff)
• View/Explorer/updatemeta.ctp (modified) (1 diff)
• View/Groups/autocomplete.ctp (modified) (1 diff)
• View/Groups/create.ctp (modified) (1 diff)
• View/Groups/dashboard_create.ctp (modified) (6 diffs)
• View/Groups/dashboard_index.ctp (modified) (6 diffs)
• View/Groups/dashboard_manage.ctp (modified) (12 diffs)
• View/Groups/dashboard_search.ctp (modified) (6 diffs)
• View/Groups/edit.ctp (modified) (1 diff)
• View/Groups/index.ctp (modified) (3 diffs)
• View/Groups/listmembers.ctp (modified) (4 diffs)
• View/Groups/view.ctp (modified) (9 diffs)
• View/Guests/autocomplete.ctp (modified) (1 diff)
• View/Guests/edit.ctp (modified) (5 diffs)
• View/Guests/index.ctp (modified) (3 diffs)
• View/Guests/links.ctp (modified) (3 diffs)
• View/Helper/ExplorerMenuHelper.php (modified) (2 diffs)
• View/Helper/FlowplayerHelper.php (modified) (1 diff)
• View/Helper/ImageDataHelper.php (modified) (3 diffs)
• View/Helper/SearchHelper.php (modified) (1 diff)
• View/Images/view.ctp (modified) (6 diffs)
• View/Options/rss.ctp (modified) (1 diff)
• View/System/delete_unused_meta_data.ctp (modified) (1 diff)
• View/Users/admin_edit.ctp (modified) (3 diffs)
• View/Users/admin_index.ctp (modified) (2 diffs)
• View/Users/admin_password.ctp (modified) (1 diff)
• View/Users/admin_path.ctp (modified) (3 diffs)
• View/Users/admin_register.ctp (modified) (1 diff)
• View/Users/index.ctp (modified) (2 diffs)
• View/Users/view.ctp (modified) (5 diffs)
• View/home/index.ctp (modified) (1 diff)

Controller/AppController.php

@@ -38 +38 @@
     parent::beforeFilter();
     $this->_checkSession();
-    $this->Feed->add('/explorer/rss', array('title' => __('Recent photos', true)));
-    $this->Feed->add('/explorer/media', array('title' =>  __('Media RSS of recent photos', true), 'id' => 'gallery'));
-    $this->Feed->add('/comment/rss', array('title' => __('Recent comments', true)));
+    $this->Feed->add('/explorer/rss', array('title' => __('Recent photos')));
+    $this->Feed->add('/explorer/media', array('title' =>  __('Media RSS of recent photos'), 'id' => 'gallery'));
+    $this->Feed->add('/comment/rss', array('title' => __('Recent comments')));
     
     $this->_configureEmail();

Controller/BrowserController.php

@@ -36 +36 @@
     parent::beforeFilter();
     $this->subMenu = array(
-      'import' => __("Import Files", true),
-      'upload' => __("Upload", true),
-      'sync' => __("Meta Data Sync", true),
+      'import' => __("Import Files"),
+      'upload' => __("Upload"),
+      'sync' => __("Meta Data Sync"),
       );
 
@@ -53 +53 @@
     }
 
-    $this->pageTitle = __('My Files', true);
+    $this->pageTitle = __('My Files');
     $this->layout = 'backend';
   }
@@ -265 +265 @@
   function import() {
     $path = $this->_getPathFromUrl();
-    if (empty($this->data)) {
+    if (empty($this->request->data)) {
       Logger::warn("Empty post data");
       $this->redirect('index/'.$path);
@@ -274 +274 @@
     $files = array();
     $toRead = array();
-    foreach ($this->data['Browser']['import'] as $file) {
+    foreach ($this->request->data['Browser']['import'] as $file) {
       if (!$file) {
         continue;
@@ -298 +298 @@
       }
     }
-    $this->Session->setFlash(sprintf(__("Imported %d files (%d) errors)", true), $readCount, $errorCount));
+    $this->Session->setFlash(__("Imported %d files (%d) errors)", $readCount, $errorCount));
 
     $this->redirect('index/'.$path);
@@ -313 +313 @@
       Logger::warn("Deny access to file: $fsPath");
     } else {
-      $this->Session->setFlash(sprintf(__("Media %d was unlinked successfully", true), $file['File']['media_id']));
+      $this->Session->setFlash(__("Media %d was unlinked successfully", $file['File']['media_id']));
       $this->Media->unlinkFile($file['File']['media_id'], $file['File']['id']);
     }
@@ -330 +330 @@
       if ($this->FileManager->delete($fsPath)) {
         if ($isDir) {
-          $this->Session->setFlash(__('Deleted directory successfully', true));
+          $this->Session->setFlash(__('Deleted directory successfully'));
         } else {
-          $this->Session->setFlash(__('Deleted file successfully', true));
+          $this->Session->setFlash(__('Deleted file successfully'));
         }
       } else {
-        $this->Session->setFlash(__('Could not delete file or directory', true));
+        $this->Session->setFlash(__('Could not delete file or directory'));
       }
     }
@@ -385 +385 @@
       $data['unsynced'] = $this->Media->find('count', array('conditions' => $conditions));
     }
-    $this->data = $data;
+    $this->request->data = $data;
   }
 
@@ -391 +391 @@
     $user = $this->getUser();
     $userId = $this->getUserId();
-    $this->data = $user;
+    $this->request->data = $user;
     $external = (FILE_FLAG_EXTERNAL);
 
@@ -419 +419 @@
     if (!$fsPath) {
       Logger::warn("Invalid path to create folder");
-      $this->Session->setFlash(__("Invalid path to create folder", true));
+      $this->Session->setFlash(__("Invalid path to create folder"));
       $this->redirect("index");
     }
     if ($this->FileManager->isExternal($fsPath)) {
-      $this->Session->setFlash(sprintf(__("Could not create folder here: %s", true), $path));
+      $this->Session->setFlash(__("Could not create folder here: %s", $path));
       Logger::warn("Could not create folder in external path: $fsPath");
       $this->redirect("index/".$path);
     }
 
-    if (!empty($this->data['Folder']['name'])) {
+    if (!empty($this->request->data['Folder']['name'])) {
       $folder = new Folder($fsPath);
-      $name = $this->data['Folder']['name'];
+      $name = $this->request->data['Folder']['name'];
 
       $newFolder = Folder::slashTerm($fsPath).$name;
@@ -439 +439 @@
       } else {
         Logger::err("Could not create folder $name in $fsPath");
-        $this->Session->setFlash(__("Could not create folder", true));
+        $this->Session->setFlash(__("Could not create folder"));
         $this->redirect('folder/'.$path);
       }
@@ -456 +456 @@
       return false;
     } elseif (!$this->FileManager->canWrite($this->Upload->getSize())) {
-      $this->Session->setFlash(__("Your upload quota is exceeded", true));
+      $this->Session->setFlash(__("Your upload quota is exceeded"));
       Logger::warn("User upload quota exceeded. Upload denied.");
       return false;
@@ -563 +563 @@
     if (!$fsPath) {
       Logger::warn("Invalid path for upload");
-      $this->Session->setFlash(__("Invalid path for upload", true));
+      $this->Session->setFlash(__("Invalid path for upload"));
       $this->redirect("index");
     }
     // Check for internal path
     if ($this->FileManager->isExternal($fsPath)) {
-      $this->Session->setFlash(sprintf(__("Could not upload here: %s", true), $path));
+      $this->Session->setFlash(__("Could not upload here: %s", $path));
       Logger::warn("Could not upload in external path: $fsPath");
       $this->redirect("index/".$path);
     }
-    if (!empty($this->data) && $this->Upload->isUpload()) {
+    if (!empty($this->request->data) && $this->Upload->isUpload()) {
       $files = $this->_upload($fsPath);
 
       $fileCount = count($files);
       $extractedCount = 0;
-      if ($this->data['File']['extract']) {
+      if ($this->request->data['File']['extract']) {
         $zips = $this->_extract($fsPath, $files);
         if ($zips) {
@@ -589 +589 @@
       }  
       if ($extractedCount) {
-        $this->Session->setFlash(sprintf(__("Uploaded %d and %d extraced file(s)", true), $fileCount, $extractedCount));
+        $this->Session->setFlash(__("Uploaded %d and %d extraced file(s)", $fileCount, $extractedCount));
       } else {
-        $this->Session->setFlash(sprintf(__("Uploaded %d file(s)", true), $fileCount));
+        $this->Session->setFlash(__("Uploaded %d file(s)", $fileCount));
       }
     }
@@ -602 +602 @@
     if (!$root) {
       Logger::err("Invalid user upload directory");
-      $this->Session->setFlash(__("Error: Invalid upload directory", true));
+      $this->Session->setFlash(__("Error: Invalid upload directory"));
       return false;
     }
@@ -610 +610 @@
     if (!$folder) {
       Logger::err("Daily upload directory not created");
-      $this->Session->setFlash(__("Error: Invalid upload directory", true));
+      $this->Session->setFlash(__("Error: Invalid upload directory"));
       return false;
     }
@@ -617 +617 @@
 
   function quickupload() {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       if (!$this->Upload->isUpload()) {
         Logger::info("No upload data");
-        $this->Session->setFlash(__("No files uploaded or upload errors", true));
+        $this->Session->setFlash(__("No files uploaded or upload errors"));
         $this->redirect($this->action);
       }
@@ -637 +637 @@
       }
       if (!$files) {
-        $this->Session->setFlash(__("No files uploaded", true));
+        $this->Session->setFlash(__("No files uploaded"));
         $this->redirect($this->action);
       } else { 
@@ -645 +645 @@
       $readed = $this->FilterManager->readFiles($files);
       $errors = $this->FilterManager->errors;
-      $this->Session->setFlash(sprintf(__("Uploaded %d files with %d errors.", true), count($readed), count($errors)));
+      $this->Session->setFlash(__("Uploaded %d files with %d errors.", count($readed), count($errors)));
       $this->set('imports', $readed);
       $this->set('errors', $errors);

Controller/CommentsController.php

@@ -55 +55 @@
   function view($id = null) {
     if (!$id) {
-      $this->Session->setFlash(__('Invalid Comment.', true));
+      $this->Session->setFlash(__('Invalid Comment.'));
       $this->redirect(array('action'=>'index'));
     }
@@ -62 +62 @@
 
   function add() {
-    if (!empty($this->data) && isset($this->data['Media']['id'])) {
-      $mediaId = intval($this->data['Media']['id']);
+    if (!empty($this->request->data) && isset($this->request->data['Media']['id'])) {
+      $mediaId = intval($this->request->data['Media']['id']);
       $user = $this->getUser();
       $userId = $this->getUserId();
@@ -78 +78 @@
 
       // Check capatcha if required
-      if (($auth & COMMENT_AUTH_CAPTCHA) > 0 && (!$this->Session->check('captcha') || $this->data['Captcha']['verification'] != $this->Session->read('captcha'))) {
+      if (($auth & COMMENT_AUTH_CAPTCHA) > 0 && (!$this->Session->check('captcha') || $this->request->data['Captcha']['verification'] != $this->Session->read('captcha'))) {
         $this->Session->setFlash("Verification failed");
-        Logger::warn("Captcha verification failed: ".$this->data['Captcha']['verification']." != ".$this->Session->read('captcha'));
+        Logger::warn("Captcha verification failed: ".$this->request->data['Captcha']['verification']." != ".$this->Session->read('captcha'));
         $this->Session->delete('captcha');
-        $this->Session->write('Comment.data', $this->data);
+        $this->Session->write('Comment.data', $this->request->data);
         $this->Session->write('Comment.validationErrors', $this->Comment->validationErrors);
         $this->redirect("/images/view/$mediaId/{$this->namedArgs}"); 
@@ -102 +102 @@
 
       $this->Comment->create();
-      $this->data['Comment']['media_id'] = $mediaId;
-      $this->data['Comment']['date'] = date("Y-m-d H:i:s", time());
+      $this->request->data['Comment']['media_id'] = $mediaId;
+      $this->request->data['Comment']['date'] = date("Y-m-d H:i:s", time());
       uses('Sanitize');
-      $this->data['Comment']['text'] = Sanitize::html($this->data['Comment']['text']);
+      $this->request->data['Comment']['text'] = Sanitize::html($this->request->data['Comment']['text']);
       if (($auth & COMMENT_AUTH_NAME) == 0) {
-        $this->data['Comment']['user_id'] = $user['User']['id'];
-        $this->data['Comment']['name'] = $user['User']['username'];
-        $this->data['Comment']['email'] = $user['User']['email'];
-      }
-      if ($this->Comment->save($this->data)) {
+        $this->request->data['Comment']['user_id'] = $user['User']['id'];
+        $this->request->data['Comment']['name'] = $user['User']['username'];
+        $this->request->data['Comment']['email'] = $user['User']['email'];
+      }
+      if ($this->Comment->save($this->request->data)) {
         $commentId = $this->Comment->getLastInsertID();
-        $this->Session->setFlash(__('The Comment has been saved', true));
+        $this->Session->setFlash(__('The Comment has been saved'));
         Logger::info("New comment of media $mediaId");
         // Send email notification of other media owners
@@ -121 +121 @@
         $this->_sendNotifies($mediaId, $commentId);
       } else {
-        $this->Session->setFlash(__('The Comment could not be saved. Please, try again.', true));
+        $this->Session->setFlash(__('The Comment could not be saved. Please, try again.'));
         Logger::err("Could not save comment to media $mediaId");
         Logger::trace($this->Comment->validationErrors);
-        $this->Session->write('Comment.data', $this->data);
+        $this->Session->write('Comment.data', $this->request->data);
         $this->Session->write('Comment.validationErrors', $this->Comment->validationErrors);
       }
@@ -219 +219 @@
   function delete($id = null) {
     if (!$id) {
-      $this->Session->setFlash(__('Invalid id for Comment', true));
+      $this->Session->setFlash(__('Invalid id for Comment'));
       $this->redirect("/explorer");
     }
@@ -233 +233 @@
     if ((isset($comment['User']['id']) && $comment['User']['id'] == $userId) || ($comment['Media']['user_id'] == $userId) || ($this->getUserRole() == ROLE_ADMIN)) {
       if ($this->Comment->delete($id)) {
-        $this->Session->setFlash(__('Comment deleted', true));
+        $this->Session->setFlash(__('Comment deleted'));
         Logger::info("Delete comment {$comment['Comment']['id']} of media {$comment['Media']['id']}");
       }
@@ -250 +250 @@
     $this->layoutPath = 'rss';
     $conditions = $this->Media->buildAclConditions($this->getUser());
-    $this->data = $this->Comment->find('all', array('conditions' => $conditions, 'order' => 'Comment.date DESC', 'limit' => 20));
+    $this->request->data = $this->Comment->find('all', array('conditions' => $conditions, 'order' => 'Comment.date DESC', 'limit' => 20));
 
     if (Configure::read('debug') > 1) {

Controller/Component/BaseFilterComponent.php

@@ -40 +40 @@
     }
     $this->Manager =& $manager;
+    $this->Media =& $manager->controller->Media;
+    $this->MyFile =& $manager->controller->MyFile;
     return true;
   }

Controller/Component/FileManagerComponent.php

@@ -33 +33 @@
       $this->MyFile = $controller->MyFile;
     } else {
-      App::import('model', 'MyFile');
+      App::uses('Model', 'MyFile');
       $this->MyFile = new MyFile();
     }
@@ -58 +58 @@
     }
 
-    $id = $this->MyFile->fileExists($filename);
+    $id = $this->controller->MyFile->fileExists($filename);
     if ($id) {
       Logger::verbose("File $filename already exists (id $id)");
@@ -67 +67 @@
       $flag |= FILE_FLAG_EXTERNAL;
     }
-    $file = $this->MyFile->create($filename, $userId, $flag);
-
-    if ($this->MyFile->save($file)) {
-      $id = $this->MyFile->getLastInsertID();
+    $file = $this->controller->MyFile->create($filename, $userId, $flag);
+
+    if ($this->controller->MyFile->save($file)) {
+      $id = $this->controller->MyFile->getLastInsertID();
       Logger::verbose("Insert file $filename to database (id $id)");
       return $id;
@@ -87 +87 @@
       if (is_dir($file)) {
         $deleteFolder = !$this->isExternal($file);
-        return $this->MyFile->deletePath($file, $deleteFolder);
-      }
-      $id = $this->MyFile->fileExists($file);
+        return $this->controller->MyFile->deletePath($file, $deleteFolder);
+      }
+      $id = $this->controller->MyFile->fileExists($file);
       if (!$id) {
         Logger::warn("Could not find file $file");
@@ -102 +102 @@
       return false;
     }
-    return $this->MyFile->delete($id);
+    return $this->controller->MyFile->delete($id);
   }
 
@@ -164 +164 @@
     }
 
-    $current = $this->MyFile->countBytes($user['User']['id'], false);
+    $current = $this->controller->MyFile->countBytes($user['User']['id'], false);
     $quota = $user['User']['quota'];
     if ($current + $size <= $quota) {
@@ -213 +213 @@
       } else {
         // Copy all properties
-        $srcFile = $this->MyFile->findByFilename($file);
+        $srcFile = $this->controller->MyFile->findByFilename($file);
         if (!$srcFile) {
           Logger::warn("Could not found source '$file' in database");
@@ -241 +241 @@
       return false;
     }
-    return $this->MyFile->move($src, $dst);
+    return $this->controller->MyFile->move($src, $dst);
   }
 

Controller/Component/FilterManagerComponent.php

@@ -21 +21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+
+if (!App::import('Component', 'BaseFilter')) {
+  Logger::error("Could not load BaseFilter");
+}
 
 class FilterManagerComponent extends Component {
@@ -43 +47 @@
   function initialize(&$controller) {
     $this->controller =& $controller;
-    if (!App::import('Component', 'BaseFilter')) {
-      Logger::err("Could not find filter with name 'BaseFilter'");
-      return false;
-    }
     if (!isset($controller->MyFile) || !isset($controller->Media)) {
       Logger::err("Model MyFile and Media is not found");
@@ -273 +273 @@
       return false;
     }
-    if (!$this->MyFile->fileExists($filename) && !$this->FileManager->add($filename)) {
+    if (!$this->controller->MyFile->fileExists($filename) && !$this->FileManager->add($filename)) {
       Logger::err("Could not add file $filename");
       $this->addError($filename, 'FileAddError');
@@ -279 +279 @@
     }
 
-    $file = $this->MyFile->findByFilename($filename);
+    $file = $this->controller->MyFile->findByFilename($filename);
+    if (!$file) {
+      Logger::err("Could not find file with filename: " . $filename);
+    }
 
     // Check changes
@@ -292 +295 @@
     }
 
-    if ($this->MyFile->hasMedia($file)) {
-      $media = $this->Media->findById($file['File']['media_id']);
+    if ($this->controller->MyFile->hasMedia($file)) {
+      $media = $this->controller->Media->findById($file['File']['media_id']);
       $readed = strtotime($file['File']['readed']);
       if ($readed && !$forceRead) {
@@ -319 +322 @@
     $filterMissing = false;
     foreach ($media['File'] as $file) {
-      $file = $this->MyFile->findById($file['id']);
-      $filename = $this->MyFile->getFilename($file);
+      $file = $this->controller->MyFile->findById($file['id']);
+      $filename = $this->controller->MyFile->getFilename($file);
       $filter = $this->getFilterByExtension($filename);
       if (!$filter) {

Controller/Component/GpsFilterComponent.php

@@ -55 +55 @@
     //Logger::trace($options);
 
-    $filename = $this->MyFile->getFilename($file);
+    $filename = $this->controller->MyFile->getFilename($file);
     if (!$this->Nmea->readFile($filename)) {
       Logger::warn('Could not read file $filename');
@@ -80 +80 @@
     }
     Logger::trace($conditions);
-    $this->Media->unbindAll();
-    $mediaSet = $this->Media->find('all', array('conditions' => $conditions));
+    $this->controller->Media->unbindAll();
+    $mediaSet = $this->controller->Media->find('all', array('conditions' => $conditions));
     if (!count($mediaSet)) {
       Logger::info("No images found for GPS interval");
@@ -100 +100 @@
       $media['Media']['longitude'] = $position['longitude'];
       $media['Media']['flag'] |= MEDIA_FLAG_DIRTY;
-      if ($this->Media->save($media['Media'], true, array('latitude', 'longitude', 'flag'))) {
+      if ($this->controller->Media->save($media['Media'], true, array('latitude', 'longitude', 'flag'))) {
         Logger::debug("Update GPS position of image {$media['Media']['id']} to {$position['latitude']}/{$position['longitude']}");
       } else {

Controller/Component/ImageFilterComponent.php

@@ -32 +32 @@
                         LOCATION_COUNTRY => 'Country-PrimaryLocationName');
 
-  function initialize(&$controller) {
-    $this->controller =& $controller;
-  }
-
   function getName() {
     return "Image";
@@ -75 +71 @@
         $user = $this->controller->getUser();
       }
-      $media = $this->Media->addDefaultAcl(&$media, &$user);
+      $media = $this->controller->Media->addDefaultAcl(&$media, &$user);
       
       $isNew = true;
@@ -106 +102 @@
     if ($isNew) {
       $mediaId = $this->Media->getLastInsertID();
-      if (!$this->MyFile->setMedia($file, $mediaId)) {
+      if (!$this->controller->MyFile->setMedia($file, $mediaId)) {
         $this->Media->delete($mediaId);
         $this->FilterManager->addError($filename, 'FileSaveError');
@@ -117 +113 @@
       Logger::verbose("Updated media (id ".$media['Media']['id'].")");
     }
-    $this->MyFile->updateReaded($file);
-    $this->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
+    $this->controller->MyFile->updateReaded($file);
+    $this->controller->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
     return $media;
   }
@@ -327 +323 @@
     $v['model'] = $this->_extract($data, 'jpg/exif/IFD0/Model', null);
     $v['iso'] = $this->_extract($data, 'jpg/exif/EXIF/ISOSpeedRatings', null);
-    Logger::debug($data);
+    //Logger::debug($data);
     $v['caption'] = $this->_extract($data, 'jpg/exif/EXIF/ISOSpeedRatings', null);
 
@@ -385 +381 @@
       return false;
     } 
-    $filename = $this->MyFile->getFilename($file);
+    $filename = $this->controller->MyFile->getFilename($file);
     if (!file_exists($filename) || !is_writeable(dirname($filename)) || !is_writeable($filename)) {
       $id = isset($media['Media']['id']) ? $media['Media']['id'] : 0;
@@ -430 +426 @@
     }
     
-    $this->MyFile->update($file);
+    $this->controller->MyFile->update($file);
     if (!$this->Media->deleteFlag($media, MEDIA_FLAG_DIRTY)) {
       $this->controller->warn("Could not update image data of media {$media['Media']['id']}");

Controller/Component/MenuComponent.php

@@ -44 +44 @@
   function setBasicMainMenu() {
     $controllers = array(
-      'options' => __('Account Settings', true),
-      'groups' => __('Groups', true),
-      'users' => __('Users', true),
-      'guests' => __('Guests', true),
-      'browser' => __('Media Files', true)
+      'options' => __('Account Settings'),
+      'groups' => __('Groups'),
+      'users' => __('Users'),
+      'guests' => __('Guests'),
+      'browser' => __('Media Files')
       );
     if ($this->controller->hasRole(ROLE_SYSOP)) {
-      $controllers['system'] = __("System", true);
+      $controllers['system'] = __("System");
     }
  

Controller/Component/SimpleImageFilterComponent.php

@@ -45 +45 @@
   function read($file, &$media, $options = array()) {
     $options = am(array('noSave' => false), $options);
-    $filename = $this->MyFile->getFilename($file);
+    $filename = $this->controller->MyFile->getFilename($file);
 
     $isNew = false;
     if (!$media) {
-      $media = $this->Media->create(array(
+      $media = $this->controller->Media->create(array(
         'type' => MEDIA_TYPE_IMAGE,
         ), true);
       if ($this->controller->getUserId() != $file['File']['user_id']) {
-        $user = $this->Media->User->findById($file['File']['user_id']);
+        $user = $this->controller->Media->User->findById($file['File']['user_id']);
       } else {
         $user = $this->controller->getUser();
       }
-      $media = $this->Media->addDefaultAcl(&$media, &$user);
+      $media = $this->controller->Media->addDefaultAcl(&$media, &$user);
       
       $isNew = true;
@@ -79 +79 @@
     if ($options['noSave']) {
       return $media;
-    } elseif (!$this->Media->save($media)) {
+    } elseif (!$this->controller->Media->save($media)) {
       Logger::err("Could not save Media");
       Logger::trace($media);
@@ -86 +86 @@
     } 
     if ($isNew) {
-      $mediaId = $this->Media->getLastInsertID();
-      if (!$this->MyFile->setMedia($file, $mediaId)) {
-        $this->Media->delete($mediaId);
+      $mediaId = $this->controller->Media->getLastInsertID();
+      if (!$this->controller->MyFile->setMedia($file, $mediaId)) {
+        $this->controller->Media->delete($mediaId);
         $this->FilterManager->addError($filename, 'FileSaveError');
         return false;
       } else {
         Logger::info("Created new Media (id $mediaId)");
-        $media = $this->Media->findById($mediaId);
+        $media = $this->controller->Media->findById($mediaId);
       }
     } else {
       Logger::verbose("Updated media (id ".$media['Media']['id'].")");
     }
-    $this->MyFile->updateReaded($file);
-    $this->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
+    $this->controller->MyFile->updateReaded($file);
+    $this->controller->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
     return $media;
   }

Controller/Component/UploadComponent.php

@@ -102 +102 @@
     }
 
-    if (!$data && $this->controller->data) {
-      $data =& $this->controller->data;
+    if (!$data && $this->controller->request->data) {
+      $data =& $this->controller->request->data;
     }
 

Controller/Component/VideoFilterComponent.php

@@ -74 +74 @@
   
   function _readThumb($file, &$media) {
-    $filename = $this->MyFile->getFilename($file);
+    $filename = $this->controller->MyFile->getFilename($file);
     if (!$media) {
       $video = $this->_findVideo($file);
@@ -82 +82 @@
         return false;
       }
-      $media = $this->Media->findById($video['File']['media_id']);
+      $media = $this->controller->Media->findById($video['File']['media_id']);
       if (!$media) {
         $this->FilterManager->addError($filename, "MediaNotFound");
@@ -103 +103 @@
     // restore overwritten values
     $media['Media'] = am($media['Media'], $tmp);
-    if (!$this->Media->save($media)) {
+    if (!$this->controller->Media->save($media)) {
       $this->FilterManager->addError($filename, "MediaSaveError");
       Logger::err("Could not save media");
       return false;
     } 
-    $this->MyFile->setMedia($file, $media['Media']['id']);
-    $this->MyFile->updateReaded($file);
+    $this->controller->MyFile->setMedia($file, $media['Media']['id']);
+    $this->controller->MyFile->updateReaded($file);
     Logger::verbose("Updated media from thumb file");
-    return $this->Media->findById($media['Media']['id']);
+    return $this->controller->Media->findById($media['Media']['id']);
   }
 
@@ -118 +118 @@
    * @return True, false on error */
   function read(&$file, &$media, $options = array()) {
-    $filename = $this->MyFile->getFilename($file);
-
-    if ($this->MyFile->isType($file, FILE_TYPE_VIDEOTHUMB)) {
+    $filename = $this->controller->MyFile->getFilename($file);
+
+    if ($this->controller->MyFile->isType($file, FILE_TYPE_VIDEOTHUMB)) {
       return $this->_readThumb($file, &$media);
-    } elseif (!$this->MyFile->isType($file, FILE_TYPE_VIDEO)) {
+    } elseif (!$this->controller->MyFile->isType($file, FILE_TYPE_VIDEO)) {
       $this->FilterManager->addError($filename, "FileNotSupported");
-      Logger::err("File type is not supported: ".$this->MyFile->getFilename($file));
+      Logger::err("File type is not supported: ".$this->controller->MyFile->getFilename($file));
       return false;
     }
@@ -130 +130 @@
     $isNew = false;
     if (!$media) {
-      $media = $this->Media->create(array(
+      $media = $this->controller->Media->create(array(
             'type' => MEDIA_TYPE_VIDEO,
             'date' => date('Y-m-d H:i:s', time()),
@@ -137 +137 @@
             ), true);
       if ($this->controller->getUserId() != $file['File']['user_id']) {
-        $user = $this->Media->User->findById($file['File']['user_id']);
+        $user = $this->controller->Media->User->findById($file['File']['user_id']);
       } else {
         $user = $this->controller->getUser();
       }
-      $media = $this->Media->addDefaultAcl(&$media, &$user);
+      $media = $this->controller->Media->addDefaultAcl(&$media, &$user);
 
       $isNew = true;
@@ -153 +153 @@
       $media = $this->_readGetId3(&$media, $filename);
     }
-    if (!$media || !$this->Media->save($media)) {
+    if (!$media || !$this->controller->Media->save($media)) {
       $this->FilterManager->addError($filename, "MediaSaveError");
       Logger::err("Could not save media");
@@ -160 +160 @@
      
     $mediaId = $media['Media']['id'];
-    if ($isNew || !$this->MyFile->hasMedia($file)) {
-      $mediaId = $isNew ? $this->Media->getLastInsertID() : $data['id'];
-      if (!$this->MyFile->setMedia($file, $mediaId)) {
+    if ($isNew || !$this->controller->MyFile->hasMedia($file)) {
+      $mediaId = $isNew ? $this->controller->Media->getLastInsertID() : $data['id'];
+      if (!$this->controller->MyFile->setMedia($file, $mediaId)) {
         Logger::err("File was not saved: " . $filename);
         $this->FilterManager->addError($filename, "FileSaveError");
-        $this->Media->delete($mediaId);
+        $this->controller->Media->delete($mediaId);
         return false;
       }
-      $media = $this->Media->findById($mediaId);
-    }
-
-    $this->MyFile->updateReaded($file);
-    $this->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
-
-    return $this->Media->findById($mediaId);
+      $media = $this->controller->Media->findById($mediaId);
+    }
+
+    $this->controller->MyFile->updateReaded($file);
+    $this->controller->MyFile->setFlag($file, FILE_FLAG_DEPENDENT);
+
+    return $this->controller->Media->findById($mediaId);
   }
 
@@ -277 +277 @@
   // Check for video thumb
   function _hasThumb($media) {
-    $thumb = $this->Media->getFile($media, FILE_TYPE_VIDEOTHUMB);
+    $thumb = $this->controller->Media->getFile($media, FILE_TYPE_VIDEOTHUMB);
     if ($thumb) {
       return true;
@@ -286 +286 @@
 
   function _createThumb($media) {
-    $video = $this->Media->getFile($media, FILE_TYPE_VIDEO);
+    $video = $this->controller->Media->getFile($media, FILE_TYPE_VIDEO);
     if (!$video) {
       Logger::err("Media {$media['Media']['id']} has no video");
       return false;
     }
-    if (!is_writable(dirname($this->MyFile->getFilename($video)))) {
+    if (!is_writable(dirname($this->controller->MyFile->getFilename($video)))) {
       Logger::warn("Cannot create video thumb. Directory of video is not writeable");
     }
@@ -305 +305 @@
       $id = $this->_createThumb($media);
       if ($id) {
-        $file = $this->MyFile->findById($id);
-        $this->MyFile->setMedia($file, $media['Media']['id']);
-        $media = $this->Media->findById($media['Media']['id']);
+        $file = $this->controller->MyFile->findById($id);
+        $this->controller->MyFile->setMedia($file, $media['Media']['id']);
+        $media = $this->controller->Media->findById($media['Media']['id']);
         $this->write($file, $media);
       }
     }
-    if ($this->MyFile->isType($file, FILE_TYPE_VIDEOTHUMB)) {
+    if ($this->controller->MyFile->isType($file, FILE_TYPE_VIDEOTHUMB)) {
       $imageFilter = $this->FilterManager->getFilter('Image');
       if (!$imageFilter) {
@@ -317 +317 @@
         return false;
       }
-      $filename = $this->MyFile->getFilename($file);
+      $filename = $this->controller->MyFile->getFilename($file);
       Logger::debug("Write video thumbnail by ImageFilter: $filename");
       return $imageFilter->write(&$file, &$media);

Controller/Component/WebdavServerComponent.php

@@ -979 +979 @@
         $options["props"][$key]['status']="403 Forbidden";
       } else {
-        $property = $this->controller->Property->find(array('Property.file_id' => $fileId, 'Property.name' => $prop['name'], 'Property.ns' => $prop['ns']));
+        $property = $this->controller->Property->find('first', array('conditions' => array('Property.file_id' => $fileId, 'Property.name' => $prop['name'], 'Property.ns' => $prop['ns'])));
         if (isset($prop["val"])) {
           if (!$property) {
@@ -1037 +1037 @@
 
     if (isset($options["update"])) { // Lock Update
-      $lock = $this->controller->Lock->find(array('Lock.file_id' => $fileId, 'Lock.token' => $options['update']));
+      $lock = $this->controller->Lock->find('first' => array('conditions' => array('Lock.file_id' => $fileId, 'Lock.token' => $options['update'])));
       
       if ($lock) {
@@ -1088 +1088 @@
       return "409 Conflict";
     }
-    $lock = $this->controller->Lock->find(array('Lock.file_id' => $fileId, 'Lock.token' => $options['token']));
+    $lock = $this->controller->Lock->find('first', array('conditions' => array('Lock.file_id' => $fileId, 'Lock.token' => $options['token'])));
     if (!$lock) {
       Logger::err("Could not find lock token '{$options['token']}' for file $fileId");

Controller/ExplorerController.php

@@ -26 +26 @@
   var $components = array('RequestHandler', 'FilterManager', 'Search', 'QueryBuilder', 'FastFileResponder', 'Feed', 'FileCache');
   var $uses = array('Media', 'MyFile', 'Group', 'Tag', 'Category', 'Location');
-  var $helpers = array('Form', 'Html', 'Ajax', 'ImageData', 'Time', 'ExplorerMenu', 'Rss', 'Search', 'Navigator', 'Tab', 'Breadcrumb', 'Autocomplete');
+  var $helpers = array('Form', 'Html', 'ImageData', 'Time', 'ExplorerMenu', 'Rss', 'Search', 'Navigator', 'Tab', 'Breadcrumb', 'Autocomplete');
 
   var $crumbs = array();
@@ -43 +43 @@
     $paginateActions = array('category', 'date', 'edit', 'group', 'index', 'location', 'query', 'tag', 'user', 'view');
     if (in_array($this->action, $paginateActions)) {
-      $this->data = $this->Search->paginateByCrumbs($this->crumbs);
-      $this->FastFileResponder->addAll($this->data, 'thumb');
+      $this->request->data = $this->Search->paginateByCrumbs($this->crumbs);
+      $this->FastFileResponder->addAll($this->request->data, 'thumb');
 
       if ($this->hasRole(ROLE_USER)) {
@@ -50 +50 @@
         $groupSelect = Set::combine($groups, '{n}.Group.id', '{n}.Group.name');
         asort($groupSelect);
-        $groupSelect[0] = __('[Keep]', true);
-        $groupSelect[-1] = __('[No Group]', true);
+        $groupSelect[0] = __('[Keep]');
+        $groupSelect[-1] = __('[No Group]');
         $this->set('groups', $groupSelect);
       } else {
@@ -59 +59 @@
     $this->set('crumbs', $this->crumbs);
     $this->params['crumbs'] = $this->crumbs;
-    $this->Feed->add('/explorer/media/' . join('/', $this->Search->encodeCrumbs($this->crumbs)), array('title' => __('Slideshow Media RSS', true), 'id' => 'slideshow'));
+    $this->Feed->add('/explorer/media/' . join('/', $this->Search->encodeCrumbs($this->crumbs)), array('title' => __('Slideshow Media RSS'), 'id' => 'slideshow'));
     parent::beforeRender();
   }
@@ -68 +68 @@
 
   function view() {
-    if (!empty($this->data)) {
-      $crumbs = split('/', $this->data['Breadcrumb']['current']);
-      $crumbs[] = $this->data['Breadcrumb']['input'];
+    if (!empty($this->request->data)) {
+      $crumbs = split('/', $this->request->data['Breadcrumb']['current']);
+      $crumbs[] = $this->request->data['Breadcrumb']['input'];
       $this->crumbs = $crumbs;
     }
@@ -80 +80 @@
       if ($type == 'tag' || $type == 'category') {
         $field = Inflector::camelize($type);
-        $value = $this->data[$field]['names'];
+        $value = $this->request->data[$field]['names'];
       } else {
-        $value = $this->data['Location'][$type];
-      }
-      $this->data = $this->_getAssociation($type, $value);
+        $value = $this->request->data['Location'][$type];
+      }
+      $this->request->data = $this->_getAssociation($type, $value);
     } elseif ($type == 'crumb') {
       $queryMap = array(
@@ -106 +106 @@
       }
       $queryTypes = array_keys($queryMap);
-      $input = trim($this->data['Breadcrumb']['input']);
+      $input = trim($this->request->data['Breadcrumb']['input']);
       // cut input to maximum of 64 chars
       if (strlen($input) > 64) {
         $input = substr($input, 0, 64);
       }
-      $this->data = array();
+      $this->request->data = array();
       if (strpos($input, ':') === false) {
         // Search for crumb type
@@ -118 +118 @@
         foreach ($queryTypes as $types) {
           if ($input == '' || strpos($types, $input) === 0) {
-            $this->data[] = $types . ':';
+            $this->request->data[] = $types . ':';
           }
         }
@@ -142 +142 @@
         }
         foreach ($data as $value) {
-          $this->data[] = "$crumbType:$exclude$value";
+          $this->request->data[] = "$crumbType:$exclude$value";
         }
       }
@@ -173 +173 @@
       )));
     foreach ($tags as $tag) {
-      $this->data[] = 'tag:' . $prefix . $tag;
+      $this->request->data[] = 'tag:' . $prefix . $tag;
     }
     $categories = Set::extract('/Category/name', $this->Media->Category->find(
@@ -179 +179 @@
       )));
     foreach ($categories as $category) {
-      $this->data[] = 'category:' . $prefix . $category;
+      $this->request->data[] = 'category:' . $prefix . $category;
     }
     $locations = array_unique(Set::extract('/Location/name', $this->Media->Location->find(
@@ -185 +185 @@
       ))));
     foreach ($locations as $location) {
-      $this->data[] = 'location:' . $prefix . $location;
+      $this->request->data[] = 'location:' . $prefix . $location;
     }
     $groups = Set::extract('/Group/name', $this->Media->Group->find(
@@ -191 +191 @@
       )));
     foreach ($groups as $group) {
-      $this->data[] = 'group:' . $prefix . $group;
+      $this->request->data[] = 'group:' . $prefix . $group;
     }
     $users = Set::extract('/User/username', $this->Media->User->find(
@@ -198 +198 @@
     foreach ($users as $user) {
       // TODO excluding of users are currently not supported
-      $this->data[] = 'user:' . $user;
+      $this->request->data[] = 'user:' . $user;
     }
 
@@ -209 +209 @@
       foreach ($values as $value) {
         if (substr(strtolower($value), 0, $len) == $needle) {
-          $this->data[] = $type . ':' . $value;
+          $this->request->data[] = $type . ':' . $value;
         }
       }
@@ -309 +309 @@
 
   function quicksearch($quicksearch = false) {
-    if (!empty($this->data) && isset($this->data['Media']['quicksearch'])) {
-      $quicksearch = $this->data['Media']['quicksearch'];
+    if (!empty($this->request->data) && isset($this->request->data['Media']['quicksearch'])) {
+      $quicksearch = $this->request->data['Media']['quicksearch'];
     } 
 
     if ($quicksearch) {
-      $this->data = $this->Search->quicksearch($quicksearch, 6);
+      $this->request->data = $this->Search->quicksearch($quicksearch, 6);
     }
     $this->set('quicksearch', $quicksearch);
@@ -320 +320 @@
 
   function query() {
-    if (!empty($this->data)) {
-      $this->Search->addTags(preg_split('/\s*,\s*/', trim($this->data['Media']['tags'])));
-      $this->Search->setTagOp($this->data['Media']['tag_op']);
-
-      $this->Search->addCategories(preg_split('/\s*,\s*/', trim($this->data['Media']['categories'])));
-      $this->Search->setCategoryOp($this->data['Media']['category_op']);
-
-      $this->Search->addLocations(preg_split('/\s*,\s*/', trim($this->data['Media']['locations'])));
-      $this->Search->setLocationOp($this->data['Media']['location_op']);
-      $this->Search->setOperand($this->data['Media']['operand']);
-
-      $this->Search->setFrom($this->data['Media']['from']);
-      $this->Search->setTo($this->data['Media']['to']);
-
-      $this->Search->setShow($this->data['Option']['show']);
-      $this->Search->setSort($this->data['Option']['sort']);
+    if (!empty($this->request->data)) {
+      $this->Search->addTags(preg_split('/\s*,\s*/', trim($this->request->data['Media']['tags'])));
+      $this->Search->setTagOp($this->request->data['Media']['tag_op']);
+
+      $this->Search->addCategories(preg_split('/\s*,\s*/', trim($this->request->data['Media']['categories'])));
+      $this->Search->setCategoryOp($this->request->data['Media']['category_op']);
+
+      $this->Search->addLocations(preg_split('/\s*,\s*/', trim($this->request->data['Media']['locations'])));
+      $this->Search->setLocationOp($this->request->data['Media']['location_op']);
+      $this->Search->setOperand($this->request->data['Media']['operand']);
+
+      $this->Search->setFrom($this->request->data['Media']['from']);
+      $this->Search->setTo($this->request->data['Media']['to']);
+
+      $this->Search->setShow($this->request->data['Option']['show']);
+      $this->Search->setSort($this->request->data['Option']['sort']);
       if ($this->hasRole(ROLE_GUEST)) {
-        $this->Search->setName($this->data['Media']['name']);
-        $this->Search->setType($this->data['Media']['type']);
+        $this->Search->setName($this->request->data['Media']['name']);
+        $this->Search->setType($this->request->data['Media']['type']);
         // Allow to search for my images
-        if ($this->data['User']['username'] == $this->getUserId()) {
-          $this->Search->setUser($this->data['User']['username']);
+        if ($this->request->data['User']['username'] == $this->getUserId()) {
+          $this->Search->setUser($this->request->data['User']['username']);
         }
       }
 
       if ($this->hasRole(ROLE_USER)) {
-        $this->Search->setVisibility($this->data['Media']['visibility']);
-
-        $this->Search->setUser($this->data['User']['username']);
-        $this->Search->addGroup($this->data['Group']['name']);
+        $this->Search->setVisibility($this->request->data['Media']['visibility']);
+
+        $this->Search->setUser($this->request->data['User']['username']);
+        $this->Search->addGroup($this->request->data['Group']['name']);
       } 
       $this->crumbs = $this->Search->convertToCrumbs();
@@ -393 +393 @@
       } else {
         Logger::info(sprintf("Invalid root %s or folder %s", $fsRoot, $fsFolder));
-        $this->Session->setFlash(sprintf(__("Invalid folder: %s", true), $folder));
+        $this->Session->setFlash(__("Invalid folder: %s", $folder));
       }
     } else {
@@ -482 +482 @@
  
   function edit() {
-    if (isset($this->data)) {
-      $ids = preg_split('/\s*,\s*/', $this->data['Media']['ids']);
+    if (isset($this->request->data)) {
+      $ids = preg_split('/\s*,\s*/', $this->request->data['Media']['ids']);
       $ids = array_unique($ids);
       if (!count($ids)) {
@@ -490 +490 @@
 
       $user = $this->getUser();
-      $this->Media->prepareGroupData(&$this->data, &$user);
-      $editData = $this->Media->prepareMultiEditData(&$this->data);
+      $this->Media->prepareGroupData(&$this->request->data, &$user);
+      $editData = $this->Media->prepareMultiEditData(&$this->request->data);
       
       $allMedia = $this->Media->find('all', array('conditions' => array('Media.id' => $ids)));
@@ -520 +520 @@
         }
       }
-      $this->data = array();
+      $this->request->data = array();
     }
     $this->redirect('view/' . implode('/', $this->Search->encodeCrumbs($this->crumbs)));
@@ -542 +542 @@
       $this->redirect(null, '403');
     }
-    $this->data = $media;
+    $this->request->data = $media;
     $this->layout='bare';
     $this->render('editmeta');
@@ -560 +560 @@
     $user = $this->getUser();
     $username = $user['User']['username'];
-    if (isset($this->data)) {
+    if (isset($this->request->data)) {
       $media = $this->Media->findById($id);
       $this->Media->setAccessFlags(&$media, $user);
@@ -569 +569 @@
         Logger::warn("User '{$username}' ({$user['User']['id']}) has no previleges to change tags of image ".$id);
       } else {
-        $this->Media->prepareGroupData(&$this->data, &$user);
-        $tmp = $this->Media->editSingle(&$media, &$this->data);
+        $this->Media->prepareGroupData(&$this->request->data, &$user);
+        $tmp = $this->Media->editSingle(&$media, &$this->request->data);
         if (!$this->Media->save($tmp)) {
           Logger::warn("Could not save media");
@@ -585 +585 @@
     $media = $this->Media->findById($id);
     $this->Media->setAccessFlags(&$media, $user);
-    $this->data = $media;
+    $this->request->data = $media;
     $this->Search->parseArgs();
     $this->Search->setUser($user['User']['username']);
@@ -624 +624 @@
     $media = $this->Media->findById($id);
     $this->Media->setAccessFlags(&$media, $user);
-    $this->data = $media;
+    $this->request->data = $media;
     $this->layout='bare';
     if ($this->Media->checkAccess(&$media, &$user, 1, 0)) {
@@ -630 +630 @@
       $groups = Set::combine($groups, '{n}.Group.id', '{n}.Group.name');
       asort($groups);
-      $groups[-1] = __('[No Group]', true);
+      $groups[-1] = __('[No Group]');
       $this->set('groups', $groups);
     } else {
@@ -646 +646 @@
     $id = intval($id);
     $this->layout='bare';
-    if (isset($this->data)) {
+    if (isset($this->request->data)) {
       // Call find() instead of read(). read() populates resultes to the model,
       // which causes problems at save()
@@ -656 +656 @@
         Logger::warn("User '{$user['User']['username']}' ({$user['User']['id']}) has no previleges to change ACL of image ".$id);
       } else {
-        $this->Media->prepareGroupData(&$this->data, &$user);
+        $this->Media->prepareGroupData(&$this->request->data, &$user);
         $tmp = array('Media' => array('id' => $id));
-        $this->Media->updateAcl(&$tmp, &$media, &$this->data);
+        $this->Media->updateAcl(&$tmp, &$media, &$this->request->data);
         $this->Media->save($tmp, true);
         Logger::info("Changed acl of media $id");
@@ -665 +665 @@
     $media = $this->Media->findById($id);
     $this->Media->setAccessFlags(&$media, $this->getUser());
-    $this->data = $media;
+    $this->request->data = $media;
     $this->layout='bare';
     $this->Search->parseArgs();
@@ -714 +714 @@
         'description' => "Recently Published Images" )
       );
-    $this->data = $this->Search->paginateByCrumbs($this->crumbs);
+    $this->request->data = $this->Search->paginateByCrumbs($this->crumbs);
   }
 
@@ -722 +722 @@
       Configure::write('debug', 1);
     }
-    $this->data = $this->Search->paginateByCrumbs($this->crumbs);
+    $this->request->data = $this->Search->paginateByCrumbs($this->crumbs);
   }
 
@@ -728 +728 @@
     $this->Search->setSort('random');
 
-    $this->data = array();
+    $this->request->data = array();
 
     $north = floatval($north);
@@ -749 +749 @@
         //Logger::trace("Found ".count($points)." points");
         if ($points) {
-          $this->data = am($points, $this->data);
+          $this->request->data = am($points, $this->request->data);
         }
         $lng += $stepLng;
@@ -757 +757 @@
 
     $this->layout = 'xml';
-    Logger::trace("Search points of N:$north, S:$south, W:$west, E:$east: Found ".count($this->data)." points");
-    $this->FastFileResponder->addAll($this->data, 'mini');
+    Logger::trace("Search points of N:$north, S:$south, W:$west, E:$east: Found ".count($this->request->data)." points");
+    $this->FastFileResponder->addAll($this->request->data, 'mini');
     if (Configure::read('debug') > 1) {
       Configure::write('debug', 1);

Controller/GroupsController.php

@@ -25 +25 @@
   var $uses = array('Group', 'User', 'Media');
   var $components = array('RequestHandler', 'Security', 'Email', 'Search');
-  var $helpers = array('Form', 'Ajax', 'ImageData', 'Text');
+  var $helpers = array('Form', 'ImageData', 'Text');
   var $subMenu = false;
 
@@ -31 +31 @@
     parent::beforeFilter();
     $this->subMenu = array(
-      'index' => __("List Group", true),
-      'create' => __("Create Group", true),
+      'index' => __("List Group"),
+      'create' => __("Create Group"),
       );
     $this->requireRole(ROLE_USER);
@@ -49 +49 @@
   function fail() {
     Logger::err("The security component denied the form input");
-    Logger::debug($this->data);
+    Logger::debug($this->request->data);
     $this->redirect('index');
   }
@@ -56 +56 @@
     $userId = $this->getUserId();
     if ($this->hasRole(ROLE_ADMIN)) {
-      $this->data = $this->Group->find('all', array('order' => 'Group.name'));
-    } else {
-      $this->data = $this->Group->find('all', array('conditions' => (array('OR' => array('User.id' => $userId, 'Group.is_hidden' => false))), 'order' => 'Group.name'));
+      $this->request->data = $this->Group->find('all', array('order' => 'Group.name'));
+    } else {
+      $this->request->data = $this->Group->find('all', array('conditions' => (array('OR' => array('User.id' => $userId, 'Group.is_hidden' => false))), 'order' => 'Group.name'));
     }
   }
 
   function view($name) {
-    $this->data = $this->Group->findByName($name);
-    if (!$this->data) {
-      $this->Session->setFlash(sprintf(__("%s not found", true), __("Group", true)));
+    $this->request->data = $this->Group->findByName($name);
+    if (!$this->request->data) {
+      $this->Session->setFlash(__("%s not found", true, __("Group")));
       $this->redirect('index');
     }
-    $this->Group->setAdmin(&$this->data, $this->getUser());
-    $this->set('mediaCount', $this->Media->countByGroupId($this->data['Group']['id']));
+    $this->Group->setAdmin(&$this->request->data, $this->getUser());
+    $this->set('mediaCount', $this->Media->countByGroupId($this->request->data['Group']['id']));
 
     $this->Search->addGroup($name);
@@ -77 +77 @@
 
   function create() {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $user = $this->getUser();
-      $this->data['Group']['user_id'] = $user['User']['id'];
-      if (!$this->Group->isNameUnique($this->data)) {
-        $this->Session->setFlash(sprintf(__("%s already exists", true), __('Group', true)));
-      } elseif ($this->Group->save($this->data)) {
+      $this->request->data['Group']['user_id'] = $user['User']['id'];
+      if (!$this->Group->isNameUnique($this->request->data)) {
+        $this->Session->setFlash(__("%s already exists", true, __('Group')));
+      } elseif ($this->Group->save($this->request->data)) {
         $groupId = $this->Group->getLastInsertID();
         $group = $this->Group->findById($groupId);
         $user = $this->getUser();
         Logger::info("User '{$user['User']['username']}' ({$user['User']['id']}) created group '{$group['Group']['name']}' ({$group['Group']['id']})");
-        $this->Session->setFlash(sprintf(__("Add successfully group '%s'", true), $this->data['Group']['name']));
+        $this->Session->setFlash(__("Add successfully group '%s'", $this->request->data['Group']['name']));
         $this->redirect("view/{$group['Group']['name']}");
       } else {
-        $this->Session->setFlash(sprintf(__("Could not create group '%s'", true), $this->data['Group']['name']));
+        $this->Session->setFlash(__("Could not create group '%s'", $this->request->data['Group']['name']));
       }
     }
@@ -110 +110 @@
         Logger::err($this->Email->smtpError);
       }
-      $this->Session->setFlash(__('Mail could not be sent', true));
+      $this->Session->setFlash(__('Mail could not be sent'));
       return false;
     }
     Logger::info("Sent group subscribe request of user {$user['User']['username']} for group {$group['Group']['name']} to {$group['User']['username']}");
-    $this->Session->setFlash(__("Group subscription request was sent to the group owner", true));
+    $this->Session->setFlash(__("Group subscription request was sent to the group owner"));
     return true;
   }
@@ -176 +176 @@
     $group = $this->Group->findByName($name);
     if (!$group) {
-      $this->Session->setFlash(sprintf(__("%s not found", true), __("Group", true)));
+      $this->Session->setFlash(__("%s not found", true, __("Group")));
       $this->redirect('index');
     }
@@ -201 +201 @@
       $conditions['Group.user_id'] = $this->getUserId();
     }
-    $group = $this->Group->find($conditions);
+    $group = $this->Group->find('all', array('conditions' => $conditions));
     $user = $this->User->findByUsername($userName);
     $userId = ($user) ? $user['User']['id'] : false;
@@ -232 +232 @@
     $group = $this->Group->findById($id);
     if (!$this->Group->isAdmin(&$group, $this->getUser())) {
-      $this->Session->setFlash(__("You are not authorized to perform this action", true));
+      $this->Session->setFlash(__("You are not authorized to perform this action"));
       $this->redirect("view/{$group['Group']['name']}");
     }
-    $user = $this->User->findByUsername($this->data['Member']['new']);
+    $user = $this->User->findByUsername($this->request->data['Member']['new']);
     if (!$user) {
-      $this->Session->setFlash(__("%s not found", true), __("User", true));
+      $this->Session->setFlash(__("%s not found", true), __("User"));
       $this->redirect("view/{$group['Group']['name']}");
     }
@@ -244 +244 @@
       $this->redirect("index");
     } elseif ($result['code'] == 201) {
-      $this->Session->setFlash(sprintf(__("User %s is now subscribe to this group", true), $this->data['Member']['new']));
+      $this->Session->setFlash(__("User %s is now subscribe to this group", $this->request->data['Member']['new']));
     }
     $this->redirect("view/{$group['Group']['name']}");
@@ -252 +252 @@
     $group = $this->Group->findByName($groupName);
     if (!$this->Group->isAdmin(&$group, $this->getUser())) {
-      $this->Session->setFlash(__("You are not authorized to perform this action", true));
+      $this->Session->setFlash(__("You are not authorized to perform this action"));
       $this->redirect("view/{$group['Group']['name']}");
     }
     $user = $this->User->findByUsername($userName);
     if (!$user) {
-      $this->Session->setFlash(__("%s not found", true), __("User", true));
+      $this->Session->setFlash(__("%s not found", true), __("User"));
       $this->redirect("view/{$group['Group']['name']}");
     }
@@ -264 +264 @@
       $this->redirect("index");
     } elseif ($result['code'] == 201) {
-      $this->Session->setFlash(sprintf(__("User %s is now unsubscribe from this group", true), $userName));
+      $this->Session->setFlash(__("User %s is now unsubscribe from this group", $userName));
     }
     $this->redirect("view/{$group['Group']['name']}");
@@ -270 +270 @@
 
   function edit($groupName) {
-    if (!empty($this->data)) {
-      if ($this->data['Group']['name'] != $groupName && !$this->Group->isNameUnique($this->data)) {
-        $this->Session->setFlash(sprintf(__("%s already exists", true), __('Group', true)));
-      } elseif (!$this->Group->save($this->data)) {
-        $this->Session->setFlash(sprintf(__("Could not save %s", true), __('Group', true)));
+    if (!empty($this->request->data)) {
+      if ($this->request->data['Group']['name'] != $groupName && !$this->Group->isNameUnique($this->request->data)) {
+        $this->Session->setFlash(__("%s already exists", true, __('Group')));
+      } elseif (!$this->Group->save($this->request->data)) {
+        $this->Session->setFlash(__("Could not save %s", true, __('Group')));
       } else {
-        $this->Session->setFlash(sprintf(__("%s updated", true), __('Group', true)));
-        if ($groupName != $this->data['Group']['name']) {
-          $this->redirect("edit/{$this->data['Group']['name']}");
+        $this->Session->setFlash(__("%s updated", true, __('Group')));
+        if ($groupName != $this->request->data['Group']['name']) {
+          $this->redirect("edit/{$this->request->data['Group']['name']}");
         }
       }
@@ -286 +286 @@
       $conditions['Group.user_id'] = $this->getUserId();
     }
-    $this->data = $this->Group->find($conditions);
-    if (!$this->data) {
-      $this->Session->setFlash(__("Could not find group", true));
+    $this->request->data = $this->Group->find('all', array('conditions' => $conditions));
+    if (!$this->request->data) {
+      $this->Session->setFlash(__("Could not find group"));
       $this->redirect("index");
     }
@@ -298 +298 @@
   function delete($groupId) {
     $userId = $this->getUserId();
-    $group = $this->Group->find(array('Group.id' => $groupId, 'Group.user_id' => $userId));
+    $group = $this->Group->find('first', array('conditions' => array('Group.id' => $groupId, 'Group.user_id' => $userId)));
     if ($group) {
       $this->Group->delete($groupId);
       $user = $this->getUser();
       Logger::info("User '{$user['User']['username']}' ({$user['User']['id']}) deleted group '{$group['Group']['name']}' ({$group['Group']['id']})");
-      $this->Session->setFlash(sprintf(__("Successfully deleted group '%s'", true), $group['Group']['name']));
-    } else {
-      $this->Session->setFlash(__("Could not find group", true));
+      $this->Session->setFlash(__("Successfully deleted group '%s'", $group['Group']['name']));
+    } else {
+      $this->Session->setFlash(__("Could not find group"));
     }
     $this->redirect("index");

Controller/GuestsController.php

@@ -25 +25 @@
   var $uses = array('Group', 'User', 'Guest');
   var $components = array('RequestHandler');
-  var $helpers = array('Form', 'Ajax');
+  var $helpers = array('Form', 'Autocomplete');
   var $subMenu = false;
 
@@ -33 +33 @@
     $this->requireRole(ROLE_USER);
     $this->subMenu = array(
-      'create' => __('New Guest', true)
+      'create' => __('New Guest')
       );
   }
@@ -43 +43 @@
   function index() {
     $userId = $this->getUserId();
-    $this->data = $this->Guest->find('all', array('conditions' => array('Guest.creator_id' => $userId)));
+    $this->request->data = $this->Guest->find('all', array('conditions' => array('Guest.creator_id' => $userId)));
   }
 
@@ -53 +53 @@
     uses('sanitize');
     $sanitize = new Sanitize();
-    $escName = $sanitize->escape($this->data['Group']['name']);
+    $escName = $sanitize->escape($this->request->data['Group']['name']);
     $groups = $this->Group->find('all', array('conditions' => "Group.user_id = $userId AND Group.name LIKE '%$escName%'"));
-    $this->data = $groups;
+    $this->request->data = $groups;
     $this->layout = "bare";
   }
 
   function create() {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $userId = $this->getUserId();
-      $this->data['Guest']['creator_id'] = $userId;
-      $this->data['Guest']['role'] = ROLE_GUEST;
-      if ($this->Guest->hasAny(array("Guest.username" => $this->data['Guest']['username']))) {
-        $this->Session->setFlash(__("Sorry. Username is already taken", true));
-      } elseif ($this->Guest->save($this->data, true, array('username', 'password', 'role', 'creator_id', 'email', 'quota'))) {
+      $this->request->data['Guest']['creator_id'] = $userId;
+      $this->request->data['Guest']['role'] = ROLE_GUEST;
+      if ($this->Guest->hasAny(array("Guest.username" => $this->request->data['Guest']['username']))) {
+        $this->Session->setFlash(__("Sorry. Username is already taken"));
+      } elseif ($this->Guest->save($this->request->data, true, array('username', 'password', 'role', 'creator_id', 'email', 'quota'))) {
         $guestId = $this->Guest->getLastInsertID();
         $guest = $this->Guest->findById($guestId);
         $user = $this->getUser();
         Logger::info("User '{$user['User']['username']}' ({$user['User']['id']}) created a guest account '{$guest['Guest']['username']}' ({$guest['Guest']['id']})");
-        $this->Session->setFlash(sprintf(__("Guest account '%s' was successfully created", true), $this->data['Guest']['username']));
+        $this->Session->setFlash(__("Guest account '%s' was successfully created", $this->request->data['Guest']['username']));
         $this->redirect("edit/$guestId");
       } else {
-        $this->Session->setFlash(__("Sorry. Guest account could not created", true));
+        $this->Session->setFlash(__("Sorry. Guest account could not created"));
       }
     }
@@ -84 +84 @@
     
     if (!$this->Guest->hasAny(array('id' => $guestId, 'creator_id' => $userId))) {
-      $this->Session->setFlash(__("Sorry. Could not find requested guest", true));
+      $this->Session->setFlash(__("Sorry. Could not find requested guest"));
       Logger::debug("Sorry. Could not find requested guest '$guestId' of user '$userId'");
       $this->redirect("index");
     }
 
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $this->Guest->id = $guestId;
-      $this->Guest->set($this->data);
+      $this->Guest->set($this->request->data);
       if ($this->Guest->save(null, true, array('username', 'password', 'email', 'expires', 'quota'))) {
-        $this->Session->setFlash(__("Guest data were saved", true));
-        $auth = max(0, min(3, $this->data['Comment']['auth']));
+        $this->Session->setFlash(__("Guest data were saved"));
+        $auth = max(0, min(3, $this->request->data['Comment']['auth']));
         $this->Option->setValue('comment.auth', $auth, $guestId);
       } else {
         Logger::err("Could not save guest");
         Logger::trace($this->Guest->validationErrors);
-        $this->Session->setFlash(__("Updates could not be saved!", true));
-      }
-    }
-    $this->data = $this->Guest->findById($guestId);
-    unset($this->data['Guest']['password']);
-    $this->data['Comment']['auth'] = $this->Option->getValue($this->data, 'comment.auth', COMMENT_AUTH_NONE);
+        $this->Session->setFlash(__("Updates could not be saved!"));
+      }
+    }
+    $this->request->data = $this->Guest->findById($guestId);
+    unset($this->request->data['Guest']['password']);
+    $this->request->data['Comment']['auth'] = $this->Option->getValue($this->request->data, 'comment.auth', COMMENT_AUTH_NONE);
     $this->set('userId', $userId);
-    $this->subMenu[] = array('url' => array('action' => $this->action, $guestId), 'title' => __("Edit", true), 'active' => true,
-      array('url' => array('action' => 'links', $guestId), 'title' => __("RSS", true)),
+    $this->subMenu[] = array('url' => array('action' => $this->action, $guestId), 'title' => __("Edit"), 'active' => true,
+      array('url' => array('action' => 'links', $guestId), 'title' => __("RSS")),
       );
   }
@@ -115 +115 @@
   function delete($guestId) {
     $userId = $this->getUserId();
-    $guest = $this->Guest->find(array('Guest.id' => $guestId, 'Creator.id' => $userId));
+    $guest = $this->Guest->find('first', array('conditions' => array('Guest.id' => $guestId, 'Creator.id' => $userId)));
     if (!$guest) {
-      $this->Session->setFlash(__("Could not find requested guest", true));
+      $this->Session->setFlash(__("Could not find requested guest"));
     } else {
       $user = $this->getUser();
       Logger::info("User '{$user['User']['username']}' ({$user['User']['id']}) deleted guest account '{$guest['Guest']['username']}' ({$guest['Guest']['id']})");
-      $this->Session->setFlash(sprintf(__("Guest account '%s' deleted!", true), $guest['Guest']['username']));
+      $this->Session->setFlash(__("Guest account '%s' deleted!", $guest['Guest']['username']));
       $this->Guest->delete($guestId);
     }
@@ -128 +128 @@
 
   function addGroup($groupId) {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $userId = $this->getUserId();
-      $group = $this->Group->find(array('Group.name' => $this->data['Group']['name'], 'Group.user_id' => $userId));
-      $guest = $this->Guest->find(array('Guest.id' => $groupId, 'Creator.id' => $userId));
+      $group = $this->Group->find('first', array('conditions' => array('Group.name' => $this->request->data['Group']['name'], 'Group.user_id' => $userId)));
+      $guest = $this->Guest->find('first', array('conditions' => array('Guest.id' => $groupId, 'Creator.id' => $userId)));
 
       if (!$guest) {
@@ -137 +137 @@
         $this->redirect("index");
       } elseif (!$group) {
-        $this->Session->setFlash("The group '{$this->data['Group']['name']}' does not exists!");
+        $this->Session->setFlash("The group '{$this->request->data['Group']['name']}' does not exists!");
       } else {
         $list = Set::extract($guest, "Member.{n}.id");
@@ -146 +146 @@
         if ($this->Guest->save()) {
           Logger::info("Added group '{$group['Group']['name']}' ({$group['Group']['id']}) to guest '{$guest['Guest']['username']}' ({$guest['Guest']['id']})");
-          $this->Session->setFlash("The group '{$this->data['Group']['name']}' was added to your guest '{$guest['Guest']['username']}'");
+          $this->Session->setFlash("The group '{$this->request->data['Group']['name']}' was added to your guest '{$guest['Guest']['username']}'");
         } else {
-          $this->Session->setFlash("The group '{$this->data['Group']['name']}' could not be added to your guest '{$guest['Guest']['username']}'");
+          $this->Session->setFlash("The group '{$this->request->data['Group']['name']}' could not be added to your guest '{$guest['Guest']['username']}'");
         }
       }
@@ -160 +160 @@
     $userId = $this->getUserId();
 
-    $guest = $this->Guest->find(array('Guest.id' => $guestId, 'Creator.id' => $userId));
+    $guest = $this->Guest->find('first', array('conditions' => array('Guest.id' => $guestId, 'Creator.id' => $userId)));
     if (!$guest) {
       $this->Session->setFlash("Could not find guest!");
@@ -193 +193 @@
 
     $userId = $this->getUserId();
-    $guest = $this->Guest->find(array('Guest.id' => $guestId, 'Creator.id' => $userId));
+    $guest = $this->Guest->find('first', array('conditions' => array('Guest.id' => $guestId, 'Creator.id' => $userId)));
     if (!$guest) {
       $this->Session->setFlash("Could not find guest!");
@@ -211 +211 @@
       }
     }
-    $this->data = $this->Guest->findById($guestId);
-    $this->subMenu[] = array('url' => array('action' => 'edit', $guestId), 'title' => __("Edit", true), 'active' => true,
-      array('url' => array('action' => 'links', $guestId), 'title' => __("RSS", true), 'active' => true),
+    $this->request->data = $this->Guest->findById($guestId);
+    $this->subMenu[] = array('url' => array('action' => 'edit', $guestId), 'title' => __("Edit"), 'active' => true,
+      array('url' => array('action' => 'links', $guestId), 'title' => __("RSS"), 'active' => true),
       );
   }

Controller/HomeController.php

@@ -46 +46 @@
     $this->uses = array('Media', 'Tag', 'Category', 'Comment');
     $this->constructClasses();
-    $this->pageTitle = __("Home", true);
+    $this->pageTitle = __("Home");
 
     parent::beforeFilter();

Controller/ImagesController.php

@@ -27 +27 @@
   var $components = array('RequestHandler', 'Search', 'FastFileResponder');
   var $uses = array('Media', 'Group', 'Tag', 'Category', 'Location');
-  var $helpers = array('Form', 'Html', 'Ajax', 'ImageData', 'Time', 'Search', 'ExplorerMenu', 'Rss', 'Map', 'Navigator', 'Flowplayer', 'Tab', 'Number', 'Option');
+  var $helpers = array('Form', 'Html', 'ImageData', 'Time', 'Search', 'ExplorerMenu', 'Rss', 'Map', 'Navigator', 'Flowplayer', 'Tab', 'Number', 'Option', 'Autocomplete');
   var $crumbs = array();
 
@@ -37 +37 @@
       $groupSelect = Set::combine($groups, '{n}.Group.id', '{n}.Group.name');
       asort($groupSelect);
-      $groupSelect[0] = __('[Keep]', true);
-      $groupSelect[-1] = __('[No Group]', true);
+      $groupSelect[0] = __('[Keep]');
+      $groupSelect[-1] = __('[No Group]');
       $this->set('groups', $groupSelect);
     } else {
@@ -65 +65 @@
    * in the session to avoid multiple rating per session. */
   function _updateRating() {
-    if (!$this->data || !isset($this->data['Media']['id'])) {
+    if (!$this->request->data || !isset($this->request->data['Media']['id'])) {
       Logger::warn("Precondition failed");
       return;
@@ -79 +79 @@
 
     // Check for media rating
-    $id = $this->data['Media']['id'];
+    $id = $this->request->data['Media']['id'];
     $ranked = array();
     if ($this->Session->check('Media.ranked')) {
@@ -89 +89 @@
     }
 
-    $this->Media->updateRanking($this->data);
+    $this->Media->updateRanking($this->request->data);
 
     // update rated media ids
@@ -97 +97 @@
 
   function view($id) {
-    $this->data = $this->Search->paginateMediaByCrumb($id, $this->crumbs);
-    if (!$this->data) {
+    $this->request->data = $this->Search->paginateMediaByCrumb($id, $this->crumbs);
+    if (!$this->request->data) {
       $this->render('notfound');
     } else {
@@ -118 +118 @@
         $comment = $this->Session->read('Comment.data');
         $this->Comment->validationErrors = $this->Session->read('Comment.validationErrors');
-        $this->data['Comment'] = am($comment['Comment'], $this->data['Comment']);
-        //$this->data = am($this->Session->read('Comment.data'), $this->data);
+        $this->request->data['Comment'] = am($comment['Comment'], $this->request->data['Comment']);
+        //$this->request->data = am($this->Session->read('Comment.data'), $this->request->data);
         $this->Session->delete('Comment.data');
       }
-      $this->FastFileResponder->add($this->data, 'preview');
+      $this->FastFileResponder->add($this->request->data, 'preview');
     }
   }
 
   function update($id) {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $user = $this->getUser();
       $media = $this->Media->findById($id);
@@ -138 +138 @@
       } else {
         //$this->_checkAndSetGroupId();
-        $tmp = $this->Media->editSingle(&$media, &$this->data);
+        $tmp = $this->Media->editSingle(&$media, &$this->request->data);
         if (!$this->Media->save($tmp)) {
           Logger::warn("Could not save media");
@@ -159 +159 @@
 
   function updateAcl($id) {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $user = $this->getUser();
       $media = $this->Media->findById($id);
@@ -169 +169 @@
         Logger::warn("User '{$username}' ({$user['User']['id']}) has no previleges to change tags of image ".$id);
       } else {
-        $this->Media->prepareGroupData(&$this->data, &$user);
+        $this->Media->prepareGroupData(&$this->request->data, &$user);
         $tmp = array('Media' => array('id' => $id));
-        $this->Media->updateAcl(&$tmp, &$media, &$this->data);
+        $this->Media->updateAcl(&$tmp, &$media, &$this->request->data);
         $this->Media->save($tmp, true);
         Logger::info("Changed acl of media $id");

Controller/OptionsController.php

@@ -30 +30 @@
   function beforeFilter() {
     $this->subMenu = array(
-      'acl' => __("Default Rights", true),
-      'profile' => __("Profile", true),
-      'rss' => __("RSS Feeds", true),
+      'acl' => __("Default Rights"),
+      'profile' => __("Profile"),
+      'rss' => __("RSS Feeds"),
       );
     parent::beforeFilter();
@@ -57 +57 @@
 
     $userId = $this->getUserId();
-    if (isset($this->data)) {
+    if (!empty($this->request->data)) {
       // TODO check valid acl
-      $this->_set($userId, 'acl.group', $this->data);
+      $this->_set($userId, 'acl.group', $this->request->data);
 
       // check values
-      if ($this->data['acl']['write']['meta'] > $this->data['acl']['write']['tag'])
-        $this->data['acl']['write']['meta'] = $this->data['acl']['write']['tag'];
-      if ($this->data['acl']['read']['original'] > $this->data['acl']['read']['preview'])
-        $this->data['acl']['read']['original'] = $this->data['acl']['read']['preview'];
+      if ($this->request->data['acl']['write']['meta'] > $this->request->data['acl']['write']['tag']) {
+        $this->request->data['acl']['write']['meta'] = $this->request->data['acl']['write']['tag'];
+      }
+      if ($this->request->data['acl']['read']['original'] > $this->request->data['acl']['read']['preview']) {
+        $this->request->data['acl']['read']['original'] = $this->request->data['acl']['read']['preview'];
+      }
 
-      $this->_set($userId, 'acl.write.tag', $this->data);
-      $this->_set($userId, 'acl.write.meta', $this->data);
+      $this->_set($userId, 'acl.write.tag', $this->request->data);
+      $this->_set($userId, 'acl.write.meta', $this->request->data);
 
-      $this->_set($userId, 'acl.read.original', $this->data);
-      $this->_set($userId, 'acl.read.preview', $this->data);
+      $this->_set($userId, 'acl.read.original', $this->request->data);
+      $this->_set($userId, 'acl.read.preview', $this->request->data);
 
-      $this->Session->setFlash(__("Settings saved", true));
+      $this->Session->setFlash(__("Settings saved"));
     }
     $tree = $this->Option->getTree($userId);
     $this->Option->addDefaultAclTree(&$tree);
-    $this->data = $tree;
+    $this->request->data = $tree;
 
     $this->set('userId', $userId);
@@ -86 +88 @@
       $groups = array();
     }
-    $groups[-1] = __('[No Group]', true);
+    $groups[-1] = __('[No Group]');
     $this->set('groups', $groups);
   }
@@ -94 +96 @@
 
     $userId = $this->getUserId();
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $this->User->id = $userId;
-      if (!$this->User->save($this->data['User'], true, array('username', 'firstname', 'lastname', 'password', 'email', 'visible_level', 'notify_interval'))) {
+      if (!$this->User->save($this->request->data['User'], true, array('username', 'firstname', 'lastname', 'password', 'email', 'visible_level', 'notify_interval'))) {
         Logger::err("Could not update user profile");
-        $this->Session->setFlash(__("Could not save profile!", true));
+        $this->Session->setFlash(__("Could not save profile!"));
       } else {
         Logger::info("User $userId profile updated");
-        $this->Session->setFlash(__("Profile saved", true));
+        $this->Session->setFlash(__("Profile saved"));
       }
-      $browser = Set::extract("/Option/user/browser/full", $this->data);
+      $browser = Set::extract("/Option/user/browser/full", $this->request->data);
       $this->Option->setValue('user.browser.full', $browser[0], $userId);
     }
-    $this->data = $this->User->findById($userId);
-    $this->data['Option'] = $this->Option->getTree($userId);
-    unset($this->data['User']['password']);
+    $this->request->data = $this->User->findById($userId);
+    $this->request->data['Option'] = $this->Option->getTree($userId);
+    unset($this->request->data['User']['password']);
   }
 
@@ -124 +126 @@
       }
     }
-    $this->data = $this->User->findById($userId);
+    $this->request->data = $this->User->findById($userId);
   }
 

Controller/SetupController.php

@@ -317 +317 @@
     $newContent = preg_replace("/$oldSalt/", $salt, $content);
     if (!$file->write($newContent)) {
-      $this->Session->setFlash(sprintf(__("Could not write configuration to '%s'", true), $this->core));
+      $this->Session->setFlash(__("Could not write configuration to '%s'", $this->core));
       Logger::err("Could not write configuration to '$this->core'");
     } else {
@@ -324 +324 @@
       $this->Session->renew();
 
-      $this->Session->setFlash(__("Update core settings", true));
+      $this->Session->setFlash(__("Update core settings"));
       Logger::info("Set new security salt to '$this->core'");
       $this->redirect('index');
@@ -395 +395 @@
     $this->Session->delete('configError');
 
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       $output = "<?php 
 /** 
@@ -407 +407 @@
     'datasource' => 'Database/Mysql',
     'persistent' => true,
-    'host' => '{$this->data['db']['host']}',
-    'login' => '{$this->data['db']['login']}',
-    'password' => '{$this->data['db']['password']}',
-    'database' => '{$this->data['db']['database']}',
-    'prefix' => '{$this->data['db']['prefix']}',
+    'host' => '{$this->request->data['db']['host']}',
+    'login' => '{$this->request->data['db']['login']}',
+    'password' => '{$this->request->data['db']['password']}',
+    'database' => '{$this->request->data['db']['database']}',
+    'prefix' => '{$this->request->data['db']['prefix']}',
     'encoding' => 'utf8'
   );
@@ -423 +423 @@
       } else {
         Logger::err("Could not write database configuration file '{$this->dbConfig}'");
-        $this->Session->setFlash(__("Could not write database configuration file", true));
+        $this->Session->setFlash(__("Could not write database configuration file"));
       }
       $file->close();
-      unset($this->data['db']['password']);
-      $this->Session->write('configData', $this->data);
+      unset($this->request->data['db']['password']);
+      $this->Session->write('configData', $this->request->data);
     } else {
       if ($this->Session->check('configData')) {
@@ -460 +460 @@
 
     if (!$this->__hasConnection()) {
-      $this->Session->setFlash(__('Could not connect to database. Please check your database configuration!', true));
+      $this->Session->setFlash(__('Could not connect to database. Please check your database configuration!'));
       $this->Session->write('configError', true);
       $this->redirect('config');
@@ -484 +484 @@
       } 
       Logger::info("Successful database migration to verion " . $this->Migration->getVersion('app'));
-      $this->Session->setFlash(__("All required tables are created", true));
+      $this->Session->setFlash(__("All required tables are created"));
       $this->redirect('user');
     } catch (MigrationVersionException $errors) {
       Logger::trace($errors->getMessage());
-      $this->Session->setFlash(__("Could not create tables correctly. Please see logfile for details", true));
+      $this->Session->setFlash(__("Could not create tables correctly. Please see logfile for details"));
     }
   }
@@ -516 +516 @@
         $this->Session->write('User.username', $this->request->data['User']['username']);
         Logger::info("Admin account '{$this->request->data['User']['username']}' was created");
-        $this->Session->setFlash(__("Admin account was successfully created", true));
+        $this->Session->setFlash(__("Admin account was successfully created"));
         $this->redirect('system');
       } else {
         Logger::err("Admin account '{$this->request->data['User']['username']}' could not be created");
-        $this->Session->setFlash(__("Could not create admin account. Please retry", true));
+        $this->Session->setFlash(__("Could not create admin account. Please retry"));
       }
     } elseif (!isset($this->request->data['User']['username'])) {
@@ -689 +689 @@
     if (!$this->_initMigration()) {
       Logger::err("Cannot init migration data");
-      $this->Session->setFlash(__("Cannot initialize database migration data", true));
+      $this->Session->setFlash(__("Cannot initialize database migration data"));
       return false;
     }

Controller/SystemController.php

@@ -25 +25 @@
   var $name = 'System';
   var $helpers = array('Form');
-  var $uses = array('Option');
+  var $uses = array('Media', 'Option');
   var $subMenu = array();
 
@@ -33 +33 @@
 
     $this->subMenu = array(
-      'index' => __("General", true),
-      'external' => __("External Programs", true),
-      'map' => __("Map Settings", true),
-      'upgrade' => __("Database Upgrade", true),
-      'deleteUnusedMetaData' => __("Delete Unused Metadata", true)
+      'index' => __("General"),
+      'external' => __("External Programs"),
+      'map' => __("Map Settings"),
+      'upgrade' => __("Database Upgrade"),
+      'deleteUnusedMetaData' => __("Delete Unused Metadata")
       );
   }
@@ -52 +52 @@
 
   function index() {
-    if (isset($this->data)) {
-      $this->_set(0, 'general.title', $this->data);
-      $this->_set(0, 'general.subtitle', $this->data);
+    if (isset($this->request->data)) {
+      $this->_set(0, 'general.title', $this->request->data);
+      $this->_set(0, 'general.subtitle', $this->request->data);
     }
-    $this->data = $this->Option->getTree(0);
+    $this->request->data = $this->Option->getTree(0);
   }
 
   function external() {
-    if (!empty($this->data)) {
+    if (!empty($this->request->data)) {
       // TODO check valid acl
-      $this->_set(0, 'bin.exiftool', $this->data);
-      $this->_set(0, 'bin.convert', $this->data);
-      $this->_set(0, 'bin.ffmpeg', $this->data);
-      $this->_set(0, 'bin.flvtool2', $this->data);
+      $this->_set(0, 'bin.exiftool', $this->request->data);
+      $this->_set(0, 'bin.convert', $this->request->data);
+      $this->_set(0, 'bin.ffmpeg', $this->request->data);
+      $this->_set(0, 'bin.flvtool2', $this->request->data);
       // debug
-      $this->set('commit', $this->data);
+      $this->set('commit', $this->request->data);
       $this->Session->setFlash("Settings saved");
     }
     $tree = $this->Option->getTree(0);
-    $this->data = $tree;
+    $this->request->data = $tree;
   }
 
   function map() {
-    if (!empty($this->data)) {
-      $this->_set(0, 'google.map.key', $this->data);
+    if (!empty($this->request->data)) {
+      $this->_set(0, 'google.map.key', $this->request->data);
       // debug
-      $this->set('commit', $this->data);
+      $this->set('commit', $this->request->data);
       $this->Session->setFlash("Settings saved");
     }
     $tree = $this->Option->getTree(0);
-    $this->data = $tree;
+    $this->request->data = $tree;
   }
   
   /** Database upgrade via the Migraions plugin */
   function upgrade($action = '') {
+    CakePlugin::load('Migrations');
     App::import('Lib', 'Migrations.MigrationVersion');
     $Migration = new MigrationVersion(array('connection' => 'default'));
@@ -101 +102 @@
     if ($action == 'run' && $currentVersion < $migrationVersion) {
       if (!$Migration->run(array('type' => 'app', 'direction' => 'up'))) {
-        $this->Session->setFlash(__("Database migration failed. Please see the log files for errors.", true));
+        $this->Session->setFlash(__("Database migration failed. Please see the log files for errors."));
         Logger::error("Could not run migration");
       } else {
         Logger::info("Upgraded database from version $currentVersion to " . max(array_keys($Migration->getMapping('app'))));
-        $this->Session->setFlash(__("The database migration was successful.", true));
+        $this->Session->setFlash(__("The database migration was successful."));
       }
     }
@@ -122 +123 @@
 
   function deleteUnusedMetaData($delete = '') {
-    App::import('Model', array('Tag', 'Category', 'Location'));
+    $this->Media->Tag->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
+    $this->Media->Tag->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
 
-    $this->Tag =& new Tag();
-    $this->Tag->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
-    $this->Tag->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
-    $unusedTagCount = count($this->Tag->findAllUnused());
+    $this->Media->Category->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
+    $this->Media->Category->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
 
-    $this->Category =& new Category();
-    $this->Category->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
-    $this->Category->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
-    $unusedCategoryCount = count($this->Category->findAllUnused());
-
-    $this->Location =& new Location();
-    $this->Location->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
-    $this->Location->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
-    $unusedLocationCount = count($this->Location->findAllUnused());
+    $this->Media->Location->bindModel(array('hasAndBelongsToMany' => array('Media')), false);
+    $this->Media->Location->Behaviors->attach('DeleteUnused', array('relatedHabtm' => 'Media'));
 
     if ($delete == 'delete') {
-      $this->Tag->deleteAllUnused();
-      $this->Location->deleteAllUnused();
-      $this->Category->deleteAllUnused();
-      $this->Session->setFlash(__("All unused meta data are deleted", true));
+      $this->Media->Tag->deleteAllUnused();
+      $this->Media->Location->deleteAllUnused();
+      $this->Media->Category->deleteAllUnused();
+      $this->Session->setFlash(__("All unused meta data are deleted"));
     }
-    $this->data = compact('unusedTagCount', 'unusedCategoryCount', 'unusedLocationCount');
+
+    $unusedTagCount = count($this->Media->Tag->findAllUnused());
+    $unusedCategoryCount = count($this->Media->Category->findAllUnused());
+    $unusedLocationCount = count($this->Media->Location->findAllUnused());
+
+    $this->request->data = compact('unusedTagCount', 'unusedCategoryCount', 'unusedLocationCount');
   }
 }

Controller/UsersController.php

@@ -33 +33 @@
     parent::beforeFilter();
     $this->subMenu = array(
-      'index' => __("List User", true),
+      'index' => __("List User"),
       );
     if ($this->hasRole(ROLE_SYSOP)) {
       $this->subMenu = am($this->subMenu, array(
-        array('action' => 'add', 'title' => __("Add User", true), 'admin' => true),
-        array('action' => 'register', 'title' => __("Registration", true), 'admin' => true),
+        array('action' => 'add', 'title' => __("Add User"), 'admin' => true),
+        array('action' => 'register', 'title' => __("Registration"), 'admin' => true),
         ));
     }
@@ -90 +90 @@
   function index() {
     $this->set('isAdmin', $this->hasRole(ROLE_SYSOP));
-    $this->data = $this->User->findVisibleUsers($this->getUser());
+    $this->request->data = $this->User->findVisibleUsers($this->getUser());
   }
 
   function view($name) {
-    $this->data = $this->User->findVisibleUsers($this->getUser(), $name);
-    if (!$this->data) {
+    $this->request->data = $this->User->findVisibleUsers($this->getUser(), $name);
+    if (!$this->request->data) {
       $this->redirect('index');
     }
-    $userId = $this->data['User']['id'];
-    $this->data['Media']['count'] = $this->Media->find('count', array('conditions' => array('Media.user_id' => $userId), 'recursive' => -1));
-    $this->data['File']['count'] = $this->MyFile->find('count', array('conditions' => array('File.user_id' => $userId), 'recursive' => -1));
+    $userId = $this->request->data['User']['id'];
+    $this->request->data['Media']['count'] = $this->Media->find('count', array('conditions' => array('Media.user_id' => $userId), 'recursive' => -1));
+    $this->request->data['File']['count'] = $this->MyFile->find('count', array('conditions' => array('File.user_id' => $userId), 'recursive' => -1));
     $bytes = $this->MyFile->find('all', array('conditions' => array("File.user_id" => $userId), 'recursive' => -1, 'fields' => 'SUM(File.size) AS Bytes'));
-    $this->data['File']['bytes'] = $bytes[0][0]['Bytes'];
+    $this->request->data['File']['bytes'] = $bytes[0][0]['Bytes'];
 
     $groupUserIds = Set::extract('/Group/user_id');
     $this->set('users', $this->User->find('all', array('condition' => array('User.id' => $groupUserIds), 'recursive' => -1)));
 
-    $this->Search->setUser($this->data['User']['username']);
+    $this->Search->setUser($this->request->data['User']['username']);
     $this->Search->setShow(6);
     $this->set('media', $this->Search->paginate());
@@ -115 +115 @@
    * set the user is forwarded to this given address on successful login. */
   function login() {
-    $failedText = __("Sorry. Wrong password or unknown username!", true);
-    if (!empty($this->data) && !$this->RequestHandler->isPost()) {
+    $failedText = __("Sorry. Wrong password or unknown username!");
+    if (!empty($this->request->data) && !$this->RequestHandler->isPost()) {
       Logger::warn("Authentication failed: Request was not HTTP POST");
       $this->Session->setFlash($failedText);
-      $this->data = null;
-    }
-    if (empty($this->data['User']['username']) xor empty($this->data['User']['password'])) {
+      $this->request->data = null;
+    }
+    if (empty($this->request->data['User']['username']) xor empty($this->request->data['User']['password'])) {
       Logger::warn("Authentication failed: Username or password are not set");
-      $this->Session->setFlash(__("Please enter username and password!", true));
-      $this->data = null; 
-    }
-
-    if (!empty($this->data)) {
-      $user = $this->User->findByUsername($this->data['User']['username']);
+      $this->Session->setFlash(__("Please enter username and password!"));
+      $this->request->data = null; 
+    }
+
+    if (!empty($this->request->data)) {
+      $user = $this->User->findByUsername($this->request->data['User']['username']);
 
       if (!$user) {
-        Logger::warn("Authentication failed: Unknown username '{$this->data['User']['username']}'!");
+        Logger::warn("Authentication failed: Unknown username '{$this->request->data['User']['username']}'!");
         $this->Session->setFlash($failedText);
       } elseif ($this->User->isExpired($user)) {
         Logger::warn("User account of '{$user['User']['username']}' (id {$user['User']['id']}) is expired!");
-        $this->Session->setFlash(__("Sorry. Your account is expired!", true));
+        $this->Session->setFlash(__("Sorry. Your account is expired!"));
       } else {
         $user = $this->User->decrypt(&$user);
-        if ($user['User']['password'] == $this->data['User']['password']) {
+        if ($user['User']['password'] == $this->request->data['User']['password']) {
           $this->Session->renew();
-          $this->Session->activate();
           if (!$this->Session->check('User.id') || $this->Session->read('User.id') != $user['User']['id']) {
             Logger::info("Start new session for '{$user['User']['username']}' (id {$user['User']['id']})");
@@ -158 +157 @@
           } else {
             Logger::err("Could not write session information of user '{$user['User']['username']}' ({$user['User']['id']})");
-            $this->Session->setFlash(__("Sorry. Internal login procedure failed!", true));
+            $this->Session->setFlash(__("Sorry. Internal login procedure failed!"));
           }
         } else {
-          Logger::warn("Authentication failed: Incorrect password of username '{$this->data['User']['username']}'!");
+          Logger::warn("Authentication failed: Incorrect password of username '{$this->request->data['User']['username']}'!");
           $this->Session->setFlash($failedText);
         }
       }
-      unset($this->data['User']['password']);
+      unset($this->request->data['User']['password']);
     }
     $this->set('register', $this->Option->getValue($this->getUser(), 'user.register.enable', 0));
@@ -186 +185 @@
     $this->requireRole(ROLE_SYSOP, array('loginRedirect' => '/admin/users'));
 
-    $this->data = $this->paginate('User', array('User.role>='.ROLE_USER));
+    $this->request->data = $this->paginate('User', array('User.role>='.ROLE_USER));
   }
 
@@ -195 +194 @@
     $userId = $this->getUserId();
     $userRole = $this->getUserRole();
-    if ($userId == $id && $userRole == ROLE_ADMIN && $this->data['User']['role'] < ROLE_ADMIN) {
+    if ($userId == $id && $userRole == ROLE_ADMIN && $this->request->data['User']['role'] < ROLE_ADMIN) {
       $count = $this->User->find('count', array('conditions' => array('User.role >= '.ROLE_ADMIN)));
       if ($count == 1) {
         Logger::warn('Can not degrade last admin');
-        $this->Session->setFlash(__('Can not degrade last admin', true));
+        $this->Session->setFlash(__('Can not degrade last admin'));
         return false;
       }
@@ -209 +208 @@
   function _addAdminEditMenu($userId) {
     $subActions = array(
-      'password' => __("Password", true),
-      'path' => __("Local Paths", true));
-    $subItems = array('url' => array('admin' => true, 'action' => 'edit', $userId), 'title' => __('Edit', true), 'active' => true);
+      'password' => __("Password"),
+      'path' => __("Local Paths"));
+    $subItems = array('url' => array('admin' => true, 'action' => 'edit', $userId), 'title' => __('Edit'), 'active' => true);
     foreach ($subActions as $action => $title) {
       $subItems[] = array('url' => array('admin' => true, 'action' => $action, $userId), 'title' => $title, 'active' => ('admin_'.$action == $this->action));
@@ -223 +222 @@
 
     $id = intval($id);
-    if (!empty($this->data) && $this->_lastAdminCheck($id)) {
-      $this->data['User']['id'] = $id;
-
-      if ($this->User->save($this->data, true, array('email', 'expires', 'quota', 'firstname', 'lastname', 'role'))) {
-        Logger::debug("Data of user {$this->data['User']['id']} was updated");
-        $this->Session->setFlash(__('User data was updated', true));
+    if (!empty($this->request->data) && $this->_lastAdminCheck($id)) {
+      $this->request->data['User']['id'] = $id;
+
+      if ($this->User->save($this->request->data, true, array('email', 'expires', 'quota', 'firstname', 'lastname', 'role'))) {
+        Logger::debug("Data of user {$this->request->data['User']['id']} was updated");
+        $this->Session->setFlash(__('User data was updated'));
       } else {
         Logger::err("Could not save user data");
         Logger::debug($this->User->validationErrors);
-        $this->Session->setFlash(__('Could not be updated', true));
-      }
-    }
-
-    $this->data = $this->User->findById($id);
+        $this->Session->setFlash(__('Could not be updated'));
+      }
+    }
+
+    $this->request->data = $this->User->findById($id);
     $this->set('allowAdminRole', ($this->getUserRole() == ROLE_ADMIN) ? true : false);
 
@@ -246 +245 @@
 
     $id = intval($id);
-    if (!empty($this->data)) {
-      $this->data['User']['id'] = $id;
-
-      if ($this->User->save($this->data, true, array('password'))) {
-        Logger::debug("Data of user {$this->data['User']['id']} was updated");
-        $this->Session->setFlash(__('User data was updated', true));
+    if (!empty($this->request->data)) {
+      $this->request->data['User']['id'] = $id;
+
+      if ($this->User->save($this->request->data, true, array('password'))) {
+        Logger::debug("Data of user {$this->request->data['User']['id']} was updated");
+        $this->Session->setFlash(__('User data was updated'));
       } else {
         Logger::err("Could not save user data");
         Logger::debug($this->User->validationErrors);
-        $this->Session->setFlash(__('Could not be updated', true));
-      }
-    }
-
-    $this->data = $this->User->findById($id);
-    unset($this->data['User']['password']);
+        $this->Session->setFlash(__('Could not be updated'));
+      }
+    }
+
+    $this->request->data = $this->User->findById($id);
+    unset($this->request->data['User']['password']);
 
     $this->_addAdminEditMenu($id);
@@ -269 +268 @@
 
     $id = intval($id);
-    if (!empty($this->data)) {
-      $this->data['User']['id'] = $id;
-
-      $this->User->set($this->data);
-
-      if (!empty($this->data['Option']['path']['fspath'])) {
-        $fsroot = $this->data['Option']['path']['fspath'];
+    if (!empty($this->request->data)) {
+      $this->request->data['User']['id'] = $id;
+
+      $this->User->set($this->request->data);
+
+      if (!empty($this->request->data['Option']['path']['fspath'])) {
+        $fsroot = $this->request->data['Option']['path']['fspath'];
         $fsroot = Folder::slashTerm($fsroot);
 
         if (is_dir($fsroot) && is_readable($fsroot)) {
           $this->Option->addValue('path.fsroot[]', $fsroot, $id);
-          $this->Session->setFlash(sprintf(__("Directory '%s' was added", true), $fsroot));
+          $this->Session->setFlash(__("Directory '%s' was added", $fsroot));
           Logger::info("Add external directory '$fsroot' to user $id");
         } else {
-          $this->Session->setFlash(sprintf(__("Directory '%s' could not be read", true), $fsroot));
+          $this->Session->setFlash(__("Directory '%s' could not be read", $fsroot));
           Logger::err("Directory '$fsroot' could not be read");
         }
@@ -289 +288 @@
     }
 
-    $this->data = $this->User->findById($id);
-    unset($this->data['User']['password']);
-
-    $this->set('fsroots', $this->Option->buildTree($this->data, 'path.fsroot'));
+    $this->request->data = $this->User->findById($id);
+    unset($this->request->data['User']['password']);
+
+    $this->set('fsroots', $this->Option->buildTree($this->request->data, 'path.fsroot'));
     $this->_addAdminEditMenu($id);
   }
@@ -299 +298 @@
     $this->requireRole(ROLE_SYSOP, array('loginRedirect' => '/admin/users'));
 
-    if (!empty($this->data)) {
-      if ($this->User->hasAny(array('User.username' => $this->data['User']['username']))) {
-        $this->Session->setFlash(__('Username already exists, please choose a different name!', true));
+    if (!empty($this->request->data)) {
+      if ($this->User->hasAny(array('User.username' => $this->request->data['User']['username']))) {
+        $this->Session->setFlash(__('Username already exists, please choose a different name!'));
       } else {
-        $this->data['User']['role'] = ROLE_USER;
-        if ($this->User->save($this->data, true, array('username', 'password', 'role', 'email'))) {
-          Logger::info("New user {$this->data['User']['username']} was created");
-          $this->Session->setFlash(__('User was created', true));
+        $this->request->data['User']['role'] = ROLE_USER;
+        if ($this->User->save($this->request->data, true, array('username', 'password', 'role', 'email'))) {
+          Logger::info("New user {$this->request->data['User']['username']} was created");
+          $this->Session->setFlash(__('User was created'));
           $this->redirect('/admin/users/edit/'.$this->User->id);
         } else {
-          Logger::warn("Creation of user {$this->data['User']['username']} failed");
-          $this->Session->setFlash(__('Could not create user!', true));
+          Logger::warn("Creation of user {$this->request->data['User']['username']} failed");
+          $this->Session->setFlash(__('Could not create user!'));
         }
       }
@@ -322 +321 @@
     $user = $this->User->findById($id);
     if (!$user) {
-      $this->Session->setFlash(__("Could not delete user: user not found!", true));
+      $this->Session->setFlash(__("Could not delete user: user not found!"));
       $this->redirect('index');
     } else {
       $this->User->delete($id);
       Logger::notice("All data of user '{$user['User']['username']}' ($id) deleted");
-      $this->Session->setFlash(sprintf(__("User %s was deleted", true), $user['User']['username']));
+      $this->Session->setFlash(__("User %s was deleted", $user['User']['username']));
       $this->redirect('index');
     }
@@ -346 +345 @@
     $this->Option->delValue('path.fsroot[]', $fsroot, $id);
     Logger::info("Deleted external directory '$fsroot' from user $id");
-    $this->Session->setFlash(sprintf(__("Deleted external directory '%s'", true), $fsroot));
+    $this->Session->setFlash(__("Deleted external directory '%s'", $fsroot));
     $this->redirect("path/$id");
   }
@@ -353 +352 @@
     $this->requireRole(ROLE_SYSOP, array('loginRedirect' => '/admin/users'));
 
-    if (!empty($this->data)) {
-      if ($this->data['user']['register']['enable']) {
+    if (!empty($this->request->data)) {
+      if ($this->request->data['user']['register']['enable']) {
         $this->Option->setValue('user.register.enable', 1, 0);
       } else {
         $this->Option->setValue('user.register.enable', 0, 0);
       }
-      $quota = $this->__fromReadableSize($this->data['user']['register']['quota']);
+      $quota = $this->__fromReadableSize($this->request->data['user']['register']['quota']);
       $this->Option->setValue('user.register.quota', $quota, 0); 
-      $this->Session->setFlash(__("Options saved!", true));
-    }
-    $this->data = $this->Option->getTree($this->getUserId());
+      $this->Session->setFlash(__("Options saved!"));
+    }
+    $this->request->data = $this->Option->getTree($this->getUserId());
 
     // add default values
-    if (!isset($this->data['user']['register']['enable'])) {
-      $this->data['user']['register']['enable'] = 0;
-    }
-    if (!isset($this->data['user']['register']['quota'])) {
-      $this->data['user']['register']['quota'] = (float)100*1024*1024;
+    if (!isset($this->request->data['user']['register']['enable'])) {
+      $this->request->data['user']['register']['enable'] = 0;
+    }
+    if (!isset($this->request->data['user']['register']['quota'])) {
+      $this->request->data['user']['register']['quota'] = (float)100*1024*1024;
     }
     
@@ -377 +376 @@
   /** Password recovery */
   function password() {
-    if (!empty($this->data)) {
-      $user = $this->User->find(array(
-          'username' => $this->data['User']['username'], 
-          'email' => $this->data['User']['email']));
+    if (!empty($this->request->data)) {
+      $user = $this->User->find('first', array('conditions' => array(
+          'username' => $this->request->data['User']['username'], 
+          'email' => $this->request->data['User']['email'])));
       if (empty($user)) {
-        $this->Session->setFlash(__('No user with this email was found', true));
+        $this->Session->setFlash(__('No user with this email was found'));
         Logger::warn(sprintf("No user '%s' with email %s was found",
-            $this->data['User']['username'], $this->data['User']['email']));
+            $this->request->data['User']['username'], $this->request->data['User']['email']));
       } else {
         $this->Email->to = sprintf("%s %s <%s>", 
@@ -402 +401 @@
             $user['User']['id'],
             $user['User']['email']));
-          $this->Session->setFlash(__('Mail was sent!', true));
+          $this->Session->setFlash(__('Mail was sent!'));
         } else {
           Logger::err(sprintf("Could not send password mail to user '%s' (id %d) with address '%s'",
@@ -408 +407 @@
             $user['User']['id'],
             $user['User']['email']));
-          $this->Session->setFlash(__('Mail could not be sent: unknown error!', true));
+          $this->Session->setFlash(__('Mail could not be sent: unknown error!'));
         }
       }
@@ -423 +422 @@
     }
 
-    if (!empty($this->data)) {
-      if ($this->data['Captcha']['verification'] != $this->Session->read('user.register.captcha')) {
-        $this->Session->setFlash(__('Captcha verification failed', true));
+    if (!empty($this->request->data)) {
+      if ($this->request->data['Captcha']['verification'] != $this->Session->read('user.register.captcha')) {
+        $this->Session->setFlash(__('Captcha verification failed'));
         Logger::verbose("Captcha verification failed");
-      } elseif ($this->User->hasAny(array('User.username' => $this->data['User']['username']))) {
-        $this->Session->setFlash(__('Username already exists, please choose different name!', true));
-        Logger::info("Username already exists: {$this->data['User']['username']}");
+      } elseif ($this->User->hasAny(array('User.username' => $this->request->data['User']['username']))) {
+        $this->Session->setFlash(__('Username already exists, please choose different name!'));
+        Logger::info("Username already exists: {$this->request->data['User']['username']}");
       } else {
-        $user = $this->User->create($this->data);
+        $user = $this->User->create($this->request->data);
         if ($this->User->save($user['User'], true, array('id', 'username', 'password', 'email'))) {
-          Logger::info("New user {$this->data['User']['username']} was created");
+          Logger::info("New user {$this->request->data['User']['username']} was created");
           $this->_initRegisteredUser($this->User->getLastInsertID());
         } else {
-          Logger::err("Creation of user {$this->data['User']['username']} failed");
-          $this->Session->setFlash(__('Could not create user', true));
+          Logger::err("Creation of user {$this->request->data['User']['username']} failed");
+          $this->Session->setFlash(__('Could not create user'));
         }
       }
     }
-    unset($this->data['User']['password']);
-    unset($this->data['User']['confirm']);
-    unset($this->data['Captcha']['verification']);
+    unset($this->request->data['User']['password']);
+    unset($this->request->data['User']['confirm']);
+    unset($this->request->data['Captcha']['verification']);
     $this->layout = 'default';
   }
@@ -474 +473 @@
     // send confimation email
     if (!$this->_sendConfirmationEmail($user, $key)) {
-      $this->Session->setFlash(__("Could not send the confirmation email. Please contact the admin.", true));
-      return false;
-    }
-    $this->Session->setFlash(__("A confirmation email was sent to your email address", true));
+      $this->Session->setFlash(__("Could not send the confirmation email. Please contact the admin."));
+      return false;
+    }
+    $this->Session->setFlash(__("A confirmation email was sent to your email address"));
     $this->redirect("/users/confirm");
   }
@@ -489 +488 @@
     }
 
-    if (!$key && !empty($this->data)) {
+    if (!$key && !empty($this->request->data)) {
       // check user input
-      if (empty($this->data['User']['key'])) {
-        $this->Session->setFlash(__("Please enter the confirmation key", true));
+      if (empty($this->request->data['User']['key'])) {
+        $this->Session->setFlash(__("Please enter the confirmation key"));
       } else { 
-        $key = $this->data['User']['key']; 
+        $key = $this->request->data['User']['key']; 
       }
     }
@@ -507 +506 @@
   function _checkConfirmation($key) {
     // check key. Option [belongsTo] User: The user is bound to option
-    $user = $this->Option->find(array("Option.value" => $key));
+    $user = $this->Option->find('first', array('conditions' => array("Option.value" => $key)));
     if (!$user) {
       Logger::trace("Could not find confirmation key");
-      $this->Session->setFlash(__("Could not find confirmation key", true));
+      $this->Session->setFlash(__("Could not find confirmation key"));
       return false;
     } 
@@ -516 +515 @@
     if (!isset($user['User']['id'])) {
       Logger::err("Could not find the user for register confirmation");
-      $this->Session->setFlash(__("Internal error occured", true));
+      $this->Session->setFlash(__("Internal error occured"));
       return false;
     }
@@ -525 +524 @@
     $expires = strtotime($user['User']['expires']);
     if ($now - $expires > (14 * 24 * 3600 + 3600)) {
-      $this->Session->setFlash(__("Could not find confirmation key", true));
+      $this->Session->setFlash(__("Could not find confirmation key"));
       Logger::err("Registration confirmation is expired.");
       $this->User->delete($user['User']['id']);

Model/AppModel.php

@@ -232 +232 @@
     if ($this->data) {
       $data = $this->stripAlias();
-      $name = Inflector::underscore($name);
-      if (isset($data[$name])) {
-        return $data[$name];
+      $unserscore = Inflector::underscore($name);
+      if (isset($data[$unserscore])) {
+        return $data[$unserscore];
       }
     }

Model/MyFile.php

@@ -126 +126 @@
     $path = Folder::slashTerm(dirname($filename));
 
-    return $this->find(array("path" => $path, "file" => $file));
+    return $this->find('first', array('conditions' => array("path" => $path, "file" => $file)));
   }
 

View/Browser/folder.ctp

@@ -3 +3 @@
 <?php echo $this->Session->flash(); ?>
 
-<p><?php echo __("Location %s", $fileList->location($path)); ?></p>
+<p><?php echo __("Location %s", $this->FileList->location($path)); ?></p>
 
 <?php echo $this->Form->create(false, array('action' => 'folder/'.$path)); ?>

View/Browser/sync.ctp

@@ -7 +7 @@
 <p><?php echo __("Note:  In case you are using phTagr with external paths it is recommended to synchronize your images to store this important information within the media file.  After the synchronization these mata data could be read by other image programs or desktop search engines."); ?>
 
-<?php if ($this->data['action'] != 'run' && $this->data['unsynced'] > 0): ?>
-<p><?php echo __("You have %d unsynchronized media. Click %s to start the synchronization (this might take some time)", $this->data['unsynced'], $this->Html->link(__("sync"), 'sync/run')); ?></p>
+<?php if ($this->request->data['action'] != 'run' && $this->request->data['unsynced'] > 0): ?>
+<p><?php echo __("You have %d unsynchronized media. Click %s to start the synchronization (this might take some time)", $this->request->data['unsynced'], $this->Html->link(__("sync"), 'sync/run')); ?></p>
 <?php endif; ?>
 
-<?php if ($this->data['unsynced'] == 0): ?>
+<?php if ($this->request->data['unsynced'] == 0): ?>
 <div class="info"><?php echo __("All media are synchronized"); ?></div>
 <?php endif; ?>
 
-<?php if (count($this->data['errors'])): ?>
+<?php if (count($this->request->data['errors'])): ?>
 <div class="error"><?php echo __("Some files could not be updated with new metadata. Mainly this happens if the files are write protected. Please have a look to the log files for details."); ?></div>
 <?php endif; ?>
 
-<?php if ($this->data['action'] == 'run'): ?>
+<?php if ($this->request->data['action'] == 'run'): ?>
 <p><?php 
-  echo __("Synchronized %d media.", count($this->data['synced']));
-  if ($this->data['unsynced']) {
-    echo __(" %d media remains unsynced. Click %s to synchronize again", $this->data['unsynced'], $this->Html->link(__('sync', 'sync/run'))); 
+  echo __("Synchronized %d media.", count($this->request->data['synced']));
+  if ($this->request->data['unsynced']) {
+    echo __(" %d media remains unsynced. Click %s to synchronize again", $this->request->data['unsynced'], $this->Html->link(__('sync', 'sync/run'))); 
   }
 ?></p>

View/Browser/upload.ctp

@@ -4 +4 @@
 
 <?php if ($free > 0): ?>
-<p><?php echo __("You upload files to folder %s", $fileList->location($path)); ?></p>
+<p><?php echo __("You upload files to folder %s", $this->FileList->location($path)); ?></p>
 <p><?php echo __("You can upload maximal %s and %s at once", $this->Number->toReadableSize($free), $this->Number->toReadableSize($max)); ?></p>
 

View/Comments/index.ctp

@@ -4 +4 @@
 <?php if ($comments): ?>
 <div class="paginator"><div class="subpaginator">
-<?php echo $paginator->prev().' '.$paginator->numbers().' '.$paginator->next(); ?>
+<?php echo $this->Paginator->prev().' '.$this->Paginator->numbers().' '.$this->Paginator->next(); ?>
 </div></div>
 
@@ -13 +13 @@
 <div class="meta">
 <span class="from"><?php echo $comment['Comment']['name'] ?></span> said 
-<span class="date"><?php echo $time->relativeTime($comment['Comment']['date']); ?></span>
+<span class="date"><?php echo $this->Time->timeAgoInWords($comment['Comment']['date']); ?></span>
 </div><!-- comment meta -->
 
@@ -21 +21 @@
   $link = '/images/view/'.$comment['Media']['id'];
   echo '<div class="image">'.$this->Html->link($img, $link, array('escape' => false)).'</div>';?>
-<?php echo preg_replace('/\n/', '<br />', $text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?>
+<?php echo preg_replace('/\n/', '<br />', $this->Text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?>
 </div>
 </div><!-- comment -->
@@ -28 +28 @@
 
 <div class="paginator"><div class="subpaginator">
-<?php echo $paginator->prev().' '.$paginator->numbers().' '.$paginator->next(); ?>
+<?php echo $this->Paginator->prev().' '.$this->Paginator->numbers().' '.$this->Paginator->next(); ?>
 </div></div>
 

View/Comments/rss.ctp

@@ -10 +10 @@
 }
 
-echo $rss->items($this->data, 'getItem');
+echo $rss->items($this->request->data, 'getItem');
 ?>

View/Elements/Explorer/description.ctp

@@ -1 +1 @@
 <?php 
   $this->Search->initialize(); 
-  echo $this->element('explorer/date', array('media' => $media));
+  echo $this->element('Explorer/date', array('media' => $media));
   if (count($media['Tag'])) {
     echo $this->Html->tag('p', 

View/Elements/Explorer/media.ctp

@@ -62 +62 @@
 </div>
 <div class="p-explorer-media-description" id="<?php echo 'description-'.$media['Media']['id']; ?>">
-<?php echo $this->element('explorer/description', array('media' => $media)); ?>
+<?php echo $this->element('Explorer/description', array('media' => $media)); ?>
 </div>

View/Elements/Explorer/menu.ctp

@@ -1 +1 @@
 <?php
   $canWriteTag = $canWriteMeta = $canWriteCaption = $canWriteAcl = 0;
-  if (count($this->data)) {
-    $canWriteTag = max(Set::extract('/Media/canWriteTag', $this->data));
-    $canWriteMeta = max(Set::extract('/Media/canWriteMeta', $this->data));
-    $canWriteCaption = max(Set::extract('/Media/canWriteCaption', $this->data));
-    $canWriteAcl = max(Set::extract('/Media/canWriteAcl', $this->data));
+  if (count($this->request->data)) {
+    $canWriteTag = max(Set::extract('/Media/canWriteTag', $this->request->data));
+    $canWriteMeta = max(Set::extract('/Media/canWriteMeta', $this->request->data));
+    $canWriteCaption = max(Set::extract('/Media/canWriteCaption', $this->request->data));
+    $canWriteAcl = max(Set::extract('/Media/canWriteAcl', $this->request->data));
   }
 ?>
@@ -34 +34 @@
 <?php
   $user = $this->Search->getUser();
-  $tagUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'tag', array_unique(Set::extract('/Tag/name', $this->data)));
+  $tagUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'tag', array_unique(Set::extract('/Tag/name', $this->request->data)));
   ksort($tagUrls);
-  $categoryUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'category', array_unique(Set::extract('/Category/name', $this->data)));
+  $categoryUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'category', array_unique(Set::extract('/Category/name', $this->request->data)));
   ksort($categoryUrls);
-  $locationUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'location', array_unique(Set::extract('/Location/name', $this->data)));
+  $locationUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, $user, 'location', array_unique(Set::extract('/Location/name', $this->request->data)));
   ksort($locationUrls);
 
@@ -65 +65 @@
 <p><?php echo __('Users') . " "; ?>
 <?php
-  $userUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, false, 'user', array_unique(Set::extract('/User/username', $this->data)));
+  $userUrls = $this->ImageData->getAllExtendSearchUrls($crumbs, false, 'user', array_unique(Set::extract('/User/username', $this->request->data)));
   foreach ($userUrls as $name => $urls) {
     echo $this->ImageData->getExtendSearchLinks($urls, $name, ($name == $user)) . ' ';
@@ -99 +99 @@
   if ($canWriteTag) {
     echo $this->Form->input('Tag.names', array('label' => __('Tags'), 'after' => $this->Html->tag('div', __('E.g. newtag, -oldtag'), array('class' => 'description'))));
-    echo $autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true));
+    echo $this->Autocomplete->autoComplete('Tag.names', 'autocomplete/tag', array('split' => true));
   }
   if ($canWriteMeta) {
     echo $this->Form->input('Category.names', array('label' => __('Categories')));
-    echo $autocomplete->autoComplete('Category.names', 'autocomplete/category', array('split' => true));
+    echo $this->Autocomplete->autoComplete('Category.names', 'autocomplete/category', array('split' => true));
     echo $this->Form->input('Location.city', array('label' => __('City')));
-    echo $autocomplete->autoComplete('Location.city', 'autocomplete/city');
+    echo $this->Autocomplete->autoComplete('Location.city', 'autocomplete/city');
     echo $this->Form->input('Location.sublocation', array('label' => __('Sublocation')));
-    echo $autocomplete->autoComplete('Location.sublocation', 'autocomplete/sublocation');
+    echo $this->Autocomplete->autoComplete('Location.sublocation', 'autocomplete/sublocation');
     echo $this->Form->input('Location.state', array('label' => __('State')));
-    echo $autocomplete->autoComplete('Location.state', 'autocomplete/state');
+    echo $this->Autocomplete->autoComplete('Location.state', 'autocomplete/state');
     echo $this->Form->input('Location.country', array('label' => __('Country')));
-    echo $autocomplete->autoComplete('Location.country', 'autocomplete/country');
+    echo $this->Autocomplete->autoComplete('Location.country', 'autocomplete/country');
     echo $this->Form->input('Media.geo', array('label' => __('Geo data'), 'maxlength' => 32, 'after' => $this->Html->tag('div', __('latitude, longitude'), array('class' => 'description'))));
   }

View/Elements/comment.ctp

@@ -4 +4 @@
 ?>
 <div id="comments">
-<?php if (count($this->data['Comment'])): ?>
+<?php if (count($this->request->data['Comment'])): ?>
 <h3><?php echo __('Comments'); ?></h3>
 <?php $count = 0; ?>
-<?php foreach ($this->data['Comment'] as $key => $comment): ?>
+<?php foreach ($this->request->data['Comment'] as $key => $comment): ?>
 <?php if (!is_numeric($key)) continue; ?>
 <div class="comment <?php echo ($count++%2)?'even':'odd'; ?>">
@@ -16 +16 @@
     $name = $this->Html->link($comment['name'], $comment['url']);
   }  
-  $time = $this->Html->tag('span', $this->Time->relativeTime($comment['date']), array('class' => 'date'));
-  __("%s said %s", $name, $time);
+  $this->Time = $this->Html->tag('span', $this->Time->timeAgoInWords($comment['date']), array('class' => 'date'));
+  __("%s said %s", $name, $this->Time);
 ?>
 <?php
-  if ($this->data['Media']['isOwner'] || $comment['user_id'] == $userId) {
+  if ($this->request->data['Media']['isOwner'] || $comment['user_id'] == $userId) {
     echo $this->Html->link(__('(delete)'), '/comments/delete/'.$comment['id'].'/'.$this->SearchParams);
   }
@@ -37 +37 @@
 <fieldset>
 <?php
-  echo $this->Form->hidden('Media.id', array('value' => $this->data['Media']['id']));
+  echo $this->Form->hidden('Media.id', array('value' => $this->request->data['Media']['id']));
 ?>
 <?php 

View/Elements/footer.ctp

@@ -1 +1 @@
 <?php 
 global $TIME_START; 
-$time = microtime(true) - $TIME_START;
-__("%s Social Web Gallery %s in %.3fs. Layout based on %s, Icons by %s", '&copy; 2006-2010',  $this->Html->link('phtagr.org', 'http://www.phtagr.org'),  $time, $this->Html->link('YAML', 'http://www.yaml.de'), $this->Html->link('FamFamFam', 'http://www.famfamfam.com')); 
+$this->Time = microtime(true) - $TIME_START;
+__("%s Social Web Gallery %s in %.3fs. Layout based on %s, Icons by %s", '&copy; 2006-2010',  $this->Html->link('phtagr.org', 'http://www.phtagr.org'),  $this->Time, $this->Html->link('YAML', 'http://www.yaml.de'), $this->Html->link('FamFamFam', 'http://www.famfamfam.com')); 
 ?>

View/Elements/single_acl_form.ctp

@@ -1 +1 @@
 <?php
-  echo $this->ImageData->acl2select('Media.readPreview', $this->data, ACL_READ_PREVIEW, ACL_READ_MASK, array('label' => __("Who can view image?")));
-  echo $this->ImageData->acl2select('Media.readOriginal', $this->data, ACL_READ_ORIGINAL, ACL_READ_MASK, array('label' => __("Who can download the image?")));
-  echo $this->ImageData->acl2select('Media.writeTag', $this->data, ACL_WRITE_TAG, ACL_WRITE_MASK, array('label' => __("Who can edit the tags?")));
-  echo $this->ImageData->acl2select('Media.writeMeta', $this->data, ACL_WRITE_META, ACL_WRITE_MASK, array('label' => __("Who can edit all meta data?")));
-  echo $this->Form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => $this->data['Media']['group_id'], 'label' => __('Group')));
+  echo $this->ImageData->acl2select('Media.readPreview', $this->request->data, ACL_READ_PREVIEW, ACL_READ_MASK, array('label' => __("Who can view image?")));
+  echo $this->ImageData->acl2select('Media.readOriginal', $this->request->data, ACL_READ_ORIGINAL, ACL_READ_MASK, array('label' => __("Who can download the image?")));
+  echo $this->ImageData->acl2select('Media.writeTag', $this->request->data, ACL_WRITE_TAG, ACL_WRITE_MASK, array('label' => __("Who can edit the tags?")));
+  echo $this->ImageData->acl2select('Media.writeMeta', $this->request->data, ACL_WRITE_META, ACL_WRITE_MASK, array('label' => __("Who can edit all meta data?")));
+  echo $this->Form->input('Group.id', array('type' => 'select', 'options' => $groups, 'selected' => $this->request->data['Media']['group_id'], 'label' => __('Group')));
 ?>

View/Elements/single_meta_form.ctp

@@ -1 +1 @@
 <?php
-  if ($this->data['Media']['canWriteTag']) {
-    echo $this->Form->input('Tag.names', array('label' => __('Tags'), 'value' => join(', ', Set::extract('/Tag/name', $this->data))));
-    echo $autocomplete->autoComplete('Tag.names', '/explorer/autocomplete/tag', array('split' => true));
+  if ($this->request->data['Media']['canWriteTag']) {
+    echo $this->Form->input('Tag.names', array('label' => __('Tags'), 'value' => join(', ', Set::extract('/Tag/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Tag.names', '/explorer/autocomplete/tag', array('split' => true));
   }
-  if ($this->data['Media']['canWriteMeta']) {
-    echo $this->Form->input('Category.names', array('label' => __('Categories'), 'value' => join(', ', Set::extract('/Category/name', $this->data))));
-    echo $autocomplete->autoComplete('Category.names', '/explorer/autocomplete/category', array('split' => true));
-    echo $this->Form->input('Location.city', array('label' => __('City'), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $this->data))));
-    echo $autocomplete->autoComplete('Locations.city', '/explorer/autocomplete/city');
-    echo $this->Form->input('Location.sublocation', array('label' => __('Sublocation'), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $this->data))));
-    echo $autocomplete->autoComplete('Location.sublocation', '/explorer/autocomplete/sublocation');
-    echo $this->Form->input('Location.state', array('label' => __('State'), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $this->data))));
-    echo $autocomplete->autoComplete('Location.state', '/explorer/autocomplete/state');
-    echo $this->Form->input('Location.country', array('label' => __('Country'), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $this->data))));
-    echo $autocomplete->autoComplete('Location.country', '/explorer/autocomplete/country');
+  if ($this->request->data['Media']['canWriteMeta']) {
+    echo $this->Form->input('Category.names', array('label' => __('Categories'), 'value' => join(', ', Set::extract('/Category/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Category.names', '/explorer/autocomplete/category', array('split' => true));
+    echo $this->Form->input('Location.city', array('label' => __('City'), 'value' => join('', Set::extract('/Location[type='.LOCATION_CITY.']/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Locations.city', '/explorer/autocomplete/city');
+    echo $this->Form->input('Location.sublocation', array('label' => __('Sublocation'), 'value' => join('', Set::extract('/Location[type='.LOCATION_SUBLOCATION.']/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Location.sublocation', '/explorer/autocomplete/sublocation');
+    echo $this->Form->input('Location.state', array('label' => __('State'), 'value' => join('', Set::extract('/Location[type='.LOCATION_STATE.']/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Location.state', '/explorer/autocomplete/state');
+    echo $this->Form->input('Location.country', array('label' => __('Country'), 'value' => join('', Set::extract('/Location[type='.LOCATION_COUNTRY.']/name', $this->request->data))));
+    echo $this->Autocomplete->autoComplete('Location.country', '/explorer/autocomplete/country');
     $geo = "";
-    if (isset($this->data['Media']['latitude']) && isset($this->data['Media']['longitude'])) {
-      $geo = $this->data['Media']['latitude'] . ', ' . $this->data['Media']['longitude'];
+    if (isset($this->request->data['Media']['latitude']) && isset($this->request->data['Media']['longitude'])) {
+      $geo = $this->request->data['Media']['latitude'] . ', ' . $this->request->data['Media']['longitude'];
     }
     echo $this->Form->input('Media.geo', array('label' => __('Geo data'), 'value' => $geo, 'maxlength' => 32));
   }
-  if ($this->data['Media']['canWriteCaption']) {
+  if ($this->request->data['Media']['canWriteCaption']) {
   echo $this->Form->input('Media.date', array('type' => 'text', 'after' => $this->Html->tag('div', __('E.g. 2008-08-07 15:30'), array('class' => 'description'))));
   echo $this->Form->input('Media.name', array('type' => 'text'));

View/Explorer/autocomplete.ctp

@@ -1 +1 @@
 <ul>
-<?php foreach($this->data as $name): ?>
+<?php foreach($this->request->data as $name): ?>
   <li><?php echo h($name); ?></li>
 <?php endforeach; ?>

View/Explorer/editacl.ctp

@@ -1 +1 @@
 <?php 
-  $mediaId = $this->data['Media']['id'];
+  $mediaId = $this->request->data['Media']['id'];
   $crumbUrl = '/'.$this->Breadcrumb->params($crumbs);
   echo $this->Form->create(null, array('url' => 'saveacl/'.$mediaId.$crumbUrl, 'id' => 'form-acl-'.$mediaId));

View/Explorer/editmeta.ctp

@@ -1 +1 @@
 <?php 
-  $mediaId = $this->data['Media']['id'];
+  $mediaId = $this->request->data['Media']['id'];
   $crumbUrl = '/'.$this->Breadcrumb->params($crumbs);
   echo $this->Form->create(null, array('url' => 'savemeta/'.$mediaId.$crumbUrl, 'id' => 'form-meta-'.$mediaId)); 

View/Explorer/index.ctp

@@ -32 +32 @@
             buttons: {
               ':SAVE': function() {
-                var $this->Form = $('#form-meta-' + id);
-                $.post($this->Form.attr('action'), $this->Form.serialize(), function(data) {
+                var $form = $('#form-meta-' + id);
+                $.post($form.attr('action'), $form.serialize(), function(data) {
                   $('#media-' + id).html(data);
                   $('#media-' + id).mediaAction();
@@ -59 +59 @@
             buttons: {
               ':SAVE': function() {
-                var $this->Form = $('#form-acl-' + id);
-                $.post($this->Form.attr('action'), $this->Form.serialize(), function(data) {
+                var $form = $('#form-acl-' + id);
+                $.post($form.attr('action'), $form.serialize(), function(data) {
                   $('#media-' + id).html(data);
                   $('#media-' + id).mediaAction();
@@ -178 +178 @@
 <div class="p-explorer-media-list">
 <?php
-$canWriteTag = count($this->data) ? max(Set::extract('/Media/canWriteTag', $this->data)) : 0;
+$canWriteTag = count($this->request->data) ? max(Set::extract('/Media/canWriteTag', $this->request->data)) : 0;
 $index = 0;
 $pos = ($this->Search->getPage(1)-1) * $this->Search->getShow(12) + 1;
 
 echo '<div class="row">';
-foreach ($this->data as $media) {
+foreach ($this->request->data as $media) {
   $editable = $media['Media']['canWriteTag'] ? 'editable' : '';
   $cell = "cell" . ($index %4);

View/Explorer/media.ctp

@@ -21 +21 @@
 ?>
   <atom:link rel="self" href="<?php echo Router::url($this->Search->getUri(), true); ?>" />
-<?php if ($navigator->hasPrev()): ?>
+<?php if ($this->Navigator->hasPrev()): ?>
   <atom:link rel="previous" href="<?php echo Router::url($this->Search->getUri(false, array('page' => $this->Search->getPage(1) - 1)), true); ?>" />
 <?php endif; ?>
-<?php if ($navigator->hasNext()): ?>
+<?php if ($this->Navigator->hasNext()): ?>
   <atom:link rel="next" href="<?php echo Router::url($this->Search->getUri(false, array('page' => $this->Search->getPage(1) + 1)), true); ?>" />
 <?php endif; ?>
 <?php 
   $offset = $this->Search->getShow() * ($this->Search->getPage(1) - 1) + 1;
-  foreach ($this->data as $media): ?>
+  foreach ($this->request->data as $media): ?>
   <item>
     <title><?php echo $media['Media']['name']." by ".$media['User']['username']; ?></title>

View/Explorer/points.ctp

@@ -1 +1 @@
 <markers>
-<?php foreach ($this->data as $media): ?>
+<?php foreach ($this->request->data as $media): ?>
   <marker id="<?php echo $media['Media']['id']; ?>" lat="<?php echo $media['Media']['latitude']; ?>" lng="<?php echo $media['Media']['longitude']; ?>" >
     <name><?php echo h($media['Media']['name']); ?></name>

View/Explorer/quicksearch.ctp

@@ -7 +7 @@
 $cell=0;
 
-if (!count($this->data)): ?>
+if (!count($this->request->data)): ?>
 <div class="info">
 <?php echo __("Sorry, nothing was found for %s", h($quicksearch)); ?>
@@ -20 +20 @@
 
 <?php 
-  foreach($this->data as $media) {
+  foreach($this->request->data as $media) {
     echo $this->ImageData->mediaLink($media, 'mini').' ';
   }
@@ -27 +27 @@
 
 <?php
-  $tags = Set::extract('/Tag/name', $this->data);
+  $tags = Set::extract('/Tag/name', $this->request->data);
   if (count($tags)) {
     echo '<p>' . __('See more results of tag') .  ': ';
@@ -38 +38 @@
   }
 
-  $categories = Set::extract('/Category/name', $this->data);
+  $categories = Set::extract('/Category/name', $this->request->data);
   if (count($categories)) {
     echo '<p>' . __('See more results of category') .  ': ';
@@ -49 +49 @@
   }
 
-  $locations = Set::extract('/Location/name', $this->data);
+  $locations = Set::extract('/Location/name', $this->request->data);
   if (count($locations)) {
     echo '<p>' . __('See more results of location') .  ': ';

View/Explorer/rss.ctp

@@ -10 +10 @@
 }
 
-echo $rss->items($this->data, 'getItem');
+echo $rss->items($this->request->data, 'getItem');
 ?>

View/Explorer/updatemeta.ctp

@@ -3 +3 @@
   $pos = $this->Search->getPos();
   $index = 0;
-  echo $this->element('explorer/media', array('media' => $this->data, 'index' => $index, 'pos' => $pos)); 
+  echo $this->element('explorer/media', array('media' => $this->request->data, 'index' => $index, 'pos' => $pos)); 
 ?>

View/Groups/autocomplete.ctp

@@ -1 @@
-<?php debug($this->data); ?>
+<?php debug($this->request->data); ?>
 <ul>
-<?php foreach($this->data as $user): ?>
+<?php foreach($this->request->data as $user): ?>
   <li><?php echo $user['User']['username']; ?></li>
 <?php endforeach; ?>

View/Groups/create.ctp

@@ -8 +8 @@
 <?php
   echo $this->Form->input('Group.name', array('label' => __('Name')));
-  echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'blob'));
+  echo $this->Form->input('Group.description', array('label' => __('Description'), 'type' => 'text'));
   echo $this->Form->input('Group.is_hidden', array('label' => __('This group is hidden'), 'type' => 'checkbox'));
   echo $this->Form->input('Group.is_moderated', array('label' => __('New group members are moderated'), 'type' => 'checkbox'));

View/Groups/dashboard_create.ctp

@@ -16 +16 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -36 +36 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -56 +56 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -76 +76 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -96 +96 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -116 +116 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>

View/Groups/dashboard_index.ctp

@@ -4 +4 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -12 +12 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -20 +20 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -28 +28 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -36 +36 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -44 +44 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>

View/Groups/dashboard_manage.ctp

@@ -13 +13 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -28 +28 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -45 +45 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -60 +60 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -77 +77 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -92 +92 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -109 +109 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -124 +124 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -141 +141 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -156 +156 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -173 +173 @@
 
 <?php 
-$allgroup_names = Set::extract('/Member/name', $this->data);
+$allgroup_names = Set::extract('/Member/name', $this->request->data);
 sort($allgroup_names);
 $cells = array();
@@ -188 +188 @@
 
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>

View/Groups/dashboard_search.ctp

@@ -24 +24 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -52 +52 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -80 +80 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -108 +108 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -136 +136 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>
@@ -164 +164 @@
 </ul>
 <?php
-debug($this->data);
+debug($this->request->data);
 
 ?>

View/Groups/edit.ctp

@@ -1 @@
-<h1><?php echo __('Group: %s', $this->data['Group']['name']); ?></h1>
+<h1><?php echo __('Group: %s', $this->request->data['Group']['name']); ?></h1>
 
 <?php echo $this->Session->flash() ?>
 
-<?php echo $this->Form->create(null, array('action' => "edit/{$this->data['Group']['name']}")); ?>
+<?php echo $this->Form->create(null, array('action' => "edit/{$this->request->data['Group']['name']}")); ?>
 
 <fieldset><legend><?php echo __('Edit Group'); ?></legend>

View/Groups/index.ctp

@@ -3 +3 @@
 <?php echo $this->Session->flash(); ?>
 
-<?php if (!empty($this->data)): ?>
+<?php if (!empty($this->request->data)): ?>
 <table class="default">
 <thead>
@@ -24 +24 @@
   $isAdmin = $currentUser['User']['role'] >= ROLE_ADMIN;
 
-  foreach($this->data as $group) {
+  foreach($this->request->data as $group) {
     $actions = array();
     if ($currentUser['User']['id'] != $group['Group']['user_id']) {
@@ -50 +50 @@
       $this->Html->link($group['Group']['name'], "view/{$group['Group']['name']}", array('title' => $group['Group']['description'])),
       $this->Html->link($group['User']['username'], "/users/view/{$group['User']['username']}"),
-      $text->truncate($group['Group']['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
+      $this->Text->truncate($group['Group']['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
       count($group['Member']),
       $this->Html->tag('div', implode(' ', $actions), array('class' => 'actionlist'))

View/Groups/listmembers.ctp

@@ -1 @@
-<h1><?php echo __('Group %s', $this->data['Group']['name']); ?></h1>
+<h1><?php echo __('Group %s', $this->request->data['Group']['name']); ?></h1>
 
 <?php echo $this->Session->flash() ?>
@@ -10 +10 @@
     __('Member'),
     );
-  if ($this->data['Group']['is_admin']) {
+  if ($this->request->data['Group']['is_admin']) {
     $headers[] = __('Action');
   }
@@ -20 +20 @@
 <?php 
   $cells = array();
-  foreach ($this->data['Member'] as $member) {
+  foreach ($this->request->data['Member'] as $member) {
     $actions = array();
-    if ($this->data['Group']['is_admin']) {
+    if ($this->request->data['Group']['is_admin']) {
       $actions[] = $this->Html->link(
         $this->Html->image('icons/delete.png', 
@@ -29 +29 @@
             'title' => __("Unsubscribe '%s'", $member['username'])
           )
-        ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false));
+        ), "deleteMember/{$this->request->data['Group']['name']}/{$member['username']}", array('escape' => false));
     }
     $row = array(

View/Groups/view.ctp

@@ -1 @@
-<h1><?php echo __('Group %s', $this->data['Group']['name']); ?></h1>
+<h1><?php echo __('Group %s', $this->request->data['Group']['name']); ?></h1>
 
 <?php echo $this->Session->flash() ?>
@@ -8 +8 @@
 
 <p><?php 
-  if (empty($this->data['Group']['description'])) {
+  if (empty($this->request->data['Group']['description'])) {
     __("This group has no description");
   } else {
-    echo h($this->data['Group']['description']); 
+    echo h($this->request->data['Group']['description']); 
   } ?></p>
 <p><?php
-  __("The group is owned by user %s and has %d media in total.", $this->Html->link($this->data['User']['username'], "/users/view/{$this->data['User']['username']}"), $mediaCount);
-  if ($this->data['Group']['is_admin']) {
-    echo ' ' . $this->Html->link(__('Edit'), "edit/{$this->data['Group']['name']}");
+  __("The group is owned by user %s and has %d media in total.", $this->Html->link($this->request->data['User']['username'], "/users/view/{$this->request->data['User']['username']}"), $mediaCount);
+  if ($this->request->data['Group']['is_admin']) {
+    echo ' ' . $this->Html->link(__('Edit'), "edit/{$this->request->data['Group']['name']}");
   }
 ?></p>
@@ -24 +24 @@
   $iconYes = $this->Html->image('icons/accept.png', array('alt' => '+', 'title' => '+')) . ' ';
   $iconNo = $this->Html->image('icons/delete.png', array('alt' => '-', 'title' => '-')) . ' ';
-  if ($this->data['Group']['is_hidden']) {
+  if ($this->request->data['Group']['is_hidden']) {
     echo $this->Html->tag('li', $iconNo . __("The group is hidden"));
   } else {
     echo $this->Html->tag('li', $iconYes . __("The group is shown with the media"));
   }
-  if ($this->data['Group']['is_moderated']) {
+  if ($this->request->data['Group']['is_moderated']) {
     echo $this->Html->tag('li', $iconNo . __("The group subscription requires a confirmation"));
   } else {
     echo $this->Html->tag('li', $iconYes . __("The group subscription is free and does not need a confirmation"));
   }
-  if ($this->data['Group']['is_shared']) {
+  if ($this->request->data['Group']['is_shared']) {
     echo $this->Html->tag('li', $iconYes . __("This group is shared and can be used by other members"));
   } else {
@@ -49 +49 @@
     __('Member'),
     );
-  if ($this->data['Group']['is_admin']) {
+  if ($this->request->data['Group']['is_admin']) {
     $headers[] = __('Action');
   }
@@ -59 +59 @@
 <?php 
   $cells = array();
-  foreach ($this->data['Member'] as $member) {
+  foreach ($this->request->data['Member'] as $member) {
     $actions = array();
-    if ($this->data['Group']['is_admin']) {
+    if ($this->request->data['Group']['is_admin']) {
       $actions[] = $this->Html->link(
         $this->Html->image('icons/delete.png', 
@@ -68 +68 @@
             'title' => __("Unsubscribe '%s'", $member['username'])
           )
-        ), "deleteMember/{$this->data['Group']['name']}/{$member['username']}", array('escape' => false));
+        ), "deleteMember/{$this->request->data['Group']['name']}/{$member['username']}", array('escape' => false));
     }
     $row = array(
@@ -84 +84 @@
 
 <?php 
-  if ($this->data['Group']['is_admin']) {
+  if ($this->request->data['Group']['is_admin']) {
     echo $this->Form->create('Group', array('action' => 'addMember'));
     echo "<fieldset><legend>" . __("Add user") . "</legend>";
@@ -95 +95 @@
   } else {
     $userId = $this->Session->read('User.id');
-    $memberIds = Set::extract('/Member/id', $this->data);
+    $memberIds = Set::extract('/Member/id', $this->request->data);
     if (in_array($userId, $memberIds)) {
-      echo $this->Html->link(__('Unsubscribe'), "unsubscribe/{$this->data['Group']['name']}"); 
+      echo $this->Html->link(__('Unsubscribe'), "unsubscribe/{$this->request->data['Group']['name']}"); 
     } else {
-      echo $this->Html->link(__('Subscribe'), "subscribe/{$this->data['Group']['name']}"); 
+      echo $this->Html->link(__('Subscribe'), "subscribe/{$this->request->data['Group']['name']}"); 
     }
   }
@@ -111 +111 @@
   }
 ?></p>
-<p><?php echo __('See all media of the group %s', $this->Html->link($this->data['Group']['name'], "/explorer/group/{$this->data['Group']['name']}")); ?></p>
+<p><?php echo __('See all media of the group %s', $this->Html->link($this->request->data['Group']['name'], "/explorer/group/{$this->request->data['Group']['name']}")); ?></p>
 <?php endif; ?>

View/Guests/autocomplete.ctp

@@ -1 +1 @@
 <ul>
-<?php foreach($this->data as $group): ?>
+<?php foreach($this->request->data as $group): ?>
   <li><?php echo $group['Group']['name']; ?></li>
 <?php endforeach; ?>

View/Guests/edit.ctp

@@ -1 @@
-<h1><?php echo __('Guest: %s', $this->data['Guest']['username']); ?></h1>
+<h1><?php echo __('Guest: %s', $this->request->data['Guest']['username']); ?></h1>
 
 <?php echo $this->Session->flash(); ?>
 
-<?php echo $this->Form->create(null, array('action' => 'edit/'.$this->data['Guest']['id']));?>
+<?php echo $this->Form->create(null, array('action' => 'edit/'.$this->request->data['Guest']['id']));?>
 <fieldset><legend><?php echo __('Guest'); ?></legend>
 <?php
   echo $this->Form->input('Guest.email', array('label' => __('Email')));
   echo $this->Form->input('Guest.expires', array('type' => 'text', 'label' => __('Expires')));
-  echo $this->Form->input('Guest.webdav', array('type' => 'checkbox', 'checked' => ($this->data['Guest']['quota'] > 0 ? 'checked' : ''), 'label' => __('Enable WebDAV access')));
+  echo $this->Form->input('Guest.webdav', array('type' => 'checkbox', 'checked' => ($this->request->data['Guest']['quota'] > 0 ? 'checked' : ''), 'label' => __('Enable WebDAV access')));
 ?>
 </fieldset>
@@ -24 +24 @@
     3 => __('Name and captcha') 
     );
-  $select = $this->data['Comment']['auth'];
+  $select = $this->request->data['Comment']['auth'];
   echo '<div class="input select">';
   echo $this->Form->label(null, __('Authentication'));
-  echo $this->Form->select('Comment.auth', $options, $select, array('empty' => false));
+  echo $this->Form->select('Comment.auth', $options, array('empty' => false, 'value' => $select));
   echo '</div>';
 ?>
@@ -34 +34 @@
 </form>
 
-<?php if(count($this->data['Member'])): ?>
+<?php if(count($this->request->data['Member'])): ?>
 <h2><?php echo __('Group List'); ?></h2>
 <table class="default">
@@ -50 +50 @@
 <?php 
   $cells = array();
-  foreach($this->data['Member'] as $group) {
-    $delConfirm = __("Do you really want to delete the group '%s' from this guest '%s'?", $group['name'], $this->data['Guest']['username']);
+  foreach($this->request->data['Member'] as $group) {
+    $delConfirm = __("Do you really want to delete the group '%s' from this guest '%s'?", $group['name'], $this->request->data['Guest']['username']);
     $cells[] = array(
       $this->Html->link($group['name'], '/groups/view/'.$group['name']),
       $this->Html->link( 
         $this->Html->image('icons/delete.png', array('alt' => 'Delete', 'title' => 'Delete')), 
-        '/guests/deleteGroup/'.$this->data['Guest']['id'].'/'.$group['id'], array('escape' => false), $delConfirm)
+        '/guests/deleteGroup/'.$this->request->data['Guest']['id'].'/'.$group['id'], array('escape' => false), $delConfirm)
     );
   }
@@ -67 +67 @@
 <?php endif; ?>
 
-<?php echo $this->Form->create(null, array('action' => 'addGroup/'.$this->data['Guest']['id']));?>
+<?php echo $this->Form->create(null, array('action' => 'addGroup/'.$this->request->data['Guest']['id']));?>
 <fieldset><legend><?php echo __('Group Assignements'); ?></legend>
-<div class="input"><label><?php echo __('Group'); ?></label>
-<?php echo $ajax->autocomplete('Group.name', '/guests/autocomplete'); ?></div>
+  <?php echo $this->Form->input('Group.name'); ?>
+  <?php echo $this->Autocomplete->autoComplete('Group.name', '/guests/autocomplete'); ?>
 </fieldset>
 <?php echo $this->Form->submit(__('Add Group')); ?>

View/Guests/index.ctp

@@ -3 +3 @@
 <?php echo $this->Session->flash(); ?>
 
-<?php if (!empty($this->data)): ?>
+<?php if (!empty($this->request->data)): ?>
 <table class="default">
 <thead>
@@ -14 +14 @@
 
 <tbody>
-<?php $row=0; foreach($this->data as $guest): ?>
+<?php $row=0; foreach($this->request->data as $guest): ?>
   <tr class="<?php echo ($row++%2)?"even":"odd";?>">
     <td><?php echo $this->Html->link($guest['Guest']['username'], 'edit/'.$guest['Guest']['id']); ?></td>
@@ -38 +38 @@
 
 <?php
-//debug($this->data);
+//debug($this->request->data);
 ?>

View/Guests/links.ctp

@@ -12 +12 @@
 
 <?php
-  $myMedia = Router::url('/explorer/user/'.$this->data['Guest']['username'].'/key:'.$this->data['Guest']['key'], true);
+  $myMedia = Router::url('/explorer/user/'.$this->request->data['Guest']['username'].'/key:'.$this->request->data['Guest']['key'], true);
 ?>
 <ul>
-  <li><?php echo __('My Media of Guest %s (Link %s)', $this->Html->link($this->data['Guest']['username'], $myMedia, '<code>' . $myMedia . '</code>'); ?></li>
+  <li><?php echo __('My Media of Guest %s (Link %s)', $this->Html->link($this->request->data['Guest']['username'], $myMedia), '<code>'. $myMedia . '</code>'); ?></li>
 </ul>
 
@@ -23 +23 @@
 <p><?php echo __('Following links provide a authenticated RSS and Media RSS links.'); ?></p>
 <?php
-  $recentMedia = Router::url('/explorer/rss/key:'.$this->data['Guest']['key'], true);
-  $recentComments = Router::url('/comments/rss/key:'.$this->data['Guest']['key'], true);
-  $mediaRss = Router::url('/explorer/media/key:'.$this->data['Guest']['key'].'/media.rss', true);
-  $myMediaMediaRss = Router::url('/explorer/media/user:'.$this->data['Guest']['username'].'/key:'.$this->data['Guest']['key'].'/media.rss', true);
+  $recentMedia = Router::url('/explorer/rss/key:'.$this->request->data['Guest']['key'], true);
+  $recentComments = Router::url('/comments/rss/key:'.$this->request->data['Guest']['key'], true);
+  $mediaRss = Router::url('/explorer/media/key:'.$this->request->data['Guest']['key'].'/media.rss', true);
+  $myMediaMediaRss = Router::url('/explorer/media/user:'.$this->request->data['Guest']['username'].'/key:'.$this->request->data['Guest']['key'].'/media.rss', true);
 ?>
 <ul>
@@ -35 +35 @@
 </ul>
 
-<p><?php echo __('Click %s to renew the authentication key. All previous links become invalid.', $this->Html->link(__('renew key'), 'links/'.$this->data['Guest']['id'].'/renew')); ?></p>
+<p><?php echo __('Click %s to renew the authentication key. All previous links become invalid.', $this->Html->link(__('renew key'), 'links/'.$this->request->data['Guest']['id'].'/renew')); ?></p>

View/Helper/ExplorerMenuHelper.php

@@ -33 +33 @@
   function _countAssociation($association) {
     $result = array();
-    if (isset($this->data['Media'])) {
-      $data = array($this->data);
+    if (isset($this->request->data['Media'])) {
+      $data = array($this->request->data);
     } else {
-      $data =& $this->data;
+      $data =& $this->request->data;
     }
     if (!$data) {
@@ -199 +199 @@
   function getMainMenu() {
     $out = '';
-    $data = $this->data;
+    $data = $this->request->data;
     $this->Search->initialize();
     $items = array();

View/Helper/FlowplayerHelper.php

@@ -35 +35 @@
   /** Creates the link container for the flowplayer */
   function link($media) {
-    list($width, $height) = $this->ImageData->getimagesize($this->data, OUTPUT_SIZE_VIDEO);
+    list($width, $height) = $this->ImageData->getimagesize($this->request->data, OUTPUT_SIZE_VIDEO);
     $height += 24;
     $id = $media['Media']['id'];

View/Helper/ImageDataHelper.php

@@ -26 +26 @@
 class ImageDataHelper extends AppHelper {
 
-  var $helpers = array('Session', 'Ajax', 'Html', 'Form', 'Search', 'Option', 'Breadcrumb');
+  var $helpers = array('Session', 'Html', 'Form', 'Search', 'Option', 'Breadcrumb');
 
   var $Sanitize = null;
@@ -538 +538 @@
     }
 
+    /*
     if ($data['Media']['canWriteTag']) {
       $output .= ' '.$this->Ajax->link(
@@ -552 +553 @@
       }
     }
+    */
     return $cells;
   }

View/Helper/SearchHelper.php

@@ -152 +152 @@
     $this->_addParams(&$data, $add);
     $this->_delParams(&$data, $del);
+    if (!$data) {
+      return '';
+    }
     ksort($data);
 

View/Images/view.ctp

@@ -5 +5 @@
 <span></span>
 <?php 
-  if (($this->data['Media']['type'] & MEDIA_TYPE_VIDEO) > 0) {
-    echo $flowplayer->video($this->data);
+  if (($this->request->data['Media']['type'] & MEDIA_TYPE_VIDEO) > 0) {
+    echo $flowplayer->video($this->request->data);
   } else {
-    //$size = $this->ImageData->getimagesize($this->data, OUTPUT_SIZE_PREVIEW);
-    $size = $this->ImageData->getimagesize($this->data, 960);
-    $src = Router::url("/media/preview/".$this->data['Media']['id']);
-    $img = $this->Html->tag('img', null, array('src' => $src, 'width' => $size[0], 'height' => $size[1], 'alt' => $this->data['Media']['name']));
-    if ($navigator->hasNextMedia()) {
-      echo $this->Html->link($img, $navigator->getNextMediaUrl(), array('escape' => false));
+    //$size = $this->ImageData->getimagesize($this->request->data, OUTPUT_SIZE_PREVIEW);
+    $size = $this->ImageData->getimagesize($this->request->data, 960);
+    $src = Router::url("/media/preview/".$this->request->data['Media']['id']);
+    $img = $this->Html->tag('img', null, array('src' => $src, 'width' => $size[0], 'height' => $size[1], 'alt' => $this->request->data['Media']['name']));
+    if ($this->Navigator->hasNextMedia()) {
+      echo $this->Html->link($img, $this->Navigator->getNextMediaUrl(), array('escape' => false));
     } else {
       echo $img;
@@ -21 +21 @@
 </div>
 <div class="navigator">
-<div class="up"><div class="sub"><?php echo $navigator->up(); ?></div></div>
-<?php if ($navigator->hasPrevMedia()): ?>
-<div class="prev"><div class="sub"><?php echo $navigator->prevMedia(); ?></div></div>
+<div class="up"><div class="sub"><?php echo $this->Navigator->up(); ?></div></div>
+<?php if ($this->Navigator->hasPrevMedia()): ?>
+<div class="prev"><div class="sub"><?php echo $this->Navigator->prevMedia(); ?></div></div>
 <?php endif; ?>
-<?php if ($navigator->hasNextMedia()): ?>
-<div class="next"><div class="sub"><?php echo $navigator->nextMedia(); ?></div></div>
+<?php if ($this->Navigator->hasNextMedia()): ?>
+<div class="next"><div class="sub"><?php echo $this->Navigator->nextMedia(); ?></div></div>
 <?php endif; ?>
 </div>
@@ -34 +34 @@
 <?php
   $items = array(__("General"), __("Media Details"));
-  if ($map->hasApi() && $map->hasMediaGeo($this->data)) {
+  if ($this->Map->hasApi() && $this->Map->hasMediaGeo($this->request->data)) {
     $items['map'] = __("Map");
   }
-  if ($this->data['Media']['canWriteTag']) {
+  if ($this->request->data['Media']['canWriteTag']) {
     $items['edit'] = __("Edit");
   }
-  if ($this->data['Media']['canWriteAcl']) {
+  if ($this->request->data['Media']['canWriteAcl']) {
     $items['acl'] = __("Access Right");
   }
-  echo $tab->menu($items);
+  echo $this->Tab->menu($items);
 ?>
-<?php echo $tab->open(0); ?>
+<?php echo $this->Tab->open(0); ?>
 <div class="meta">
-<div id="meta-<?php echo $this->data['Media']['id']; ?>">
+<div id="meta-<?php echo $this->request->data['Media']['id']; ?>">
 <table class="bare"> 
-  <?php echo $this->Html->tableCells($this->ImageData->metaTable(&$this->data)); ?>
+  <?php echo $this->Html->tableCells($this->ImageData->metaTable(&$this->request->data)); ?>
 </table>
 </div>
 </div><!-- meta -->
-<?php echo $tab->close(); ?>
+<?php echo $this->Tab->close(); ?>
 
-<?php echo $tab->open(1); ?>
+<?php echo $this->Tab->open(1); ?>
 <div class="meta">
 <table class="bare"> 
 <?php 
   $cells = array();
-  $cells[] = array(__("User"), $this->Html->link($this->data['User']['username'], '/explorer/user/'.$this->data['User']['username']));
-  if ($this->data['Media']['isOwner']) {
+  $cells[] = array(__("User"), $this->Html->link($this->request->data['User']['username'], '/explorer/user/'.$this->request->data['User']['username']));
+  if ($this->request->data['Media']['isOwner']) {
     $files = array();
-    foreach ($this->data['File'] as $file) {
+    foreach ($this->request->data['File'] as $file) {
       $link = $this->ImageData->getPathLink($file);
       $files[] = $this->Html->link($file['file'], $link).' ('.$this->Number->toReadableSize($file['size']).')';
@@ -69 +69 @@
     $cells[] = array(__("File(s)"), implode(', ', $files));
   }
-  $folders = $this->ImageData->getFolderLinks($this->data);
+  $folders = $this->ImageData->getFolderLinks($this->request->data);
   if ($folders) {
     $cells[] = array(__("Folder"), implode(' / ', $folders));
   }
-  $cells[] = array(__("View Count"), $this->data['Media']['clicks']);
-  $cells[] = array(__("Created"), $time->relativeTime($this->data['Media']['created']));
-  $cells[] = array(__("Last modified"), $time->relativeTime($this->data['Media']['modified']));
-  $cells[] = array(__("Size"), $this->data['Media']['width'].'px * '.$this->data['Media']['height'].'px');
+  $cells[] = array(__("View Count"), $this->request->data['Media']['clicks']);
+  $cells[] = array(__("Created"), $this->Time->timeAgoInWords($this->request->data['Media']['created']));
+  $cells[] = array(__("Last modified"), $this->Time->timeAgoInWords($this->request->data['Media']['modified']));
+  $cells[] = array(__("Size"), $this->request->data['Media']['width'].'px * '.$this->request->data['Media']['height'].'px');
 
-  if ($this->data['Media']['model']) {
-    $cells[] = array(__("Model"), $this->data['Media']['model']);
+  if ($this->request->data['Media']['model']) {
+    $cells[] = array(__("Model"), $this->request->data['Media']['model']);
   }
-  if ($this->data['Media']['duration'] > 0) {
-    $cells[] = array(__("Duration"), $this->data['Media']['duration'].'s');
+  if ($this->request->data['Media']['duration'] > 0) {
+    $cells[] = array(__("Duration"), $this->request->data['Media']['duration'].'s');
   } else {
-    if ($this->data['Media']['aperture'] > 0) {
-      $cells[] = array(__("Aperture"), $this->data['Media']['aperture']);
+    if ($this->request->data['Media']['aperture'] > 0) {
+      $cells[] = array(__("Aperture"), $this->request->data['Media']['aperture']);
     }
-    if ($this->data['Media']['shutter'] > 0) {
-      $cells[] = array(__("Shutter"), $this->ImageData->niceShutter($this->data['Media']['shutter']));
+    if ($this->request->data['Media']['shutter'] > 0) {
+      $cells[] = array(__("Shutter"), $this->ImageData->niceShutter($this->request->data['Media']['shutter']));
     }
-    if ($this->data['Media']['iso'] > 0) {
-      $cells[] = array(__("ISO"), $this->data['Media']['iso']);
+    if ($this->request->data['Media']['iso'] > 0) {
+      $cells[] = array(__("ISO"), $this->request->data['Media']['iso']);
     }
   }
@@ -98 +98 @@
 </table>
 </div>
-<?php echo $tab->close(); ?>
+<?php echo $this->Tab->close(); ?>
 <?php 
-  if ($map->hasApi() && $map->hasMediaGeo($this->data)) {
-    echo $tab->open('map');
-    echo $map->container();
-    echo $map->script();
-    echo $tab->close(); 
+  if ($this->Map->hasApi() && $this->Map->hasMediaGeo($this->request->data)) {
+    echo $this->Tab->open('map');
+    echo $this->Map->container();
+    echo $this->Map->script();
+    echo $this->Tab->close(); 
   }
-  if ($this->data['Media']['canWriteTag']) {
-    echo $tab->open('edit');
-    echo $this->Form->create(null, array('url' => 'update/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'edit'));
+  if ($this->request->data['Media']['canWriteTag']) {
+    echo $this->Tab->open('edit');
+    echo $this->Form->create(null, array('url' => 'update/'.$this->request->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'edit'));
     echo "<fieldset>";
     echo View::element('single_meta_form');
     echo "</fieldset>";
     echo $this->Form->end(__('Save'));
-    echo $tab->close(); 
+    echo $this->Tab->close(); 
   }
-  if ($this->data['Media']['canWriteAcl']) {
-    echo $tab->open('acl');
-    echo $this->Form->create(null, array('url' => 'updateAcl/'.$this->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'acl'));
+  if ($this->request->data['Media']['canWriteAcl']) {
+    echo $this->Tab->open('acl');
+    echo $this->Form->create(null, array('url' => 'updateAcl/'.$this->request->data['Media']['id'].'/'.join('/', $crumbs), 'id' => 'acl'));
     echo "<fieldset>";
     echo View::element('single_acl_form');
     echo "</fieldset>";
     echo $this->Form->end(__('Save'));
-    echo $tab->close(); 
+    echo $this->Tab->close(); 
   }
 ?>
@@ -182 +182 @@
 JS;
   $vars = array(
-    'ID' => $this->data['Media']['id'],
-    'LATITUDE' => ($this->data['Media']['latitude'] ? $this->data['Media']['latitude'] : 0),
-    'LONGITUDE' => ($this->data['Media']['longitude'] ? $this->data['Media']['longitude'] : 0));
+    'ID' => $this->request->data['Media']['id'],
+    'LATITUDE' => ($this->request->data['Media']['latitude'] ? $this->request->data['Media']['latitude'] : 0),
+    'LONGITUDE' => ($this->request->data['Media']['longitude'] ? $this->request->data['Media']['longitude'] : 0));
   foreach ($vars as $name => $value) {
     $script = preg_replace("/:$name/", $value, $script);

View/Options/rss.ctp

@@ -8 +8 @@
 
 <?php
-  $recentMedia = Router::url('/explorer/rss/key:'.$this->data['User']['key'], true);
-  $recentComments = Router::url('/comments/rss/key:'.$this->data['User']['key'], true);
-  $mediaRss = Router::url('/explorer/media/key:'.$this->data['User']['key'].'/media.rss', true);
-  $myMediaMediaRss = Router::url('/explorer/media/user:'.$this->data['User']['username'].'/key:'.$this->data['User']['key'].'/media.rss', true);
+  $recentMedia = Router::url('/explorer/rss/key:'.$this->request->data['User']['key'], true);
+  $recentComments = Router::url('/comments/rss/key:'.$this->request->data['User']['key'], true);
+  $mediaRss = Router::url('/explorer/media/key:'.$this->request->data['User']['key'].'/media.rss', true);
+  $myMediaMediaRss = Router::url('/explorer/media/user:'.$this->request->data['User']['username'].'/key:'.$this->request->data['User']['key'].'/media.rss', true);
 ?>
 <ul>

View/System/delete_unused_meta_data.ctp

@@ -1 +1 @@
 <h1><?php echo __("Delete Unused Metadata"); ?></h1>
 <?php echo $this->Session->flash(); ?>
-<p><?php echo __("Delete all unused meta data from database: %d tags, %d categories, %d locations.", $this->data['unusedTagCount'], $this->data['unusedCategoryCount'], $this->data['unusedLocationCount']); ?>
+<p><?php echo __("Delete all unused meta data from database: %d tags, %d categories, %d locations.", $this->request->data['unusedTagCount'], $this->request->data['unusedCategoryCount'], $this->request->data['unusedLocationCount']); ?>
 </p><?php echo $this->Html->link(__('Delete'), 'deleteUnusedMetaData/delete', array('class' => 'button')); ?></p>

View/Users/admin_edit.ctp

@@ -1 @@
-<h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1>
+<h1><?php echo __(" User: %s", $this->request->data['User']['username']); ?></h1>
 
 <?php echo $this->Session->flash(); ?>
 
-<?php echo $this->Form->create(null, array('action' => 'edit/'.$this->data['User']['id'])); ?>
+<?php echo $this->Form->create(null, array('action' => 'edit/'.$this->request->data['User']['id'])); ?>
 <fieldset><legend><?php echo __('General'); ?></legend>
 <?php
@@ -13 +13 @@
     $roles[ROLE_ADMIN] = __('Admin');
   }
-  echo $this->Form->input('User.role', array('type' => 'select', 'options' => $roles, 'selected' => $this->data['User']['role']));
+  echo $this->Form->input('User.role', array('type' => 'select', 'options' => $roles, 'selected' => $this->request->data['User']['role']));
 ?>
 </fieldset>
@@ -20 +20 @@
 <?php
   echo $this->Form->input('User.expires', array('label' => __('Expire date'), 'type' => 'text'));
-  echo $this->Form->input('User.quota', array('type' => 'text', 'label' => __('Upload Quota'), 'value' => $this->Number->toReadableSize($this->data['User']['quota'])));
+  echo $this->Form->input('User.quota', array('type' => 'text', 'label' => __('Upload Quota'), 'value' => $this->Number->toReadableSize($this->request->data['User']['quota'])));
 ?>
 </fieldset>

View/Users/admin_index.ctp

@@ -2 +2 @@
 <?php echo $this->Session->flash(); ?>
 
-<?php $paginator->options(array('update' => 'main_content', 'indicator' => 'spinner'));?>
+<?php $this->Paginator->options(array('update' => 'main_content', 'indicator' => 'spinner'));?>
 
-<?php echo $paginator->prev(__('Prev'), null, null, array('class' => 'disabled')); ?>
-<?php echo " | "; echo $paginator->numbers(); ?>
-<?php echo $paginator->next(__('Next'), null, null, array('class' => 'disabled')); ?>
+<?php echo $this->Paginator->prev(__('Prev'), null, null, array('class' => 'disabled')); ?>
+<?php echo " | "; echo $this->Paginator->numbers(); ?>
+<?php echo $this->Paginator->next(__('Next'), null, null, array('class' => 'disabled')); ?>
 
-Page <?php echo $paginator->counter() ?>
+Page <?php echo $this->Paginator->counter() ?>
 
 <table class="default">
 <thead>
 <tr>
-  <td><?php echo $paginator->sort(__('Username'), 'username'); ?></td>
-  <td><?php echo $paginator->sort(__('Firstname'), 'firstname'); ?></td>
-  <td><?php echo $paginator->sort(__('Lastname'), 'lastname'); ?></td>
+  <td><?php echo $this->Paginator->sort(__('Username'), 'username'); ?></td>
+  <td><?php echo $this->Paginator->sort(__('Firstname'), 'firstname'); ?></td>
+  <td><?php echo $this->Paginator->sort(__('Lastname'), 'lastname'); ?></td>
   <td><?php echo __('Guests'); ?></td>
-  <td><?php echo $paginator->sort(__('User role'), 'role'); ?></td>
+  <td><?php echo $this->Paginator->sort(__('User role'), 'role'); ?></td>
   <td><?php echo __('Actions'); ?></td>
 </tr>
@@ -23 +23 @@
 
 <tbody>
-<?php $row=0; foreach($this->data as $user): ?>
+<?php $row=0; foreach($this->request->data as $user): ?>
 <tr class="<?php echo ($row++%2)?"even":"odd";?>">
   <td><?php echo $this->Html->link($user['User']['username'], '/admin/users/edit/'.$user['User']['id']);?></td>

View/Users/admin_password.ctp

@@ -1 @@
-<h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1>
+<h1><?php echo __(" User: %s", $this->request->data['User']['username']); ?></h1>
 
 <?php echo $this->Session->flash(); ?>
 
-<?php echo $this->Form->create(null, array('action' => 'password/'.$this->data['User']['id'])); ?>
+<?php echo $this->Form->create(null, array('action' => 'password/'.$this->request->data['User']['id'])); ?>
 <fieldset><legend>Password</legend>
 <?php

View/Users/admin_path.ctp

@@ -1 @@
-<h1><?php echo __(" User: %s", $this->data['User']['username']); ?></h1>
+<h1><?php echo __(" User: %s", $this->request->data['User']['username']); ?></h1>
 
 <?php echo $this->Session->flash(); ?>
@@ -19 +19 @@
     <td><?php  echo "$root"; ?></td>
     <td><?php
-      $delConfirm = __("Do you really want to detete the path '%s' of '%s'?", $root, $this->data['User']['username']);
+      $delConfirm = __("Do you really want to detete the path '%s' of '%s'?", $root, $this->request->data['User']['username']);
       echo $this->Html->link($this->Html->image('icons/delete.png', array('alt' => __('Delete'), 'title' => __("Delete path '%s'", $root))),
-    '/admin/users/delpath/'.$this->data['User']['id'].'/'.$root, array('escape' => false), $delConfirm);?></td>
+    '/admin/users/delpath/'.$this->request->data['User']['id'].'/'.$root, array('escape' => false), $delConfirm);?></td>
   </tr>
 <?php endforeach; ?>
@@ -35 +35 @@
 <?php endif; ?>
 
-<?php echo $this->Form->create(null, array('action' => 'path/'.$this->data['User']['id'])); ?>
+<?php echo $this->Form->create(null, array('action' => 'path/'.$this->request->data['User']['id'])); ?>
 <fieldset><legend><?php echo __('Add Directory'); ?></legend>
 <?php echo $this->Form->input('Option.path.fspath', array('label' => __('Directory'))); ?>

View/Users/admin_register.ctp

@@ -5 +5 @@
 <fieldset><legend><?php echo __('Registration'); ?></legend>
 <?php echo $this->Form->input('user.register.enable', array('label' => __('Allow anonymous registration'), 'type' => 'checkbox')); ?>
-<?php echo $this->Form->input('user.register.quota', array('label' => __('Initial quota limit'), 'type' => 'text', 'value' => $this->Number->toReadableSize($this->data['user']['register']['quota']))); ?>
+<?php echo $this->Form->input('user.register.quota', array('label' => __('Initial quota limit'), 'type' => 'text', 'value' => $this->Number->toReadableSize($this->request->data['user']['register']['quota']))); ?>
 </fieldset>
 <?php echo $this->Form->end(__('Save')); ?>

View/Users/index.ctp

@@ -8 +8 @@
 <?php echo $this->Session->flash(); ?>
 
-<?php if (!empty($this->data)): ?>
+<?php if (!empty($this->request->data)): ?>
 <table class="default">
 <thead>
@@ -24 +24 @@
   $cells = array();
 
-  foreach($this->data as $user) {
+  foreach($this->request->data as $user) {
     $row = array(
       $this->Html->link($user['User']['username'], "view/{$user['User']['username']}"),
-      $time->relativeTime($user['User']['created']),
+      $this->Time->timeAgoInWords($user['User']['created']),
       );
     $cells[] = $row;

View/Users/view.ctp

@@ -1 +1 @@
 <h1><?php 
-  __('User %s', $this->data['User']['username']);  
+  __('User %s', $this->request->data['User']['username']);  
   if ($currentUser['User']['role'] >= ROLE_SYSOP) {
-    echo " " . $this->Html->link(__("Edit"), array('action' => 'edit', 'admin' => true, $this->data['User']['id']));
+    echo " " . $this->Html->link(__("Edit"), array('action' => 'edit', 'admin' => true, $this->request->data['User']['id']));
   }
 ?></h1>
@@ -24 +24 @@
 <?php 
   $cells = array();
-  $cells[] = array(__("Member since"), $this->Time->relativeTime($this->data['User']['created']));
-  $cells[] = array(__("Count of media"), $this->data['Media']['count']);
-  $cells[] = array(__("Count of files"), $this->data['File']['count']);
-  $cells[] = array(__("Size of files"), $this->Number->toReadableSize($this->data['File']['bytes']));
+  $cells[] = array(__("Member since"), $this->Time->timeAgoInWords($this->request->data['User']['created']));
+  $cells[] = array(__("Count of media"), $this->request->data['Media']['count']);
+  $cells[] = array(__("Count of files"), $this->request->data['File']['count']);
+  $cells[] = array(__("Size of files"), $this->Number->toReadableSize($this->request->data['File']['bytes']));
   echo $this->Html->tableCells($cells, array('class' => 'odd'), array('class' => 'even'));
 ?> 
@@ -50 +50 @@
 <?php 
   $cells = array();
-  $groupIds = Set::extract('/Group/id', $this->data);
-  foreach ($this->data['Group'] as $group) {
+  $groupIds = Set::extract('/Group/id', $this->request->data);
+  foreach ($this->request->data['Group'] as $group) {
     $username = implode('', Set::extract("/User[id={$group['user_id']}]/username", $users));
     $cells[] = array(
       $this->Html->link($group['name'], "/groups/view/{$group['name']}"),
       $this->Html->link($username, "/user/view/$username"),
-      $text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
+      $this->Text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
       $this->Html->link("View media", "/explorer/group/{$group['name']}")
       );
   }
-  foreach ($this->data['Member'] as $group) {
+  foreach ($this->request->data['Member'] as $group) {
     if (in_array($group['id'], $groupIds)) {
       continue;
@@ -68 +68 @@
       $this->Html->link($group['name'], "/groups/view/{$group['name']}"),
       $this->Html->link($username, "/users/view/$username"),
-      $text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
+      $this->Text->truncate($group['description'], 30, array('ending' => '...', 'exact' => false, 'html' => false)),
       $this->Html->link("View media", "/explorer/group/{$group['name']}")
       );
@@ -95 +95 @@
   } 
 ?></p>
-<p><?php echo __('See all media of user %s', $this->Html->link($this->data['User']['username'], "/explorer/user/{$this->data['User']['username']}")); ?></p>
+<p><?php echo __('See all media of user %s', $this->Html->link($this->request->data['User']['username'], "/explorer/user/{$this->request->data['User']['username']}")); ?></p>
 <?php endif; ?>

View/home/index.ctp

@@ -49 +49 @@
 <div class="meta">
 <span class="from"><?php echo $comment['Comment']['name'] ?></span> said 
-<span class="date"><?php echo $time->relativeTime($comment['Comment']['date']); ?>:</span>
+<span class="date"><?php echo $this->Time->timeAgoInWords($comment['Comment']['date']); ?>:</span>
 </div><!-- comment meta -->
 
 <div class="text">
-<?php echo preg_replace('/\n/', '<br />', $text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?>
+<?php echo preg_replace('/\n/', '<br />', $this->Text->truncate($comment['Comment']['text'], 220, array('ending' => '...', 'exact' => false, 'html' => false))); ?>
 </div>
 </div><!-- comment -->