Changeset 3605ef4cbbdb0bce13d7f8f2d89564bdce062ab1

Timestamp:

01/15/12 14:59:03 (4 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

28879c66921dd6a95bea71bfa032508c45bc6467

Parents:

e449ecc0f26cb90b41ca32d98ed3f37f762c9f5a

git-committer:

Xemle <xemle@phtagr.org> / 2012-01-15T14:59:03Z+0100

Message:

Migrate code for CakePHP 2.0

Files:

• Controller/AppController.php (modified) (4 diffs)
• Controller/BrowserController.php (moved) (moved from controllers/browser_controller.php) (2 diffs)
• Controller/Component/BaseFilterComponent.php (modified) (1 diff)
• Controller/Component/CaptchaComponent.php (modified) (1 diff)
• Controller/Component/CommandComponent.php (modified) (2 diffs)
• Controller/Component/FastFileResponderComponent.php (modified) (1 diff)
• Controller/Component/FeedComponent.php (modified) (3 diffs)
• Controller/Component/FileCacheComponent.php (modified) (1 diff)
• Controller/Component/FileManagerComponent.php (modified) (1 diff)
• Controller/Component/FilterManagerComponent.php (modified) (3 diffs)
• Controller/Component/ImageResizerComponent.php (modified) (2 diffs)
• Controller/Component/MenuComponent.php (modified) (1 diff)
• Controller/Component/PreviewManagerComponent.php (modified) (4 diffs)
• Controller/Component/QueryBuilderComponent.php (modified) (2 diffs)
• Controller/Component/SearchComponent.php (modified) (3 diffs)
• Controller/Component/UpgradeSchemaComponent.php (modified) (2 diffs)
• Controller/Component/UploadComponent.php (modified) (1 diff)
• Controller/Component/VideoPreviewComponent.php (modified) (1 diff)
• Controller/Component/ZipComponent.php (modified) (1 diff)
• Controller/HomeController.php (modified) (1 diff)
• Controller/MediaController.php (modified) (6 diffs)
• Controller/SetupController.php (modified) (1 diff)
• Model/AppModel.php (modified) (1 diff)
• Model/Behavior/CipherBehavior.php (modified) (1 diff)
• Model/Guest.php (moved) (moved from models/guest.php) (1 diff)
• Model/Media.php (modified) (1 diff)
• Model/User.php (modified) (1 diff)
• View/Browser/index.ctp (modified) (1 diff)
• View/Browser/sync.ctp (modified) (1 diff)
• View/Elements/topnav.ctp (modified) (1 diff)
• View/Helper/FileListHelper.php (modified) (5 diffs)
• View/Helper/ImageDataHelper.php (modified) (1 diff)
• View/Helper/SearchHelper.php (modified) (1 diff)
• View/Layouts/backend.ctp (modified) (5 diffs)
• View/Layouts/default.ctp (modified) (4 diffs)
• View/Setup/admin_upgrade.ctp (modified) (2 diffs)
• View/Users/login.ctp (modified) (2 diffs)
• View/home/index.ctp (modified) (6 diffs)

Controller/AppController.php

@@ -49 +49 @@
   function _setMainMenu() {
     $this->Menu->setCurrentMenu('main-menu');
-    $this->Menu->addItem(__('Home', true), "/");
-    $this->Menu->addItem(__('Explorer', true), array('controller' => 'explorer'));
+    $this->Menu->addItem(__('Home'), "/");
+    $this->Menu->addItem(__('Explorer'), array('controller' => 'explorer'));
     if ($this->hasRole(ROLE_GUEST)) {
       $user = $this->getUser();
-      $this->Menu->addItem(__('My Photos', true), array('controller' => 'explorer', 'action' => 'user', $user['User']['username']));
+      $this->Menu->addItem(__('My Photos'), array('controller' => 'explorer', 'action' => 'user', $user['User']['username']));
     }
     if ($this->hasRole(ROLE_USER)) {
-      $this->Menu->addItem(__('Upload', true), array('controller' => 'browser', 'action' => 'quickupload'));
+      $this->Menu->addItem(__('Upload'), array('controller' => 'browser', 'action' => 'quickupload'));
     }
   }
@@ -64 +64 @@
     $role = $this->getUserRole();
     if ($role == ROLE_NOBODY) {
-      $this->Menu->addItem(__('Login', true), array('controller' => 'users', 'action' => 'login'));
+      $this->Menu->addItem(__('Login'), array('controller' => 'users', 'action' => 'login'));
       if ($this->getOption('user.register.enable', 0)) {
-        $this->Menu->addItem(__('Sign Up', true), array('controller' => 'users', 'action' => 'register'));
+        $this->Menu->addItem(__('Sign Up'), array('controller' => 'users', 'action' => 'register'));
       }
     } else {
       $user = $this->getUser();
-      $this->Menu->addItem(sprintf(__('Howdy, %s!', true), $user['User']['username']), false);
-      $this->Menu->addItem(__('Logout', true), array('controller' => 'users', 'action' => 'logout'));
-      $this->Menu->addItem(__('Dashboard', true), array('controller' => 'options'));
+      $this->Menu->addItem(__('Howdy, %s!', $user['User']['username']), false);
+      $this->Menu->addItem(__('Logout'), array('controller' => 'users', 'action' => 'logout'));
+      $this->Menu->addItem(__('Dashboard'), array('controller' => 'options'));
     }
   }
@@ -144 +144 @@
    * @todo Check expired user */
   function _checkSession() {
-    $this->Session->activate();
+    //$this->Session->activate();
     if (!$this->Session->check('Session.requestCount')) {
       $this->Session->write('Session.requestCount', 1);
@@ -280 +280 @@
       $parent->components[] = $componentName;
     }
-    $this->Component->_loadComponents($parent);
-    $this->Component->initialize($this);
-
-    if (isset($parent->{$componentName})) {
-      return true;
-    } else {
+    $component = $this->Components->load($componentName);
+    if (!$component) {
       Logger::warn("Could not load component $componentName");
       return false;
     }
+    $parent->{$componentName} = $component;
+    $component->initialize(&$this);
+
+    return true;
   }
  

Controller/BrowserController.php

@@ -356 +356 @@
       // clear file cache 
       @clearstatcache();
-      $start = $now = getMicrotime();
+      $start = $now = microtime(true);
       $executionTime = ini_get('max_execution_time') - 5;
 
@@ -369 +369 @@
           }
 
-          $now = getMicrotime();
+          $now = microtime(true);
           if ($now - $start > $executionTime) {
             break;

Controller/Component/BaseFilterComponent.php

@@ -22 +22 @@
  */
 
-class BaseFilterComponent extends Object {
+class BaseFilterComponent extends Component {
 
   var $components = array();

Controller/Component/CaptchaComponent.php

@@ -1 +1 @@
 <?php 
-App::import('vendor', 'kcaptcha');
-class CaptchaComponent extends Object
+App::uses('vendor', 'kcaptcha');
+class CaptchaComponent extends Component
 {
   function initialize(&$controller) {

Controller/Component/CommandComponent.php

@@ -22 +22 @@
  */
 
-class CommandComponent extends Object {
+class CommandComponent extends Component {
 
   var $controller = null;
@@ -60 +60 @@
       $this->lastCommand .= ' 2>&1';
     }
-    $t1 = getMicrotime();
+    $t1 = microtime(true);
     exec($this->lastCommand, &$output, &$result);
-    $t2 = getMicrotime();
+    $t2 = microtime(true);
     $this->output = $output;
     Logger::debug("Command '{$this->lastCommand}' returned $result and required ".round($t2-$t1, 4)."ms");

Controller/Component/FastFileResponderComponent.php

@@ -22 +22 @@
  */
 
-class FastFileResponderComponent extends Object {
+class FastFileResponderComponent extends Component {
   var $controller = null;
   var $components = array('Session', 'FileCache');

Controller/Component/FeedComponent.php

@@ -22 +22 @@
  */
 
-class FeedComponent extends Object {
+class FeedComponent extends Component {
   
   var $name = 'FeedComponent';
-
+  
   var $controller = null;
 
@@ -41 +41 @@
   /** Set feeds output for layout */
   function beforeRender() {
-    App::import('Helper', 'Html');
-    $html = new HtmlHelper();
-
+    App::uses('HtmlHelper', 'View/Helper');
+    App::uses('View', 'View');
+    $View = new View($this->controller, false);
+    $Html = new HtmlHelper($View);
     $output = '';
     foreach($this->_feeds as $url => $options) {
@@ -56 +57 @@
         unset($options['url']);
       }
-      $output .= $html->meta($type, $url, $options);
+      $output .= $Html->meta($type, $url, $options);
     }
     $this->controller->set('feeds_for_layout', $output);

Controller/Component/FileCacheComponent.php

@@ -22 +22 @@
  */
 
-class FileCacheComponent extends Object {
+App::uses('Folder', 'Utility');
+
+class FileCacheComponent extends Component {
 
   var $controller = null;

Controller/Component/FileManagerComponent.php

@@ -22 +22 @@
  */
 
-class FileManagerComponent extends Object {
+class FileManagerComponent extends Component {
 
   var $controller = null;

Controller/Component/FilterManagerComponent.php

@@ -22 +22 @@
  */
 
-class FilterManagerComponent extends Object {
+class FilterManagerComponent extends Component {
 
   var $controller = null;
@@ -51 +51 @@
       return false;
     }
-    $this->MyFile =& $controller->MyFile;
-    $this->Media =& $controller->Media;
     $this->loadFilter(array('ImageFilter', 'SimpleImageFilter', 'VideoFilter', 'GpsFilter'));
   }
@@ -76 +74 @@
       return true;
     }
-    $filter->MyFile =& $this->MyFile;
-    $filter->Media =& $this->Media;
-    $filter->FilterManager =& $this;
+    $filter->FilterManager = $this;
 
     $filter->init(&$this);

Controller/Component/ImageResizerComponent.php

@@ -21 +21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-if (!App::import('Vendor', "phpthumb", true, array(), "phpthumb.class.php")) {
+if (!class_exists('phpThumb') && !App::import('Vendor', "phpthumb", true, array(), "phpthumb/phpthumb.class.php")) {
   debug("Please install phpthumb properly");
 }
 
-class ImageResizerComponent extends Object {
+class ImageResizerComponent extends Component {
 
   var $controller = null;
@@ -96 +96 @@
     }
 
-    $t0 = getMicrotime();
+    $t0 = microtime(true);
     if ($this->_semaphoreId) {
       sem_acquire($this->_semaphoreId);
     }
-    $t1 = getMicrotime();
+    $t1 = microtime(true);
     $result = $phpThumb->GenerateThumbnail();
-    $t2 = getMicrotime();
+    $t2 = microtime(true);
     if ($this->_semaphoreId) {
       sem_release($this->_semaphoreId);

Controller/Component/MenuComponent.php

@@ -22 +22 @@
  */
 
-class MenuComponent extends Object {
+class MenuComponent extends Component {
 
         var $components = array('Session');

Controller/Component/PreviewManagerComponent.php

@@ -22 +22 @@
  */
 
-class PreviewManagerComponent extends Object {
+class PreviewManagerComponent extends Component {
 
   var $controller = null;
@@ -63 +63 @@
   function initialize(&$controller) {
     $this->controller =& $controller;
-    if (!isset($controller->MyFile) || !isset($controller->Media)) {
+    if (!isset($controller->Media)) {
       Logger::err("Model MyFile and Media is not found");
       return false;
     }
-    $this->MyFile =& $controller->MyFile;
-    $this->Media =& $controller->Media;
   }
 
   /** Return image source file of the media */
   function _getImageSoureFilename($media) {
-    $type = $this->Media->getType($media);
+    $type = $this->controller->Media->getType($media);
     if ($type != MEDIA_TYPE_IMAGE && $type != MEDIA_TYPE_VIDEO) {
-      Logger::err("Media type not supported: {$this->Media->getType($media)}");
+      Logger::err("Media type not supported: {$this->controller->Media->getType($media)}");
       return false;
     } 
@@ -82 +80 @@
       return $this->VideoPreview->getPreviewFilename($media);
     } 
-    $file = $this->Media->getFile($media, FILE_TYPE_IMAGE, false);
+    $file = $this->controller->Media->getFile($media, FILE_TYPE_IMAGE, false);
     if (!$file) {
       Logger::err("No files are attached to media {$media['Media']['id']}");
       return false;
     }
-    return $this->Media->File->getFilename($file);
+    return $this->controller->Media->File->getFilename($file);
   }
 
@@ -109 +107 @@
       $src = $this->_getImageSoureFilename($media);
       $config['clearMetaData'] = true;
-      $config['rotation'] = $this->Media->getRotationInDegree($media);
+      $config['rotation'] = $this->controller->Media->getRotationInDegree($media);
     }
     $dst = $this->FileCache->getFilePath($media, $name);
     if (!$dst) {
-      Logger::err("Could not get cache file path for media {$this->Media->toString($media)}");
+      Logger::err("Could not get cache file path for media {$this->controller->Media->toString($media)}");
       return false;
     }

Controller/Component/QueryBuilderComponent.php

@@ -22 +22 @@
  */
 
-App::import('Core', array('Sanitize'));
-
-class QueryBuilderComponent extends Object
+App::uses('Sanitize', 'Utility');
+
+class QueryBuilderComponent extends Component
 {
-  var $components = array();
-
   var $controller = null;
 
@@ -57 +55 @@
   function initialize(&$controller) {
     $this->controller = &$controller;
-    $this->Sanitize =& new Sanitize();
+    $this->Sanitize = new Sanitize();
   }
 

Controller/Component/SearchComponent.php

@@ -22 +22 @@
  */
 
-App::import('Core', array('Validation'));
-App::import('File', 'Search', array('file' => APP.'search.php'));
-
-class SearchComponent extends Search
+if (!App::uses('Validation', 'Utility')) {
+  CakeLog::write('error', 'Could not load validation');
+}
+if (!class_exists('Search')) {
+  App::import('File', 'Search', array('file' => APP.'search.php'));
+}
+
+class SearchComponent extends Component
 {
   var $components = array('QueryBuilder');
 
   var $controller = null;
-
-  var $Validation = null;
+  
+  var $_data;
 
   /** Parameter validation array
@@ -82 +86 @@
   function initialize(&$controller) {
     $this->controller = &$controller;
-    $this->Validation =& Validation::getInstance();
+    if (!$this->QueryBuilder->controller) {
+      $this->QueryBuilder->initialize(&$controller);
+    }
     $this->clear();
+    return true;
   }
 
   function clear() {
     $this->_data = $this->defaults;
+  }
+
+  /** Returns all parameters 
+    @return Parameter array */
+  function getParams() {
+    return $this->_data;
+  }
+
+  /** Set all parameters 
+    @param data Parameter array
+    @note The parameters are not validated! */
+  function setParams($data = array()) {
+    $this->_data = $data;
+  }
+
+  /** Returns parameter 
+    @param name Name of parameter 
+    @param default Default value, if the parameter does not exists. Default
+    value is null */
+  function getParam($name, $default = null) {
+    if (!empty($this->_data[$name])) {
+      return $this->_data[$name];
+    } else {
+      return $default;
+    }
+  }
+
+  /** Set a singular parameter 
+    @param name Parameter name
+    @param value Parameter value
+    @param validate Optional parameter to validate the parameter. Default is
+    true
+    @return True on success */
+  function setParam($name, $value, $validate = true) {
+    if ($validate === false || $this->validate($name, $value)) {
+      $this->_data[$name] = $value;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /** Add a parameter to an array.
+    @param name Parameter name. 
+    @param value Parameter value (which will be pluralized)
+    @param validate Optional parameter to validate the parameter. Default is
+    true
+    @note The name will be pluralized. */
+  function addParam($name, $value, $validate = true) {
+    $name = Inflector::pluralize($name);
+    if (is_array($value)) {
+      foreach ($value as $v) {
+        $this->addParam($name, $v, $validate);
+      }
+      return;
+    }
+    
+    if ((!isset($this->_data[$name]) || !in_array($value, $this->_data[$name])) &&
+      ($validate === false || $this->validate($name, $value))) {
+      $this->_data[$name][] = $value;
+    }
+  }
+
+  function delParam($name, $value = false) {
+    if (!isset($this->_data[$name])) {
+      return;
+    }
+    
+    if (!empty($value)) {
+      if (is_array($value)) {
+        foreach ($value as $v) {
+          $this->delParam($name, $v);
+        }
+        return;
+      }
+      // handle array
+      $key = array_search($value, $this->_data[$name]);
+      if ($key !== false) {
+        unset($this->_data[$name][$key]);
+      }
+      if (count($this->_data[$name]) == 0) {
+        unset($this->_data[$name]);
+      }
+    } else {
+      // handle single value
+      unset($this->_data[$name]);
+    }
+  }
+
+  function __call($name, $args) {
+    if (!preg_match('/^(get|set|add|del|delete)(.*)$/', $name, $matches)) {
+      $this->log("Undefined function $name");
+      return;
+    }
+    $name = Inflector::underscore($matches[2]);
+    switch ($matches[1]) {
+      case 'get':
+        if (count($args) > 0) {
+          return $this->getParam($name, $args[0]);
+        } else {
+          return $this->getParam($name);
+        }
+        break;
+      case 'set':
+        if (count($args) == 1) {
+          return $this->setParam($name, $args[0]);
+        } elseif (count($args) == 2) {
+          return $this->setParam($name, $args[0], $args[1]);
+        }
+        break;
+      case 'add':
+        if (count($args) == 1) {
+          return $this->addParam($name, $args[0]);
+        } elseif (count($args) == 2) {
+          return $this->addParam($name, $args[0], $args[1]);
+        }
+        break;
+      case 'del':
+      case 'delete':
+        if (count($args) == 1) {
+          if (!isset($this->_data[$name])) {
+            $plural = Inflector::pluralize($name);
+            if (isset($this->_data[$plural])) {
+              $name = $plural;
+            }
+          }
+          $this->delParam($name, $args[0]);
+        } else {
+          $this->delParam($name);
+        }
+        break;
+    }
   }
 
@@ -156 +295 @@
     if (method_exists(&$this, $rule)) {
       $result = $this->dispatchMethod($rule, $params);
-    } elseif (method_exists(&$this->Validation, $rule)) {
-      $result = $this->Validation->dispatchMethod($rule, $params);
+    } elseif (method_exists('Validation', $rule)) {
+      $result = call_user_func_array(array('Validation', $rule), $params);
     } else {
       Logger::debug("Rule '$rule' could not be found");

Controller/Component/UpgradeSchemaComponent.php

@@ -22 +22 @@
  */
 
-class UpgradeSchemaComponent extends Object{
+class UpgradeSchemaComponent extends Component {
 
   var $controller = null;
@@ -42 +42 @@
     }
 
-    App::import('Core', 'ConnectionManager');
+    App::uses('ConnectionManager', 'Model');
     $this->db =& ConnectionManager::getDataSource('default');
     if (!$this->db) {

Controller/Component/UploadComponent.php

@@ -22 +22 @@
  */
 
-class UploadComponent extends Object {
+class UploadComponent extends Component {
   
   var $name = 'UploadComponent';

Controller/Component/VideoPreviewComponent.php

@@ -22 +22 @@
  */
 
-class VideoPreviewComponent extends Object {
+class VideoPreviewComponent extends Component {
 
   var $controller = null;

Controller/Component/ZipComponent.php

@@ -22 +22 @@
  */
 
-class ZipComponent extends Object {
+App::uses('Folder', 'Utility');
+
+class ZipComponent extends Component {
   
   var $name = 'ZipComponent';

Controller/HomeController.php

@@ -37 +37 @@
     }
 
-    App::import('Core', 'ConnectionManager');
+    App::uses('ConnectionManager', 'Model');
     $db =& ConnectionManager::getDataSource('default');
-    if (empty($db->connection)) {
+    if (!$db->enabled()) {
       $this->redirect('/setup');
     }

Controller/MediaController.php

@@ -21 +21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-if (!App::import('Vendor', "phpthumb", true, array(), "phpthumb.class.php")) {
-  debug("Please install phpthumb properly");
-}
-
 class MediaController extends AppController
 {
   var $name = 'Media';
-  var $uses = array('Media', 'MyFile');
+  var $uses = array('User', 'Media', 'MyFile');
   var $layout = null;
   var $config = array(
@@ -49 +45 @@
   
   function beforeRender() {
-    parent::beforeFilter();
-    $this->view = 'Media';
+    parent::beforeRender();
+    $this->viewClass = 'Media';
   }
 
@@ -110 +106 @@
     }
     $conditions = $this->Media->buildAclConditions($user, 0, $flag);
-    $conditions[] = "Media.id = $id";
-    $media = $this->Media->find($conditions);
+    $conditions[] = 'Media.id = ' . $id;
+    $media = $this->Media->find('first', array('conditions' => $conditions));
     if (!$media) {
       Logger::verbose("Media not found or access denied for media $id");
@@ -130 +126 @@
 
     $this->set($this->MyFile->getMediaViewOptions($preview));
-    $this->view = 'Media';
+    $this->viewClass = 'Media';
   }
 
@@ -175 +171 @@
     $mediaOptions = $this->MyFile->getMediaViewOptions($filename);
     $mediaOptions['download'] = true;
-    $this->view = 'Media';
+    $this->viewClass = 'Media';
     $this->set($mediaOptions);
   }
@@ -201 +197 @@
     $mediaOptions = $this->MyFile->getMediaViewOptions($filename);
     $mediaOptions['download'] = true;
-    $this->view = 'Media';
+    $this->viewClass = 'Media';
     $this->set($mediaOptions);
   }

Controller/SetupController.php

@@ -292 +292 @@
     $max = strlen($chars) - 1;
 
-    srand(getMicrotime()*1000);
+    srand(microtime(true)*1000);
     $salt = '';
     for($i = 0; $i < 40; $i++) {

Model/AppModel.php

@@ -233 +233 @@
       if (isset($data[$name])) {
         return $data[$name];
-      } else {
-        return null;
-      }
-    }
+      }
+    }
+    return parent::__get($name);
   }
 

Model/Behavior/CipherBehavior.php

@@ -167 +167 @@
     @return Randomly generated salt of the given lenth */
   function _generateSalt($value, $key = '9nHPrYcxmvTliA', $len = 4) {
-    srand(getMicrotime()*1000);
+    srand(microtime(true)*1000);
     $salt = '';
     $lenKey = strlen($key);

Model/Guest.php

@@ -94 +94 @@
 
   function generateKey($data) {
-    srand(getMicrotime()*1000);
+    srand(microtime(true)*1000);
     $h = '';
     for ($i = 0; $i < 128; $i++) {

Model/Media.php

@@ -241 +241 @@
     }
 
-    $data['Media']['isOwner'] = ife($data['Media']['user_id'] == $user['User']['id'], true, false);
+    $data['Media']['isOwner'] = ($data['Media']['user_id'] == $user['User']['id']) ? true : false;
     $data['Media']['canWriteAcl'] = $this->checkAccess(&$data, &$user, 1, 0, &$groups);    
-    $data['Media']['isDirty'] = ife(($data['Media']['flag'] & MEDIA_FLAG_DIRTY) > 0, true, false);
+    $data['Media']['isDirty'] = (($data['Media']['flag'] & MEDIA_FLAG_DIRTY) > 0) ? true : false;
 
     return $data;

Model/User.php

@@ -205 +205 @@
     @return User model data */
   function generateKey($data, $length = 10, $alphabet = false) {
-    srand(getMicrotime()*1000);
+    srand(microtime(true)*1000);
 
     if (!$alphabet || strlen(strval($alphabet)) < 10) {

View/Browser/index.ctp

@@ -1 @@
-<h1><?php __('File Browser'); ?></h1>
+<h1><?php echo __('File Browser'); ?></h1>
 
-<?php echo $session->flash(); ?>
+<?php echo $this->Session->flash(); ?>
 
-<?php echo $form->create('Browser', array('action' => 'import/'.$path)); ?>
+<?php echo $this->Form->create('Browser', array('action' => 'import/'.$path)); ?>
 
-<p><?php printf(__("Location %s", true), $fileList->location($path)); ?>
+<p><?php echo __("Location %s", $this->FileList->location($path)); ?>
 <?php if ($isInternal) {
-  printf(__(" (%s or %s here)", true), 
-    $html->link(__("Upload files", true), 'upload/'.$path),
-    $html->link(__("create folder", true), 'folder/'.$path));
+  echo __(" (%s or %s here)", 
+    $this->Html->link(__("Upload files"), 'upload/'.$path),
+    $this->Html->link(__("create folder"), 'folder/'.$path));
   } ?>. 
 
-<?php echo $fileList->table($path, $dirs, $files, array('isInternal' => $isInternal)); ?>
+<?php echo $this->FileList->table($path, $dirs, $files, array('isInternal' => $isInternal)); ?>
 
-<p><?php printf(__("Location %s", true), $fileList->location($path)); ?>
+<p><?php echo __("Location %s", $this->FileList->location($path)); ?>
 <?php if ($isInternal) {
-  printf(__(" (%s or %s here)", true), 
-    $html->link(__("Upload files", true), 'upload/'.$path),
-    $html->link(__("create folder", true), 'folder/'.$path));
+  echo __(" (%s or %s here)", 
+    $this->Html->link(__("Upload files"), 'upload/'.$path),
+    $this->Html->link(__("create folder"), 'folder/'.$path));
   } ?>. 
 </p>
 
 <?php 
-  echo $form->submit(__('Import', true));
-  echo $form->end();
+  echo $this->Form->submit(__('Import'));
+  echo $this->Form->end();
 ?>

View/Browser/sync.ctp

@@ -1 @@
-<h1><?php __("Meta Data Synchronization"); ?></h1>
+<h1><?php echo __("Meta Data Synchronization"); ?></h1>
 
-<?php echo $session->flash(); ?>
+<?php echo $this->Session->flash(); ?>
 
-<p><?php __("phTagr embedds meta data like tags, categories, or (geo) location information direct into the image video files."); ?></p>
+<p><?php echo __("phTagr embedds meta data like tags, categories, or (geo) location information direct into the image video files."); ?></p>
 
-<p><?php __("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."); ?>
+<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 printf(__("You have %d unsynchronized media. Click %s to start the synchronization (this might take some time)", true), $this->data['unsynced'], $html->link(__("sync", true), 'sync/run')); ?></p>
+<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", true), 'sync/run')); ?></p>
 <?php endif; ?>
 
 <?php if ($this->data['unsynced'] == 0): ?>
-<div class="info"><?php __("All media are synchronized"); ?></div>
+<div class="info"><?php echo __("All media are synchronized"); ?></div>
 <?php endif; ?>
 
 <?php if (count($this->data['errors'])): ?>
-<div class="error"><?php __("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>
+<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'): ?>
 <p><?php 
-  printf(__("Synchronized %d media.", true), count($this->data['synced']));
+  echo __("Synchronized %d media.", count($this->data['synced']));
   if ($this->data['unsynced']) {
-    printf(__(" %d media remains unsynced. Click %s to synchronize again", true), $this->data['unsynced'], $html->link(__('sync', true), 'sync/run')); 
+    echo __(" %d media remains unsynced. Click %s to synchronize again", $this->data['unsynced'], $this->Html->link(__('sync', 'sync/run'))); 
   }
 ?></p>

View/Elements/topnav.ctp

@@ -5 +5 @@
     $name = $session->read('User.username');
     if ($role >= ROLE_SYSOP) {
-      echo $html->link(__('System', true), "/admin/system/general")." | ";
+      echo $html->link(__('System'), "/admin/system/general")." | ";
     }
     if ($role >= ROLE_USER) {
-      echo $html->link(__('Preferences', true), "/options/profile")." | ";
+      echo $html->link(__('Preferences'), "/options/profile")." | ";
     }
-    echo $html->link(__("Logout", true), "/users/logout"). " ($name)";
+    echo $html->link(__("Logout"), "/users/logout"). " ($name)";
   } else {
-    echo $html->link(__("Login", true), "/users/login");
+    echo $html->link(__("Login"), "/users/login");
     if ($option->get('user.register.enable', 0)) {
       echo ' | '.$html->link(__("Register", true), "/users/register");

View/Helper/FileListHelper.php

@@ -80 +80 @@
     $actions = array();
     if ($options['isInternal']) {
-      $actions[] = $this->Html->link('delete', "delete/$path", array('style' => 'color: red', 'onclick' => "return confirm('" . sprintf(__('Delete folder %s?', true), $path) . "')"));
+      $actions[] = $this->Html->link('delete', "delete/$path", array('style' => 'color: red', 'onclick' => "return confirm('" . __('Delete folder %s?', $path) . "')"));
     }
     $row[] = implode('', $actions);
@@ -93 +93 @@
     if (isset($file['media_id'])) {
       $mediaLink = $this->Html->link($file['media_id'], '/images/view/'.$file['media_id']);
-      $unlink = $this->Html->link('unlink', "unlink/$path/{$file['file']}", array('style' => 'color: red', 'title' => __('Unlink media from this file', true)));
+      $unlink = $this->Html->link('unlink', "unlink/$path/{$file['file']}", array('style' => 'color: red', 'title' => __('Unlink media from this file')));
       $row[] = $mediaLink.' '.$unlink;
     } else {
@@ -103 +103 @@
     // Download link for internal files and imported external files
     if ($options['isInternal'] || $file['media_id'] > 0) {
-      $icon = $this->Html->image('icons/disk.png', array('alt' => 'download', 'title' => sprintf(__('Download %s', true), $file['file'])));
+      $icon = $this->Html->image('icons/disk.png', array('alt' => 'download', 'title' => __('Download %s', $file['file'])));
       $actions[] = $this->Html->link($icon, "index/$path/{$file['file']}", array('escape' => false));
     }
@@ -121 +121 @@
     if ($path != '/') {
       $parentPath = dirname($path);
-      $cells[] = $this->_dirRow($parentPath, __('(parent folder)', true), array('checkBox' => false, 'isInternal' => false));
+      $cells[] = $this->_dirRow($parentPath, __('(parent folder)'), array('checkBox' => false, 'isInternal' => false));
     }
-    $cells[] = $this->_dirRow($path, __('(this folder)', true), $options);
+    $cells[] = $this->_dirRow($path, __('(this folder)'), $options);
     usort($dirs, array("FileListHelper", "_cmpFile"));
     usort($files, array("FileListHelper", "_cmpFile"));
@@ -135 +135 @@
     $out .= "<thead>\n";
     $out .= $this->Html->tableHeaders(
-      array('', __('Name', true), __('Media', true), __('Size', true), __('Actions', true))
+      array('', __('Name'), __('Media'), __('Size'), __('Actions'))
       );
     $out .= "</thead>\n";

View/Helper/ImageDataHelper.php

@@ -22 +22 @@
  */
     
-App::import('Core', 'Sanitize');
+App::uses('Sanitize', 'Utility');
 
 class ImageDataHelper extends AppHelper {

View/Helper/SearchHelper.php

@@ -22 +22 @@
  */
 
-App::import('File', 'Search', array('file' => APP.'search.php'));
+if (!class_exists('Search')) {
+  App::import('File', 'Search', array('file' => APP.'search.php'));
+}
 
 class SearchHelper extends Search {

View/Layouts/backend.ctp

@@ -1 @@
-<?php echo $html->docType('xhtml-strict'); ?>
+<?php echo $this->Html->docType('xhtml-strict'); ?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -5 +5 @@
 <title><?php echo $title_for_layout?></title>
 <?php 
-  echo $html->charset('UTF-8')."\n";
-  echo $html->meta('icon')."\n";
-  echo $html->css('backend')."\n";
-  echo $html->script('phtagr');
+  echo $this->Html->charset('UTF-8')."\n";
+  echo $this->Html->meta('icon')."\n";
+  echo $this->Html->css('backend')."\n";
+  echo $this->Html->script('phtagr');
   echo $scripts_for_layout; 
 ?>
@@ -18 +18 @@
 
 <div id="header"><div class="sub">
-<?php echo $html->link(__('Gallery', true), '/'); ?>
+<?php echo $this->Html->link(__('Gallery', true), '/'); ?>
 </div></div>
 
@@ -26 +26 @@
 <div class="box">
 <h1>Menu</h1>
-<?php echo $menu->menu('main'); ?>
+<?php echo $this->Menu->menu('main'); ?>
 </div>
 </div>
@@ -35 +35 @@
 
 <div id="footer"><div class="sub">
-<p>&copy; 2006-2011 by <?php echo $html->link("Gallery phTagr", 'http://www.phtagr.org'); ?></p>
+<p>&copy; 2006-2011 by <?php echo $this->Html->link("Gallery phTagr", 'http://www.phtagr.org'); ?></p>
 </div></div>
 </body>

View/Layouts/default.ctp

@@ -1 @@
-<?php echo $html->docType('xhtml-strict'); ?>
+<?php echo $this->Html->docType('xhtml-strict'); ?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 
@@ -5 +5 @@
 <title><?php echo $title_for_layout?></title>
 <?php 
-  echo $html->charset('UTF-8')."\n";
-  echo $html->meta('icon')."\n";
-  echo $html->css('default')."\n";
-  echo $html->script('jquery-1.5.1.min');
+  echo $this->Html->charset('UTF-8')."\n";
+  echo $this->Html->meta('icon')."\n";
+  echo $this->Html->css('default')."\n";
+  echo $this->Html->script('jquery-1.5.1.min');
   // jquery ui
-  echo $html->css('custom-phtagr/jquery-ui-1.8.14.custom');
-  echo $html->script('jquery-ui-1.8.14.custom.min');
+  echo $this->Html->css('custom-phtagr/jquery-ui-1.8.14.custom');
+  echo $this->Html->script('jquery-ui-1.8.14.custom.min');
 
-  echo $html->script('jquery-phtagr');
+  echo $this->Html->script('jquery-phtagr');
   echo $scripts_for_layout; 
   echo $feeds_for_layout;
@@ -22 +22 @@
 
 <div id="header"><div class="sub">
-<h1><?php echo $option->get('general.title', 'phTagr.'); ?></h1>
-<span class="subtitle"><?php echo $option->get('general.subtitle', 'Tag Your Photos Once And Find Them Forever'); ?></span>
-<?php echo $menu->menu('top-menu'); ?>
+<h1><?php echo $this->Option->get('general.title', 'phTagr.'); ?></h1>
+<span class="subtitle"><?php echo $this->Option->get('general.subtitle', 'Tag Your Photos Once And Find Them Forever'); ?></span>
+<?php echo $this->Menu->menu('top-menu'); ?>
 </div></div><!-- #header/sub -->
 
 <div id="main-menu"><div class="sub">
-<?php echo $menu->menu('main-menu'); ?>
+<?php echo $this->Menu->menu('main-menu'); ?>
 </div></div><!-- #main-menu/sub -->
 
@@ -40 +40 @@
 
 <div id="footer"><div class="sub">
-<p>&copy; 2006-2011 by <?php echo $html->link("Open Source Web Gallery phTagr", 'http://www.phtagr.org'); ?></p>
+<p>&copy; 2006-2011 by <?php echo $this->Html->link("Open Source Web Gallery phTagr", 'http://www.phtagr.org'); ?></p>
 </div></div><!-- #footer/sub -->
 

View/Setup/admin_upgrade.ctp

@@ -1 +1 @@
 <h1><?php __("Database upgrade"); ?></h1>
 
-<?php echo $session->flash(); ?>
+<?php echo $this->Session->flash(); ?>
 
 <div class="info">
@@ -7 +7 @@
 </div>
 
-<?php echo $html->link(__("Upgrade", true), '/admin/setup/upgrade/run'); ?> or 
-<?php echo $html->link(__("Cancel", true), '/'); ?>
+<?php echo $this->Html->link(__("Upgrade", true), '/admin/setup/upgrade/run'); ?> or 
+<?php echo $this->Html->link(__("Cancel", true), '/'); ?>
 

View/Users/login.ctp

@@ -1 @@
-<?php echo $session->flash(); ?>
+<?php echo $this->Session->flash(); ?>
 
-<?php echo $form->create('User', array('action' => 'login', 'class' => 'login')); ?>
+<?php echo $this->Form->create('User', array('action' => 'login', 'class' => 'login')); ?>
 <fieldset>
 <legend><?php __('Login'); ?></legend>
 <?php
-  echo $form->input('User.username', array('label' => __('Username', true)));
-  echo $form->input('User.password', array('label' => __('Password', true)));
+  echo $this->Form->input('User.username', array('label' => __('Username', true)));
+  echo $this->Form->input('User.password', array('label' => __('Password', true)));
 ?>
 </fieldset>
@@ -13 +13 @@
   $signup = '';
   
-  echo $form->submit(__('Login', true), array('div' => false));
+  echo $this->Form->submit(__('Login', true), array('div' => false));
   if ($register) {
-    echo " ".$html->link(__('Sign Up', true), 'register', array('class' => 'button'))." ";
+    echo " ".$this->Html->link(__('Sign Up', true), 'register', array('class' => 'button'))." ";
   }
-  echo "<br/>".$html->link(__('Forgot your password', true), 'password');
+  echo "<br/>".$this->Html->link(__('Forgot your password', true), 'password');
 ?>
 </div>
 <?php 
-  echo $form->end();
+  echo $this->Form->end();
   $script = <<<'JS'
 (function($) {

View/home/index.ctp

@@ -1 +1 @@
 <div id="random-media">
-<h3><?php __("Random Media"); ?></h3>
+<h3><?php echo __("Random Media"); ?></h3>
 <?php 
   if (count($randomMedia)) {
     $media = $randomMedia[0];
-    $params = '/'.$search->serialize(array('sort' => 'random'));
+    $params = '/'.$this->Search->serialize(array('sort' => 'random'));
 
-    $cite = "<cite>" . sprintf(__("%s by %s", true), h($media['Media']['name']), $html->link($media['User']['username'], '/explorer/user/' . $media['User']['username'])) . "</cite>";
+    $cite = "<cite>" . __("%s by %s", h($media['Media']['name']), $this->Html->link($media['User']['username'], '/explorer/user/' . $media['User']['username'])) . "</cite>";
 
-    echo $html->tag('div', 
-      $imageData->mediaLink($media, array('type' => 'preview', 'params' => $params, 'width' => 470)).$cite,
+    echo $this->Html->tag('div', 
+      $this->ImageData->mediaLink($media, array('type' => 'preview', 'params' => $params, 'width' => 470)).$cite,
       array('class' => 'clip', 'escape' => false));
 
-    $link = $search->getUri(array('sort' => 'random'));
-    echo "<p>" . sprintf(__("See more %s", true), $html->link(__('random media...', true), $link))."</p>";
+    $link = $this->Search->getUri(array('sort' => 'random'));
+    echo "<p>" . __("See more %s", $this->Html->link(__('random media...', true), $link))."</p>";
   } 
 ?>
@@ -19 +19 @@
 
 <div id="newest-media">
-<h3><?php __("Newest Media"); ?></h3>
+<h3><?php echo __("Newest Media"); ?></h3>
 <?php
   $links = array();
@@ -29 +29 @@
     }
     $pos = $i + 1;
-    $page = ceil($pos / $search->getShow(12));
-    $params = '/'.$search->serialize(array('sort' => 'newest', 'page' => $page, 'pos' => $pos), false, false, array('defaults' => array('pos' => 1)));
-    $links[] = $imageData->mediaLink($newMedia[$i], array('type' => 'mini', 'params' => $params));
+    $page = ceil($pos / $this->Search->getShow(12));
+    $params = '/'.$this->Search->serialize(array('sort' => 'newest', 'page' => $page, 'pos' => $pos), false, false, array('defaults' => array('pos' => 1)));
+    $links[] = $this->ImageData->mediaLink($newMedia[$i], array('type' => 'mini', 'params' => $params));
   }
-  echo $html->tag('div', implode("\n", $links), array('class' => 'images', 'escape' => false));
-  $link = $search->getUri(array('sort' => 'newest'));
-  echo "<p>" . sprintf(__("See %s", true), $html->link(__('all new media...', true), $link))."</p>";
+  echo $this->Html->tag('div', implode("\n", $links), array('class' => 'images', 'escape' => false));
+  $link = $this->Search->getUri(array('sort' => 'newest'));
+  echo "<p>" . __("See %s", $this->Html->link(__('all new media...', true), $link))."</p>";
 ?>
 </div>
 
 <div id="recent-comments">
-<h3><?php __("Recent Comments"); ?></h3>
+<h3><?php echo __("Recent Comments"); ?></h3>
 <?php if ($comments): ?>
 <div class="comments">
@@ -46 +46 @@
 <?php foreach ($comments as $comment): ?>
 <div class="comment <?php echo ($count++ % 2) ? 'even' : 'odd'; ?>">
-<?php echo $imageData->mediaLink($comment, array('type' => 'mini', 'div' => 'image')); ?>
+<?php echo $this->ImageData->mediaLink($comment, array('type' => 'mini', 'div' => 'image')); ?>
 <div class="meta">
 <span class="from"><?php echo $comment['Comment']['name'] ?></span> said 
@@ -58 +58 @@
 <?php endforeach; /* comments */ ?>
 </div><!-- comments -->
-<p><?php echo $html->link(__("Older comments...", true), "/comments", array('escape' => false));?></p>
+<p><?php echo $this->Html->link(__("Older comments..."), "/comments", array('escape' => false));?></p>
 <?php endif; ?>    
 </div>
 
 <div id="tag-cloud">
-<h3><?php __("Popular Tags"); ?></h3>
+<h3><?php echo __("Popular Tags"); ?></h3>
 <div class="cloud">
 <?php
 if (isset($cloudTags) && count($cloudTags)) {
-  echo $cloud->cloud($cloudTags, '/explorer/tag/');
+  echo $this->Cloud->cloud($cloudTags, '/explorer/tag/');
 } else {
   echo '<p>' . __("No tags assigned") . '</p>';
@@ -75 +75 @@
 
 <div id="category-cloud">
-<h3><?php __("Popular Categories"); ?></h3>
+<h3><?php echo __("Popular Categories"); ?></h3>
 <div class="cloud">
 <?php
 if (isset($cloudCategories) && count($cloudCategories)) {
-  echo $cloud->cloud($cloudCategories, '/explorer/category/');
+  echo $this->Cloud->cloud($cloudCategories, '/explorer/category/');
 } else {
   echo '<p>' . __("No categories assigned") . '</p>';