Schlaefer / Saito

app/Model/UserIgnore.php

Doc Comments +12 added lines, -2 removed lines

@@ -29,6 +29,10 @@ 
 		 */
 		public $duration = 8035200;
 
+		/**
+		 * @param integer $userId
+		 * @param integer $blockedUserId
+		 */
 		public function ignore($userId, $blockedUserId) {
 			$exists = $this->_get($userId, $blockedUserId);
 			if ($exists) {
@@ -62,6 +66,9 @@ 
 			]);
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		public function ignoredBy($id) {
 			return $this->find(
 				'all',
@@ -72,6 +79,9 @@ 
 			);
 		}
 
+		/**
+		 * @param integer $userId
+		 */
 		public function deleteUser($userId) {
 			$success = $this->deleteAll(['user_id' => $userId], false);
 			$success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
@@ -81,8 +91,8 @@ 
 		/**
 		 * counts how many users ignore the user with ID $id
 		 *
-		 * @param $id
-		 * @return array
+		 * @param integer $id
+		 * @return integer
 		 */
 		public function countIgnored($id) {
 			return count($this->getIgnored($id));

Indentation +92 added lines, -92 removed lines

@@ -1,108 +1,108 @@
 <?php
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
-	class UserIgnore extends AppModel {
+    class UserIgnore extends AppModel {
 
-		public $actsAs = [
-			'Containable',
-			'Cron.Cron' => [
-					'removeOld' => [
-							'id' => 'UserIgnore.removeOld',
-							'due' => 'daily',
-					]
-			]
-		];
+        public $actsAs = [
+            'Containable',
+            'Cron.Cron' => [
+                    'removeOld' => [
+                            'id' => 'UserIgnore.removeOld',
+                            'due' => 'daily',
+                    ]
+            ]
+        ];
 
-		public $belongsTo = [
-			'User' => [
-				'className' => 'User',
-				'counterCache' => true,
-				'fields' => ['id', 'username'],
-				'foreignKey' => 'blocked_user_id',
-				'order' => ['User.username' => 'asc']
-			]
-		];
+        public $belongsTo = [
+            'User' => [
+                'className' => 'User',
+                'counterCache' => true,
+                'fields' => ['id', 'username'],
+                'foreignKey' => 'blocked_user_id',
+                'order' => ['User.username' => 'asc']
+            ]
+        ];
 
-		/**
-		 * @var int 3 months
-		 */
-		public $duration = 8035200;
+        /**
+         * @var int 3 months
+         */
+        public $duration = 8035200;
 
-		public function ignore($userId, $blockedUserId) {
-			$exists = $this->_get($userId, $blockedUserId);
-			if ($exists) {
-				return;
-			}
-			$this->create();
-			$this->save([
-				'user_id' => $userId,
-				'blocked_user_id' => $blockedUserId,
-				'timestamp' => bDate()
-			]);
+        public function ignore($userId, $blockedUserId) {
+            $exists = $this->_get($userId, $blockedUserId);
+            if ($exists) {
+                return;
+            }
+            $this->create();
+            $this->save([
+                'user_id' => $userId,
+                'blocked_user_id' => $blockedUserId,
+                'timestamp' => bDate()
+            ]);
 
-			$this->_dispatchEvent('Event.Saito.User.afterIgnore', [
-				'blockedUserId' => $blockedUserId,
-				'userId' => $userId
-			]);
-		}
+            $this->_dispatchEvent('Event.Saito.User.afterIgnore', [
+                'blockedUserId' => $blockedUserId,
+                'userId' => $userId
+            ]);
+        }
 
-		public function unignore($userId, $blockedId) {
-			$entry = $this->_get($userId, $blockedId);
-			if (empty($entry)) {
-				return;
-			}
-			$this->delete($entry['Ignore']['id']);
-		}
+        public function unignore($userId, $blockedId) {
+            $entry = $this->_get($userId, $blockedId);
+            if (empty($entry)) {
+                return;
+            }
+            $this->delete($entry['Ignore']['id']);
+        }
 
-		protected function _get($userId, $blockedId) {
-			return $this->find('first', [
-				'contain' => false,
-				'conditions' => ['user_id' => $userId, 'blocked_user_id' => $blockedId]
-			]);
-		}
+        protected function _get($userId, $blockedId) {
+            return $this->find('first', [
+                'contain' => false,
+                'conditions' => ['user_id' => $userId, 'blocked_user_id' => $blockedId]
+            ]);
+        }
 
-		public function ignoredBy($id) {
-			return $this->find(
-				'all',
-				[
-					'contain' => ['User'],
-					'conditions' => ['user_id' => $id]
-				]
-			);
-		}
+        public function ignoredBy($id) {
+            return $this->find(
+                'all',
+                [
+                    'contain' => ['User'],
+                    'conditions' => ['user_id' => $id]
+                ]
+            );
+        }
 
-		public function deleteUser($userId) {
-			$success = $this->deleteAll(['user_id' => $userId], false);
-			$success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
-			return $success;
-		}
+        public function deleteUser($userId) {
+            $success = $this->deleteAll(['user_id' => $userId], false);
+            $success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
+            return $success;
+        }
 
-		/**
-		 * counts how many users ignore the user with ID $id
-		 *
-		 * @param $id
-		 * @return array
-		 */
-		public function countIgnored($id) {
-			return count($this->getIgnored($id));
-		}
+        /**
+         * counts how many users ignore the user with ID $id
+         *
+         * @param $id
+         * @return array
+         */
+        public function countIgnored($id) {
+            return count($this->getIgnored($id));
+        }
 
-		public function getIgnored($id) {
-			return $this->find(
-				'all',
-				[
-					'contain' => false,
-					'conditions' => ['blocked_user_id' => $id]
-				]
-			);
-		}
+        public function getIgnored($id) {
+            return $this->find(
+                'all',
+                [
+                    'contain' => false,
+                    'conditions' => ['blocked_user_id' => $id]
+                ]
+            );
+        }
 
-		public function removeOld() {
-			$this->deleteAll([
-					'timestamp <' => bDate(time() - $this->duration)
-				],
-				false);
-		}
+        public function removeOld() {
+            $this->deleteAll([
+                    'timestamp <' => bDate(time() - $this->duration)
+                ],
+                false);
+        }
 
-	}
+    }

app/Plugin/Embedly/Vendor/Embedly.php

Doc Comments +3 added lines, -3 removed lines

@@ -169,7 +169,7 @@ 
     /**
      *
      * @param string $version
-     * @param array $action
+     * @param string $action
      * @param array $params
      * @return object
      */
@@ -291,7 +291,7 @@ 
     /**
      *
      * @param resource $ch
-     * @param array $headers
+     * @param string[] $headers
      * @return void
      */
     protected function setCurlOptions(&$ch, $headers = array())
@@ -333,7 +333,7 @@ 
 
     /**
      *
-     * @param stdClass $o
+     * @param \stdClass $o
      * @return string
      */
     public static function reg_imploder(\stdClass $o)

Indentation +4 added lines, -4 removed lines

@@ -274,10 +274,10 @@
      * @return string
      */
     public function services_regex() {
-    	$services = $this->services();
-    	$regexes = array_map(array(__CLASS__, 'reg_imploder'), $services);
-    	return '#'.implode('|', $regexes).'#i';
-	}
+        $services = $this->services();
+        $regexes = array_map(array(__CLASS__, 'reg_imploder'), $services);
+        return '#'.implode('|', $regexes).'#i';
+    }
 
     /**
      *

Spacing +3 added lines, -3 removed lines

@@ -202,7 +202,7 @@ 
                 if (!$match) {
                     //print("rejecting $url");
                     unset($params['urls'][$i]);
-                    $rejects[$i] = (object)array(
+                    $rejects[$i] = (object) array(
                         'error_code' => '401',
                         'error_message' => 'This service requires an Embedly key',
                         'type' => 'error'
@@ -243,7 +243,7 @@ 
             array_push($merged_result, $obj);
         }
 
-        if($justone) {
+        if ($justone) {
             return array_shift($merged_result);
         }
 
@@ -365,7 +365,7 @@ 
      */
     public static function paramify($input)
     {
-        if(is_string($input)) {
+        if (is_string($input)) {
             return array('urls' => $input);
         }
 

app/Plugin/FileUpload/Vendor/uploader.php

Doc Comments +3 added lines, -2 removed lines

@@ -94,6 +94,7 @@ 
     * Preform requested target patch checks depending on the unique setting
     *
     * @var string chosen filename target_path
+    * @param string $target_path
     * @return string of resulting target_path
     * @access private
     */
@@ -217,7 +218,7 @@ 
   /**
     * Checks if there is a file uploaded
     *
-    * @return void
+    * @return boolean
     * @access public
     * @param file array of uploaded file (optional)
     */
@@ -293,7 +294,7 @@ 
   }
 
   /**
-    * @return boolean true if errors were detected.
+    * @return integer true if errors were detected.
     */
   function hasErrors(){
     return count($this->errors);

Indentation +218 added lines, -218 removed lines

@@ -1,40 +1,40 @@ 
 <?php
 /**
-  * Uploader class handles a single file to be uploaded to the file system
-  *
-  * @author: Nick Baker
-  * @version: since 6.0.0
-  * @link: http://www.webtechnick.com
-  */
+ * Uploader class handles a single file to be uploaded to the file system
+ *
+ * @author: Nick Baker
+ * @version: since 6.0.0
+ * @link: http://www.webtechnick.com
+ */
 class Uploader {
 
-  /**
-    * File to upload.
-    */
-  var $file = array();
+    /**
+     * File to upload.
+     */
+    var $file = array();
 
-  /**
-    * Global options
-    * fileTypes to allow to upload
-    */
-  var $options = array();
+    /**
+     * Global options
+     * fileTypes to allow to upload
+     */
+    var $options = array();
 
-  /**
-    * errors holds any errors that occur as string values.
-    * this can be access to debug the FileUploadComponent
-    *
-    * @var array
-    * @access public
-    */
-  var $errors = array();
+    /**
+     * errors holds any errors that occur as string values.
+     * this can be access to debug the FileUploadComponent
+     *
+     * @var array
+     * @access public
+     */
+    var $errors = array();
 
-  /**
-    * Definitions of errors that could occur during upload
-    *
-    * @author Jon Langevin
-    * @var array
-    */
-  var $uploadErrors = array(
+    /**
+     * Definitions of errors that could occur during upload
+     *
+     * @author Jon Langevin
+     * @var array
+     */
+    var $uploadErrors = array(
     UPLOAD_ERR_OK => 'There is no error, the file uploaded with success.',
     UPLOAD_ERR_INI_SIZE => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     UPLOAD_ERR_FORM_SIZE => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -43,87 +43,87 @@ 
     UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder.', //Introduced in PHP 4.3.10 and PHP 5.0.3.
     UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk.', //Introduced in PHP 5.1.0.
     UPLOAD_ERR_EXTENSION => 'File upload stopped by extension.' //Introduced in PHP 5.2.0.
-  );
+    );
 
-  /**
-    * Final file is set on move_uploaded_file success.
-    * This is the file name of the final file that was uploaded
-    * to the uploadDir directory
-    *
-    * @var string of final file name uploaded
-    * @access public
-    */
-  var $finalFile = null;
+    /**
+     * Final file is set on move_uploaded_file success.
+     * This is the file name of the final file that was uploaded
+     * to the uploadDir directory
+     *
+     * @var string of final file name uploaded
+     * @access public
+     */
+    var $finalFile = null;
 
-  function __construct($options = array()){
+    function __construct($options = array()){
     $this->options = array_merge($this->options, $options);
-  }
+    }
 
-  /**
-    * Preform requested callbacks on the filename.
-    *
-    * @var string chosen filename
-    * @return string of resulting filename
-    * @access private
-    */
-  function __handleFileNameCallback($fileName){
+    /**
+     * Preform requested callbacks on the filename.
+     *
+     * @var string chosen filename
+     * @return string of resulting filename
+     * @access private
+     */
+    function __handleFileNameCallback($fileName){
     if($this->options['fileNameFunction']){
-      if($this->options['fileModel']){
+        if($this->options['fileModel']){
         $Model = ClassRegistry::init($this->options['fileModel']);
         if(method_exists($Model, $this->options['fileNameFunction'])){
-          $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
+            $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
         }
         elseif(function_exists($this->options['fileNameFunction'])){
-          $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+            $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+        }
         }
-      }
-      else {
+        else {
         if(function_exists($this->options['fileNameFunction'])){
-          $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+            $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+        }
         }
-      }
 
-      if(!$fileName){
+        if(!$fileName){
         $this->_error('No filename resulting after parsing. Function: ' . $this->options['fileNameFunction']);
-      }
+        }
     }
     return $fileName;
-  }
+    }
 
-  /**
-    * Preform requested target patch checks depending on the unique setting
-    *
-    * @var string chosen filename target_path
-    * @return string of resulting target_path
-    * @access private
-    */
-  function __handleUnique($target_path){
+    /**
+     * Preform requested target patch checks depending on the unique setting
+     *
+     * @var string chosen filename target_path
+     * @return string of resulting target_path
+     * @access private
+     */
+    function __handleUnique($target_path){
     if($this->options['unique']){
-      $temp_path = substr($target_path, 0, strlen($target_path) - strlen($this->_ext())); //temp path without the ext
-      $i=1;
-      while(file_exists($target_path)){
+        $temp_path = substr($target_path, 0, strlen($target_path) - strlen($this->_ext())); //temp path without the ext
+        $i=1;
+        while(file_exists($target_path)){
         $target_path = $temp_path . "-" . $i . $this->_ext();
         $i++;
-      }
-		}
+        }
+        }
     return $target_path;
-  }
+    }
 
-  /**
-    * processFile will take a file, or use the current file given to it
-    * and attempt to save the file to the file system.
-    * processFile will check to make sure the file is there, and its type is allowed to be saved.
-    *
-    * @param file array of uploaded file (optional)
-    * @return String | false String of finalFile name saved to the file system or false if unable to save to file system.
-    * @access public
-    */
-  function processFile($file = null){
+    /**
+     * processFile will take a file, or use the current file given to it
+     * and attempt to save the file to the file system.
+     * processFile will check to make sure the file is there, and its type is allowed to be saved.
+     *
+     * @param file array of uploaded file (optional)
+     * @return String | false String of finalFile name saved to the file system or false if unable to save to file system.
+     * @access public
+     */
+    function processFile($file = null){
     $this->setFile($file);
 
     //check if we have a file and if we allow the type, return false otherwise.
     if(!$this->checkFile() || !$this->checkType() || !$this->checkSize()){
-      return false;
+        return false;
     }
 
     //make sure the file doesn't already exist, if it does, add an itteration to it
@@ -131,143 +131,143 @@ 
     $fileName = $this->__handleFileNameCallback($this->file['name']);
     //if callback returns false hault the upload
     if(!$fileName){
-      return false;
+        return false;
     }
     $target_path = $up_dir . DS . $fileName;
     $target_path = $this->__handleUnique($target_path);
 
     //now move the file.
     if(move_uploaded_file($this->file['tmp_name'], $target_path)){
-      $this->finalFile = basename($target_path);
-      return $this->finalFile;
+        $this->finalFile = basename($target_path);
+        return $this->finalFile;
     }
     else{
-      $this->_error('Unable to save temp file to file system.');
-      return false;
+        $this->_error('Unable to save temp file to file system.');
+        return false;
+    }
     }
-  }
 
-  /**
-    * setFile will set a this->file if given one.
-    *
-    * @param file array of uploaded file. (optional)
-    * @return void
-    */
-  function setFile($file = null){
+    /**
+     * setFile will set a this->file if given one.
+     *
+     * @param file array of uploaded file. (optional)
+     * @return void
+     */
+    function setFile($file = null){
     if($file) $this->file = $file;
-  }
+    }
 
-  /**
-    * Returns the extension of the uploaded filename.
-    *
-    * @return string $extension A filename extension
-    * @param file array of uploaded file (optional)
-    * @access protected
-    */
-  function _ext($file = null){
+    /**
+     * Returns the extension of the uploaded filename.
+     *
+     * @return string $extension A filename extension
+     * @param file array of uploaded file (optional)
+     * @access protected
+     */
+    function _ext($file = null){
     $this->setFile($file);
     return strrchr($this->file['name'],".");
-  }
+    }
 
-  /**
-  * Adds error messages to the component
-  *
-  * @param string $text String of error message to save
-  * @return void
-  * @access protected
-  */
-  function _error($text){
+    /**
+     * Adds error messages to the component
+     *
+     * @param string $text String of error message to save
+     * @return void
+     * @access protected
+     */
+    function _error($text){
     $this->errors[] = __($text);
-  }
+    }
 
-  /**
-  * Checks if the uploaded type is allowed defined in the allowedTypes
-  *
-  * @return boolean if type is accepted
-  * @param file array of uploaded file (optional)
-  * @access public
-  */
-  function checkType($file = null){
+    /**
+     * Checks if the uploaded type is allowed defined in the allowedTypes
+     *
+     * @return boolean if type is accepted
+     * @param file array of uploaded file (optional)
+     * @access public
+     */
+    function checkType($file = null){
     $this->setFile($file);
     foreach($this->options['allowedTypes'] as $ext => $types){
-      if(!is_string($ext)){
+        if(!is_string($ext)){
         $ext = $types;
-      }
-      if($ext == '*'){
+        }
+        if($ext == '*'){
         return true;
-      }
+        }
 
-      $ext = strtolower('.' . str_replace('.','', $ext));
-      $file_ext = strtolower($this->_ext());
-      if($file_ext == $ext){
+        $ext = strtolower('.' . str_replace('.','', $ext));
+        $file_ext = strtolower($this->_ext());
+        if($file_ext == $ext){
         if(is_array($types) && !in_array($this->file['type'], $types)){
-          $this->_error("{$this->file['type']} is not an allowed type.");
-          return false;
+            $this->_error("{$this->file['type']} is not an allowed type.");
+            return false;
         }
         else {
-          return true;
+            return true;
+        }
         }
-      }
     }
 
     $this->_error("Extension is not allowed.");
     return false;
-  }
+    }
 
-  /**
-    * Checks if there is a file uploaded
-    *
-    * @return void
-    * @access public
-    * @param file array of uploaded file (optional)
-    */
-  function checkFile($file = null){
+    /**
+     * Checks if there is a file uploaded
+     *
+     * @return void
+     * @access public
+     * @param file array of uploaded file (optional)
+     */
+    function checkFile($file = null){
     $this->setFile($file);
     if($this->hasUpload() && $this->file){
-      if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
+        if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+        }
+        else {
         $this->_error($this->uploadErrors[$this->file['error']]);
-      }
+        }
     }
     return false;
-  }
+    }
 
-  /**
-    * Checks if the file uploaded exceeds the maxFileSize setting (if there is onw)
-    *
-    * @return boolean
-    * @access public
-    * @param file array of uploaded file (optional)
-    */
-  function checkSize($file = null){
+    /**
+     * Checks if the file uploaded exceeds the maxFileSize setting (if there is onw)
+     *
+     * @return boolean
+     * @access public
+     * @param file array of uploaded file (optional)
+     */
+    function checkSize($file = null){
     $this->setFile($file);
     if($this->hasUpload() && $this->file){
-      if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
+        if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
         return true;
-      }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+        }
+        elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
         return true;
-      }
-      else {
+        }
+        else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
-				$this->_error("File exceeds size limit.");
-      }
+                $this->_error("File exceeds size limit.");
+        }
     }
     return false;
-  }
+    }
 
-  /**
-    * removeFile removes a specific file from the uploaded directory
-    *
-    * @param string $name A reference to the filename to delete from the uploadDirectory
-    * @return boolean
-    * @access public
-    */
-  function removeFile($name = null){
+    /**
+     * removeFile removes a specific file from the uploaded directory
+     *
+     * @param string $name A reference to the filename to delete from the uploadDirectory
+     * @return boolean
+     * @access public
+     */
+    function removeFile($name = null){
     if(!$name || strpos($name, '://')){
-      return false;
+        return false;
     }
 
     $up_dir = $this->options['uploadDir'];
@@ -275,70 +275,70 @@ 
 
     //delete main image -- $name
     if(@unlink($target_path)){
-      return true;
+        return true;
     } else {
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-    * hasUpload
-    *
-    * @return boolean true | false depending if a file was actually uploaded.
-    * @param file array of uploaded file (optional)
-    */
-  function hasUpload($file = null){
+    /**
+     * hasUpload
+     *
+     * @return boolean true | false depending if a file was actually uploaded.
+     * @param file array of uploaded file (optional)
+     */
+    function hasUpload($file = null){
     $this->setFile($file);
     return ($this->_multiArrayKeyExists("tmp_name", $this->file));
-  }
+    }
 
-  /**
-    * @return boolean true if errors were detected.
-    */
-  function hasErrors(){
+    /**
+     * @return boolean true if errors were detected.
+     */
+    function hasErrors(){
     return count($this->errors);
-  }
+    }
 
-  /**
-    * showErrors itterates through the errors array
-    * and returns a concatinated string of errors sepearated by
-    * the $sep
-    *
-    * @param string $sep A seperated defaults to <br />
-    * @return string
-    * @access public
-    */
-  function showErrors($sep = " "){
+    /**
+     * showErrors itterates through the errors array
+     * and returns a concatinated string of errors sepearated by
+     * the $sep
+     *
+     * @param string $sep A seperated defaults to <br />
+     * @return string
+     * @access public
+     */
+    function showErrors($sep = " "){
     $retval = "";
     foreach($this->errors as $error){
-      $retval .= "$error $sep";
+        $retval .= "$error $sep";
     }
     return $retval;
-  }
+    }
 
-  /**
-    * Searches through the $haystack for a $key.
-    *
-    * @param string $needle String of key to search for in $haystack
-    * @param array $haystack Array of which to search for $needle
-    * @return boolean true if given key is in an array
-    * @access protected
-    */
-  function _multiArrayKeyExists($needle, $haystack) {
+    /**
+     * Searches through the $haystack for a $key.
+     *
+     * @param string $needle String of key to search for in $haystack
+     * @param array $haystack Array of which to search for $needle
+     * @return boolean true if given key is in an array
+     * @access protected
+     */
+    function _multiArrayKeyExists($needle, $haystack) {
     if(is_array($haystack)){
-      foreach ($haystack as $key=>$value) {
+        foreach ($haystack as $key=>$value) {
         if ($needle===$key && $value) {
-          return true;
+            return true;
         }
         if (is_array($value)) {
-          if($this->_multiArrayKeyExists($needle, $value)){
+            if($this->_multiArrayKeyExists($needle, $value)){
             return true;
-          }
+            }
+        }
         }
-      }
     }
     return false;
-  }
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +50 added lines, -50 removed lines

@@ -55,7 +55,7 @@ 
     */
   var $finalFile = null;
 
-  function __construct($options = array()){
+  function __construct($options = array()) {
     $this->options = array_merge($this->options, $options);
   }
 
@@ -66,25 +66,25 @@ 
     * @return string of resulting filename
     * @access private
     */
-  function __handleFileNameCallback($fileName){
-    if($this->options['fileNameFunction']){
-      if($this->options['fileModel']){
+  function __handleFileNameCallback($fileName) {
+    if ($this->options['fileNameFunction']) {
+      if ($this->options['fileModel']) {
         $Model = ClassRegistry::init($this->options['fileModel']);
-        if(method_exists($Model, $this->options['fileNameFunction'])){
+        if (method_exists($Model, $this->options['fileNameFunction'])) {
           $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
         }
-        elseif(function_exists($this->options['fileNameFunction'])){
+        elseif (function_exists($this->options['fileNameFunction'])) {
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
       }
       else {
-        if(function_exists($this->options['fileNameFunction'])){
+        if (function_exists($this->options['fileNameFunction'])) {
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
       }
 
-      if(!$fileName){
-        $this->_error('No filename resulting after parsing. Function: ' . $this->options['fileNameFunction']);
+      if (!$fileName) {
+        $this->_error('No filename resulting after parsing. Function: '.$this->options['fileNameFunction']);
       }
     }
     return $fileName;
@@ -97,12 +97,12 @@ 
     * @return string of resulting target_path
     * @access private
     */
-  function __handleUnique($target_path){
-    if($this->options['unique']){
+  function __handleUnique($target_path) {
+    if ($this->options['unique']) {
       $temp_path = substr($target_path, 0, strlen($target_path) - strlen($this->_ext())); //temp path without the ext
-      $i=1;
-      while(file_exists($target_path)){
-        $target_path = $temp_path . "-" . $i . $this->_ext();
+      $i = 1;
+      while (file_exists($target_path)) {
+        $target_path = $temp_path."-".$i.$this->_ext();
         $i++;
       }
 		}
@@ -118,11 +118,11 @@ 
     * @return String | false String of finalFile name saved to the file system or false if unable to save to file system.
     * @access public
     */
-  function processFile($file = null){
+  function processFile($file = null) {
     $this->setFile($file);
 
     //check if we have a file and if we allow the type, return false otherwise.
-    if(!$this->checkFile() || !$this->checkType() || !$this->checkSize()){
+    if (!$this->checkFile() || !$this->checkType() || !$this->checkSize()) {
       return false;
     }
 
@@ -130,18 +130,18 @@ 
     $up_dir = $this->options['uploadDir'];
     $fileName = $this->__handleFileNameCallback($this->file['name']);
     //if callback returns false hault the upload
-    if(!$fileName){
+    if (!$fileName) {
       return false;
     }
-    $target_path = $up_dir . DS . $fileName;
+    $target_path = $up_dir.DS.$fileName;
     $target_path = $this->__handleUnique($target_path);
 
     //now move the file.
-    if(move_uploaded_file($this->file['tmp_name'], $target_path)){
+    if (move_uploaded_file($this->file['tmp_name'], $target_path)) {
       $this->finalFile = basename($target_path);
       return $this->finalFile;
     }
-    else{
+    else {
       $this->_error('Unable to save temp file to file system.');
       return false;
     }
@@ -153,8 +153,8 @@ 
     * @param file array of uploaded file. (optional)
     * @return void
     */
-  function setFile($file = null){
-    if($file) $this->file = $file;
+  function setFile($file = null) {
+    if ($file) $this->file = $file;
   }
 
   /**
@@ -164,9 +164,9 @@ 
     * @param file array of uploaded file (optional)
     * @access protected
     */
-  function _ext($file = null){
+  function _ext($file = null) {
     $this->setFile($file);
-    return strrchr($this->file['name'],".");
+    return strrchr($this->file['name'], ".");
   }
 
   /**
@@ -176,7 +176,7 @@ 
   * @return void
   * @access protected
   */
-  function _error($text){
+  function _error($text) {
     $this->errors[] = __($text);
   }
 
@@ -187,20 +187,20 @@ 
   * @param file array of uploaded file (optional)
   * @access public
   */
-  function checkType($file = null){
+  function checkType($file = null) {
     $this->setFile($file);
-    foreach($this->options['allowedTypes'] as $ext => $types){
-      if(!is_string($ext)){
+    foreach ($this->options['allowedTypes'] as $ext => $types) {
+      if (!is_string($ext)) {
         $ext = $types;
       }
-      if($ext == '*'){
+      if ($ext == '*') {
         return true;
       }
 
-      $ext = strtolower('.' . str_replace('.','', $ext));
+      $ext = strtolower('.'.str_replace('.', '', $ext));
       $file_ext = strtolower($this->_ext());
-      if($file_ext == $ext){
-        if(is_array($types) && !in_array($this->file['type'], $types)){
+      if ($file_ext == $ext) {
+        if (is_array($types) && !in_array($this->file['type'], $types)) {
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
         }
@@ -221,10 +221,10 @@ 
     * @access public
     * @param file array of uploaded file (optional)
     */
-  function checkFile($file = null){
+  function checkFile($file = null) {
     $this->setFile($file);
-    if($this->hasUpload() && $this->file){
-      if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
+    if ($this->hasUpload() && $this->file) {
+      if (isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK) {
         return true;
       }
       else {
@@ -241,13 +241,13 @@ 
     * @access public
     * @param file array of uploaded file (optional)
     */
-  function checkSize($file = null){
+  function checkSize($file = null) {
     $this->setFile($file);
-    if($this->hasUpload() && $this->file){
-      if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
+    if ($this->hasUpload() && $this->file) {
+      if (!$this->options['maxFileSize']) { //We don't want to test maxFileSize
         return true;
       }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+      elseif ($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']) {
         return true;
       }
       else {
@@ -265,16 +265,16 @@ 
     * @return boolean
     * @access public
     */
-  function removeFile($name = null){
-    if(!$name || strpos($name, '://')){
+  function removeFile($name = null) {
+    if (!$name || strpos($name, '://')) {
       return false;
     }
 
     $up_dir = $this->options['uploadDir'];
-    $target_path = $up_dir . DS . $name;
+    $target_path = $up_dir.DS.$name;
 
     //delete main image -- $name
-    if(@unlink($target_path)){
+    if (@unlink($target_path)) {
       return true;
     } else {
       return false;
@@ -287,7 +287,7 @@ 
     * @return boolean true | false depending if a file was actually uploaded.
     * @param file array of uploaded file (optional)
     */
-  function hasUpload($file = null){
+  function hasUpload($file = null) {
     $this->setFile($file);
     return ($this->_multiArrayKeyExists("tmp_name", $this->file));
   }
@@ -295,7 +295,7 @@ 
   /**
     * @return boolean true if errors were detected.
     */
-  function hasErrors(){
+  function hasErrors() {
     return count($this->errors);
   }
 
@@ -308,9 +308,9 @@ 
     * @return string
     * @access public
     */
-  function showErrors($sep = " "){
+  function showErrors($sep = " ") {
     $retval = "";
-    foreach($this->errors as $error){
+    foreach ($this->errors as $error) {
       $retval .= "$error $sep";
     }
     return $retval;
@@ -325,13 +325,13 @@ 
     * @access protected
     */
   function _multiArrayKeyExists($needle, $haystack) {
-    if(is_array($haystack)){
+    if (is_array($haystack)) {
       foreach ($haystack as $key=>$value) {
-        if ($needle===$key && $value) {
+        if ($needle === $key && $value) {
           return true;
         }
         if (is_array($value)) {
-          if($this->_multiArrayKeyExists($needle, $value)){
+          if ($this->_multiArrayKeyExists($needle, $value)) {
             return true;
           }
         }

Braces +10 added lines, -15 removed lines

@@ -72,12 +72,10 @@ 
         $Model = ClassRegistry::init($this->options['fileModel']);
         if(method_exists($Model, $this->options['fileNameFunction'])){
           $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
-        }
-        elseif(function_exists($this->options['fileNameFunction'])){
+        } elseif(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
-      }
-      else {
+      } else {
         if(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
@@ -140,8 +138,7 @@ 
     if(move_uploaded_file($this->file['tmp_name'], $target_path)){
       $this->finalFile = basename($target_path);
       return $this->finalFile;
-    }
-    else{
+    } else{
       $this->_error('Unable to save temp file to file system.');
       return false;
     }
@@ -154,7 +151,9 @@ 
     * @return void
     */
   function setFile($file = null){
-    if($file) $this->file = $file;
+    if($file) {
+        $this->file = $file;
+    }
   }
 
   /**
@@ -203,8 +202,7 @@ 
         if(is_array($types) && !in_array($this->file['type'], $types)){
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
-        }
-        else {
+        } else {
           return true;
         }
       }
@@ -226,8 +224,7 @@ 
     if($this->hasUpload() && $this->file){
       if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+      } else {
         $this->_error($this->uploadErrors[$this->file['error']]);
       }
     }
@@ -246,11 +243,9 @@ 
     if($this->hasUpload() && $this->file){
       if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
         return true;
-      }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+      } elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
         return true;
-      }
-      else {
+      } else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
 				$this->_error("File exceeds size limit.");
       }

app/Plugin/FileUpload/View/Helper/FileUploadHelper.php

Doc Comments +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
     * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
     *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
     * @access public
-    * @return mixed html tag, url string, or false if unable to find image.
+    * @return string|false html tag, url string, or false if unable to find image.
     */
   function image($name, $options = array()){
     $this->fileName = $name;
@@ -329,7 +329,7 @@ 
 		 * Constructor
 		 *
 		 * @param [String $imgFile] Image File Name
-		 * @return RESIZEIMAGE (Class Object)
+		 * @return false|null (Class Object)
 		 */
 		function __construct($imgFile=""){
 			if (!function_exists("imagecreate")){
@@ -356,7 +356,7 @@ 
 		 * Set image file name
 		 *
 		 * @param String $imgFile
-		 * @return void
+		 * @return boolean
 		 */
 		function setImage($imgFile){
 			$this->imgFile=$imgFile;
@@ -374,7 +374,7 @@ 
 		 * Resize a image to given width and height and keep it's current width and height ratio
 		 *
 		 * @param Number $imgwidth
-		 * @param Numnber $imgheight
+		 * @param integer $imgheight
 		 * @param String $newfile
 		 */
 		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
@@ -394,9 +394,9 @@ 
     /**
 		 * Resize an image to given percentage.
 		 *
-		 * @param Number $percent
+		 * @param integer $percent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_percentage($percent=100,$newfile=NULL)	{
 			$newWidth=($this->imgWidth*$percent)/100;
@@ -407,10 +407,10 @@ 
     /**
 		 * Resize an image to given X and Y percentage.
 		 *
-		 * @param Number $xpercent
-		 * @param Number $ypercent
+		 * @param integer $xpercent
+		 * @param integer $ypercent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
 			$newWidth=($this->imgWidth*$xpercent)/100;
@@ -421,10 +421,10 @@ 
 		/**
 		 * Resize an image to given width and height
 		 *
-		 * @param Number $width
-		 * @param Number $height
+		 * @param integer $width
+		 * @param integer $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize($width,$height,$newfile=NULL){
 			if(empty($this->imgFile)){
@@ -483,7 +483,7 @@ 
 		 * @param Number $width
 		 * @param Number $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function _resize($width,$height,$newfile=NULL){
 			if (!function_exists("imagecreate")){

Indentation +426 added lines, -426 removed lines

@@ -1,160 +1,160 @@ 
 <?php
 /**
-  * FileUPloadHelper is the helper to the component FileUploadComponent.
-  * This helper REQUIRES the FileUploadComponent.
-  *
-  * @author: Nick Baker
-  * @version: 6.1.1
-  * @email: nick@webtechnick.com
-  * @link: http://www.webtechnick.com/blogs/view/221/CakePHP_File_Upload_Plugin
-  *
-  * @example
-  *      Show an already uploaded image
-  *      $fileUpload->image('filename.jpg', array('width' => 250)); //resizes a thumbnail of 'filename.jpg' to 250
-  *      $fileUpload->image('filename.jpg', array('width' => 250, 'uploadDir' => 'custom/dir')); //resizes a thumbnail of 'webroot/custom/dir/filename.jpg' to 250
-  *
-  *      Show the upload field form
-  *      $fileUpload->input(); //builds the input form based on your FileUploadComponent defaults
-  *           -or-
-  *      $fileUpload->input(array('var' => 'fileVar', 'model' => 'Picture')); //customized input form.
-  *
-  */
+ * FileUPloadHelper is the helper to the component FileUploadComponent.
+ * This helper REQUIRES the FileUploadComponent.
+ *
+ * @author: Nick Baker
+ * @version: 6.1.1
+ * @email: nick@webtechnick.com
+ * @link: http://www.webtechnick.com/blogs/view/221/CakePHP_File_Upload_Plugin
+ *
+ * @example
+ *      Show an already uploaded image
+ *      $fileUpload->image('filename.jpg', array('width' => 250)); //resizes a thumbnail of 'filename.jpg' to 250
+ *      $fileUpload->image('filename.jpg', array('width' => 250, 'uploadDir' => 'custom/dir')); //resizes a thumbnail of 'webroot/custom/dir/filename.jpg' to 250
+ *
+ *      Show the upload field form
+ *      $fileUpload->input(); //builds the input form based on your FileUploadComponent defaults
+ *           -or-
+ *      $fileUpload->input(array('var' => 'fileVar', 'model' => 'Picture')); //customized input form.
+ *
+ */
 App::import('Config', 'FileUpload.file_upload_settings');
 class FileUploadHelper extends AppHelper{
-  var $helpers = array('Html', 'Form');
-
-  /**
-    * the name of the file passed in.
-    */
-  var $fileName = NULL;
-
-  /**
-    * Holds the FileUpload component
-    */
-  var $FileUpload = NULL;
-
-  /**
-    * Counts the number of inputs, for multiple fileUpload inputing.
-    */
-  var $inputCount = 0;
-
-  /**
-    * Default options for showImage
-    *
-    * - width: the width of the image to display (0 means no resizing (default))
-    * - resizedDir: is the directory in which to save the resized files into (resized by default)
-    * - imagePathOnly: will only return the requested image_path (false by default)
-    * - autoResize: will resize the file automatically if given a valid width. (true by default)
-    * - resizeThumbOnly: will only resize the image down -- not up past the original's size (true by default)
-    */
-  var $options = array(
+    var $helpers = array('Html', 'Form');
+
+    /**
+     * the name of the file passed in.
+     */
+    var $fileName = NULL;
+
+    /**
+     * Holds the FileUpload component
+     */
+    var $FileUpload = NULL;
+
+    /**
+     * Counts the number of inputs, for multiple fileUpload inputing.
+     */
+    var $inputCount = 0;
+
+    /**
+     * Default options for showImage
+     *
+     * - width: the width of the image to display (0 means no resizing (default))
+     * - resizedDir: is the directory in which to save the resized files into (resized by default)
+     * - imagePathOnly: will only return the requested image_path (false by default)
+     * - autoResize: will resize the file automatically if given a valid width. (true by default)
+     * - resizeThumbOnly: will only resize the image down -- not up past the original's size (true by default)
+     */
+    var $options = array(
     'width' => 0, //0 means no resizing
     'resizedDir' => 'resized', // make sure webroot/files/resized is chmod 777
     'imagePathOnly' => false, //if true, will only return the requested image_path
     'autoResize' => true, //if true, will resize the file automatically if given a valid width.
     'resizeThumbOnly' => true //if true, will only resize the image down -- not up past the original's size
-  );
-
-  /**
-    * FileUpload Settings set in config/file_upload_settings.php
-    */
-  var $settings = array();
-
-  /**
-    * Constructor, initiallizes the FileUpload Component
-    * and sets the default options.
-    */
-  function __construct(View $View, $settings = array()){
-		parent::__construct($View, $settings);
+    );
+
+    /**
+     * FileUpload Settings set in config/file_upload_settings.php
+     */
+    var $settings = array();
+
+    /**
+     * Constructor, initiallizes the FileUpload Component
+     * and sets the default options.
+     */
+    function __construct(View $View, $settings = array()){
+        parent::__construct($View, $settings);
     $this->FileUploadSettings = new FileUploadSettings;
 
     //setup settings
     $this->settings = array_merge($this->FileUploadSettings->defaults, $this->options);
-  }
-
-  /**
-    * Reset the helper to its initial state
-    * @access public
-    * @return void
-    */
-  function reset(){
+    }
+
+    /**
+     * Reset the helper to its initial state
+     * @access public
+     * @return void
+     */
+    function reset(){
     $this->fileName = null;
     $this->options = array(
-      'width' => 0,
-      'resizedDir' => 'resized',
-      'imagePathOnly' => false,
-      'autoResize' => true,
-      'resizeThumbOnly' => true
+        'width' => 0,
+        'resizedDir' => 'resized',
+        'imagePathOnly' => false,
+        'autoResize' => true,
+        'resizeThumbOnly' => true
     );
 
     //setup settings
     $this->settings = array_merge($this->FileUploadSettings->defaults, $this->options);
     unset($this->newImage);
-  }
-
-  /**
-    * image takes a file_name or Upload.id and returns the HTML image
-    *
-    * @param String|Int $name takes a file_name or ID of uploaded file.
-    * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
-    *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
-    * @access public
-    * @return mixed html tag, url string, or false if unable to find image.
-    */
-  function image($name, $options = array()){
+    }
+
+    /**
+     * image takes a file_name or Upload.id and returns the HTML image
+     *
+     * @param String|Int $name takes a file_name or ID of uploaded file.
+     * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
+     *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
+     * @access public
+     * @return mixed html tag, url string, or false if unable to find image.
+     */
+    function image($name, $options = array()){
     $this->fileName = $name;
     //options takes in a width as well
     if(is_int($options)){
-      $width = $options;
-      $options = array();
-      $options['width'] = $width;
+        $width = $options;
+        $options = array();
+        $options['width'] = $width;
     }
     $this->options = array_merge($this->options, $options);
     $this->settings = array_merge($this->settings, $options);
 
     $img = false;
     if(is_string($name)){
-      $img = $this->_getImageByName();
+        $img = $this->_getImageByName();
     }
     elseif(is_int($name)){
-      $img = $this->_getImageById();
+        $img = $this->_getImageById();
     }
 
     if($img){
-      return $img;
+        return $img;
     }
 
     // $this->log("Unable to find $img");
     return false;
-  }
-
-  /**
-    * input takes an array of options and display the file browser html input
-    * options.
-    * @param Array $options of model and file options.  Defaults to default FileUpload component configuration
-    * @return String HTML form input element configured for the FileUploadComponent
-    * @access public
-    */
-  function input($options = array()){
+    }
+
+    /**
+     * input takes an array of options and display the file browser html input
+     * options.
+     * @param Array $options of model and file options.  Defaults to default FileUpload component configuration
+     * @return String HTML form input element configured for the FileUploadComponent
+     * @access public
+     */
+    function input($options = array()){
     $options = array_merge(
-      array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
-      $options
+        array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
+        $options
     );
     $configs = $options;
     if($configs['model']){
-      unset($options['model'], $options['var']);
+        unset($options['model'], $options['var']);
 
-      return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
+        return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
     }
     else {
-      return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
+        return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
+    }
     }
-  }
 
-  /**
-    * @access protected
-    */
-  function _getImageById(){
+    /**
+     * @access protected
+     */
+    function _getImageById(){
     App::import('Component', 'FileUpload.FileUpload');
     $this->FileUpload = new FileUploadComponent;
 
@@ -164,121 +164,121 @@ 
     $Model->recursive = -1;
     $upload = $Model->findById($id);
     if(!empty($upload)){
-      $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
-      return $this->_getImageByName();
+        $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
+        return $this->_getImageByName();
     }
     else{
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-    * _getFullPath returns the full path of the file name
-    * @access protected
-    * @return String full path of the file name
-    */
-  function _getFullPath(){
+    /**
+     * _getFullPath returns the full path of the file name
+     * @access protected
+     * @return String full path of the file name
+     */
+    function _getFullPath(){
     if($this->_isOutsideSource()){
-      return $this->fileName;
+        return $this->fileName;
     }
     else {
-      return WWW_ROOT . $this->_getUploadPath();
+        return WWW_ROOT . $this->_getUploadPath();
+    }
     }
-  }
 
-  /**
-    * _getImagePath returns the image path of the file name
-    * @access protected
-    * @return String full path of the file name
-    */
-  function _getImagePath(){
+    /**
+     * _getImagePath returns the image path of the file name
+     * @access protected
+     * @return String full path of the file name
+     */
+    function _getImagePath(){
     if($this->_isOutsideSource()){
-      return $this->fileName;
+        return $this->fileName;
     }
     else {
-      return '/' . $this->_getUploadPath();
+        return '/' . $this->_getUploadPath();
+    }
     }
-  }
 
-  /**
-    * _getUploadPath returns the upload path of all files
-    * @access protected
-    * @return String upload path of all files
-    */
-  function _getUploadPath(){
+    /**
+     * _getUploadPath returns the upload path of all files
+     * @access protected
+     * @return String upload path of all files
+     */
+    function _getUploadPath(){
     return $this->settings['uploadDir'] . '/' . $this->fileName;
-  }
-
-  /**
-    * _getExt returns the extension of the filename.
-    * @access protected
-    * @return String extension of filename
-    */
-  function _getExt(){
+    }
+
+    /**
+     * _getExt returns the extension of the filename.
+     * @access protected
+     * @return String extension of filename
+     */
+    function _getExt(){
     return strrchr($this->fileName,".");
-  }
-
-  /**
-    * Get the image by name and width.
-    * if width is not specified return full image
-    * if width is specified, see if width of image exists
-    * if not, make it, save it, and return it.
-    * @return String HTML of resized or full image.
-    */
-  function _getImageByName(){
+    }
+
+    /**
+     * Get the image by name and width.
+     * if width is not specified return full image
+     * if width is specified, see if width of image exists
+     * if not, make it, save it, and return it.
+     * @return String HTML of resized or full image.
+     */
+    function _getImageByName(){
     //only proceed if we actually have the file in question
     if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
 
     //resize if we have resize on, a width, and if it doesn't already exist.
     if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
-      $this->_resizeImage();
+        $this->_resizeImage();
     }
     return $this->_htmlImage();
-  }
+    }
 
-  /**
-    * @return String of the resizedpath of a filename or path.
-    * @access protected
-    */
-  function _getResizeNameOrPath($file_name_or_path){
+    /**
+     * @return String of the resizedpath of a filename or path.
+     * @access protected
+     */
+    function _getResizeNameOrPath($file_name_or_path){
     $file_name = basename($file_name_or_path);
     $path = substr($file_name_or_path, 0, strlen($file_name_or_path) - strlen($file_name));
     $temp_path = substr($file_name,0,strlen($file_name) - strlen($this->_getExt())) . "x" . $this->options['width'] . $this->_getExt();
     $full_path = (strlen($this->options['resizedDir']) > 0) ? $path . $this->options['resizedDir'] . '/' . $temp_path : $path . $temp_path;
     return $full_path;
-  }
-
-  /**
-    * _resizeImage actually resizes the passed in image.
-    * @access protected
-    * @return null
-    */
-  function _resizeImage(){
+    }
+
+    /**
+     * _resizeImage actually resizes the passed in image.
+     * @access protected
+     * @return null
+     */
+    function _resizeImage(){
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
-      $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
+        $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
     }
     else {
-      //$this->autoResize = false;
+        //$this->autoResize = false;
+    }
     }
-  }
 
-  /**
-    * _htmlImage returns the atual HTML of the resized/full image asked for
-    * @access protected
-    * @return String HTML image asked for
-    */
-  function _htmlImage(){
+    /**
+     * _htmlImage returns the atual HTML of the resized/full image asked for
+     * @access protected
+     * @return String HTML image asked for
+     */
+    function _htmlImage(){
     if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
-      if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
+        if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
         $image = $this->_getImagePath();
-      }
-      else {
+        }
+        else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
-      }
+        }
     }
     else {
-      $image = $this->_getImagePath();
+        $image = $this->_getImagePath();
     }
 
     $options = $this->options; //copy
@@ -289,265 +289,265 @@ 
 
     //return the impage path or image html
     if($this->options['imagePathOnly']){
-      return $image;
+        return $image;
     }
     else {
-      return $this->Html->image($image, $options);
+        return $this->Html->image($image, $options);
+    }
     }
-  }
 
-  /**
-    * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
-    */
-  function _isOutsideSource(){
+    /**
+     * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
+     */
+    function _isOutsideSource(){
     return !!strpos($this->fileName, '://');
-  }
+    }
 }
 
 
 
 
-	/**
-	 * Image Resizer.
-	 * @author : Harish Chauhan
-	 * @copyright : Freeware
-	 * About :This PHP script will resize the given image and can show on the fly or save as image file.
-	 *
-	 */
-	//define("HAR_AUTO_NAME",1);
-	Class RResizeImage	{
-		var $imgFile="";
-		var $imgWidth=0;
-		var $imgHeight=0;
-		var $imgType="";
-		var $imgAttr="";
-		var $type=NULL;
-		var $_img=NULL;
-		var $_error="";
-
-		/**
-		 * Constructor
-		 *
-		 * @param [String $imgFile] Image File Name
-		 * @return RESIZEIMAGE (Class Object)
-		 */
-		function __construct($imgFile=""){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
-				return false;
-			}
-
-			$this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
-			if(!empty($imgFile)){
-				$this->setImage($imgFile);
-      }
-		}
-
-		/**
-		 * Error occured while resizing the image.
-		 *
-		 * @return String
-		 */
-		function error(){
-			return $this->_error;
-		}
-
-		/**
-		 * Set image file name
-		 *
-		 * @param String $imgFile
-		 * @return void
-		 */
-		function setImage($imgFile){
-			$this->imgFile=$imgFile;
-			return $this->_createImage();
-		}
+    /**
+     * Image Resizer.
+     * @author : Harish Chauhan
+     * @copyright : Freeware
+     * About :This PHP script will resize the given image and can show on the fly or save as image file.
+     *
+     */
+    //define("HAR_AUTO_NAME",1);
+    Class RResizeImage	{
+        var $imgFile="";
+        var $imgWidth=0;
+        var $imgHeight=0;
+        var $imgType="";
+        var $imgAttr="";
+        var $type=NULL;
+        var $_img=NULL;
+        var $_error="";
+
+        /**
+         * Constructor
+         *
+         * @param [String $imgFile] Image File Name
+         * @return RESIZEIMAGE (Class Object)
+         */
+        function __construct($imgFile=""){
+            if (!function_exists("imagecreate")){
+                $this->_error="Error: GD Library is not available.";
+                return false;
+            }
+
+            $this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
+            if(!empty($imgFile)){
+                $this->setImage($imgFile);
+        }
+        }
+
+        /**
+         * Error occured while resizing the image.
+         *
+         * @return String
+         */
+        function error(){
+            return $this->_error;
+        }
+
+        /**
+         * Set image file name
+         *
+         * @param String $imgFile
+         * @return void
+         */
+        function setImage($imgFile){
+            $this->imgFile=$imgFile;
+            return $this->_createImage();
+        }
 
     /**
-		 * @return void
-		 */
-		function close(){
-			return @imagedestroy($this->_img);
-		}
-
-		/**
-		 * Resize a image to given width and height and keep it's current width and height ratio
-		 *
-		 * @param Number $imgwidth
-		 * @param Numnber $imgheight
-		 * @param String $newfile
-		 */
-		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
-			$image_per = 100;
-			list($width, $height, $type, $attr) = @getimagesize($this->imgFile);
-			if($width > $imgwidth && $imgwidth > 0){
-				$image_per = (double)(($imgwidth * 100) / $width);
-      }
-
-			if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
-				$image_per = (double)(($imgheight * 100) / $height);
-      }
-
-			$this->resize_percentage($image_per,$newfile);
-		}
+     * @return void
+     */
+        function close(){
+            return @imagedestroy($this->_img);
+        }
+
+        /**
+         * Resize a image to given width and height and keep it's current width and height ratio
+         *
+         * @param Number $imgwidth
+         * @param Numnber $imgheight
+         * @param String $newfile
+         */
+        function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
+            $image_per = 100;
+            list($width, $height, $type, $attr) = @getimagesize($this->imgFile);
+            if($width > $imgwidth && $imgwidth > 0){
+                $image_per = (double)(($imgwidth * 100) / $width);
+        }
+
+            if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
+                $image_per = (double)(($imgheight * 100) / $height);
+        }
+
+            $this->resize_percentage($image_per,$newfile);
+        }
 
     /**
-		 * Resize an image to given percentage.
-		 *
-		 * @param Number $percent
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		function resize_percentage($percent=100,$newfile=NULL)	{
-			$newWidth=($this->imgWidth*$percent)/100;
-			$newHeight=($this->imgHeight*$percent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
-		}
+     * Resize an image to given percentage.
+     *
+     * @param Number $percent
+     * @param String $newfile
+     * @return Boolean
+     */
+        function resize_percentage($percent=100,$newfile=NULL)	{
+            $newWidth=($this->imgWidth*$percent)/100;
+            $newHeight=($this->imgHeight*$percent)/100;
+            return $this->resize($newWidth,$newHeight,$newfile);
+        }
 
     /**
-		 * Resize an image to given X and Y percentage.
-		 *
-		 * @param Number $xpercent
-		 * @param Number $ypercent
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
-			$newWidth=($this->imgWidth*$xpercent)/100;
-			$newHeight=($this->imgHeight*$ypercent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
-		}
-
-		/**
-		 * Resize an image to given width and height
-		 *
-		 * @param Number $width
-		 * @param Number $height
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		function resize($width,$height,$newfile=NULL){
-			if(empty($this->imgFile)){
-				$this->_error="File name is not initialised.";
-				return false;
-			}
-			if($this->imgWidth<=0 || $this->imgHeight<=0){
-				$this->_error="Could not resize given image";
-				return false;
-			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
-
-			return $this->_resize($width,$height,$newfile);
-		}
-
-		/**
-		 * Get the image attributes
-		 * @access Private
-		 *
-		 */
-		function _getImageInfo()
-		{
-			@list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
-			$this->imgType=$this->type[$type];
-		}
-
-		/**
-		 * Create the image resource
-		 * @access Private
-		 * @return Boolean
-		 */
-		function _createImage(){
-			$this->_getImageInfo();
-			if($this->imgType=='GIF'){
-				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
-				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
-				$this->_img=@imagecreatefrompng($this->imgFile);
-			}
-
-			if(!$this->_img || !@is_resource($this->_img)){
-				$this->_error="Error loading ".$this->imgFile;
-				return false;
-			}
-			return true;
-		}
-
-		/**
-		 * Function is used to resize the image
-		 *
-		 * @access Private
-		 * @param Number $width
-		 * @param Number $height
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		function _resize($width,$height,$newfile=NULL){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
-				return false;
-			}
-
-			$newimg=@imagecreatetruecolor($width,$height);
-			//imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
-
-			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
-				/** Code to keep transparency of image **/
-				$colorcount = imagecolorstotal($this->_img);
-				if ($colorcount == 0) $colorcount = 256;
-				imagetruecolortopalette($newimg,true,$colorcount);
-				imagepalettecopy($newimg,$this->_img);
-				$transparentcolor = imagecolortransparent($this->_img);
-				imagefill($newimg,0,0,$transparentcolor);
-				imagecolortransparent($newimg,$transparentcolor);
-			}
-
-			@imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight);
-
-			if($newfile===1)	{
-				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
+     * Resize an image to given X and Y percentage.
+     *
+     * @param Number $xpercent
+     * @param Number $ypercent
+     * @param String $newfile
+     * @return Boolean
+     */
+        function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
+            $newWidth=($this->imgWidth*$xpercent)/100;
+            $newHeight=($this->imgHeight*$ypercent)/100;
+            return $this->resize($newWidth,$newHeight,$newfile);
+        }
+
+        /**
+         * Resize an image to given width and height
+         *
+         * @param Number $width
+         * @param Number $height
+         * @param String $newfile
+         * @return Boolean
+         */
+        function resize($width,$height,$newfile=NULL){
+            if(empty($this->imgFile)){
+                $this->_error="File name is not initialised.";
+                return false;
+            }
+            if($this->imgWidth<=0 || $this->imgHeight<=0){
+                $this->_error="Could not resize given image";
+                return false;
+            }
+            if($width<=0)	$width=$this->imgWidth;
+            if($height<=0) $height=$this->imgHeight;
+
+            return $this->_resize($width,$height,$newfile);
         }
-			}
-			elseif(!empty($newfile)){
-				if(!@preg_match("/\..*+$/",@basename($newfile))){
-					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-					   $newfile=$newfile.$matches[0];
-          }
-				}
-			}
-
-			if($this->imgType=='GIF'){
-				if(!empty($newfile)){
-          @imagegif($newimg,$newfile);
+
+        /**
+         * Get the image attributes
+         * @access Private
+         *
+         */
+        function _getImageInfo()
+        {
+            @list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
+            $this->imgType=$this->type[$type];
         }
-				else {
-					@header("Content-type: image/gif");
-					@imagegif($newimg);
-				}
-			}
-			elseif($this->imgType=='JPG'){
-				if(!empty($newfile)){
-					@imagejpeg($newimg,$newfile);
+
+        /**
+         * Create the image resource
+         * @access Private
+         * @return Boolean
+         */
+        function _createImage(){
+            $this->_getImageInfo();
+            if($this->imgType=='GIF'){
+                $this->_img=@imagecreatefromgif($this->imgFile);
+            }
+            elseif($this->imgType=='JPG'){
+                $this->_img=@imagecreatefromjpeg($this->imgFile);
+            }
+            elseif($this->imgType=='PNG'){
+                $this->_img=@imagecreatefrompng($this->imgFile);
+            }
+
+            if(!$this->_img || !@is_resource($this->_img)){
+                $this->_error="Error loading ".$this->imgFile;
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Function is used to resize the image
+         *
+         * @access Private
+         * @param Number $width
+         * @param Number $height
+         * @param String $newfile
+         * @return Boolean
+         */
+        function _resize($width,$height,$newfile=NULL){
+            if (!function_exists("imagecreate")){
+                $this->_error="Error: GD Library is not available.";
+                return false;
+            }
+
+            $newimg=@imagecreatetruecolor($width,$height);
+            //imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
+
+            if($this->imgType=='GIF' || $this->imgType=='PNG')	{
+                /** Code to keep transparency of image **/
+                $colorcount = imagecolorstotal($this->_img);
+                if ($colorcount == 0) $colorcount = 256;
+                imagetruecolortopalette($newimg,true,$colorcount);
+                imagepalettecopy($newimg,$this->_img);
+                $transparentcolor = imagecolortransparent($this->_img);
+                imagefill($newimg,0,0,$transparentcolor);
+                imagecolortransparent($newimg,$transparentcolor);
+            }
+
+            @imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight);
+
+            if($newfile===1)	{
+                if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
+                        $newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
         }
-				else	{
-					@header("Content-type: image/jpeg");
-					@imagejpeg($newimg);
-				}
-			}
-			elseif($this->imgType=='PNG'){
-				if(!empty($newfile)){
-					@imagepng($newimg,$newfile);
+            }
+            elseif(!empty($newfile)){
+                if(!@preg_match("/\..*+$/",@basename($newfile))){
+                    if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
+                        $newfile=$newfile.$matches[0];
+            }
+                }
+            }
+
+            if($this->imgType=='GIF'){
+                if(!empty($newfile)){
+            @imagegif($newimg,$newfile);
         }
-				else{
-					@header("Content-type: image/png");
-					@imagepng($newimg);
-				}
-			}
-			@imagedestroy($newimg);
-		}
-	}
+                else {
+                    @header("Content-type: image/gif");
+                    @imagegif($newimg);
+                }
+            }
+            elseif($this->imgType=='JPG'){
+                if(!empty($newfile)){
+                    @imagejpeg($newimg,$newfile);
+        }
+                else	{
+                    @header("Content-type: image/jpeg");
+                    @imagejpeg($newimg);
+                }
+            }
+            elseif($this->imgType=='PNG'){
+                if(!empty($newfile)){
+                    @imagepng($newimg,$newfile);
+        }
+                else{
+                    @header("Content-type: image/png");
+                    @imagepng($newimg);
+                }
+            }
+            @imagedestroy($newimg);
+        }
+    }
 ?>
\ No newline at end of file

Spacing +118 added lines, -118 removed lines

@@ -20,7 +20,7 @@ 
   *
   */
 App::import('Config', 'FileUpload.file_upload_settings');
-class FileUploadHelper extends AppHelper{
+class FileUploadHelper extends AppHelper {
   var $helpers = array('Html', 'Form');
 
   /**
@@ -64,7 +64,7 @@ 
     * Constructor, initiallizes the FileUpload Component
     * and sets the default options.
     */
-  function __construct(View $View, $settings = array()){
+  function __construct(View $View, $settings = array()) {
 		parent::__construct($View, $settings);
     $this->FileUploadSettings = new FileUploadSettings;
 
@@ -77,7 +77,7 @@ 
     * @access public
     * @return void
     */
-  function reset(){
+  function reset() {
     $this->fileName = null;
     $this->options = array(
       'width' => 0,
@@ -101,10 +101,10 @@ 
     * @access public
     * @return mixed html tag, url string, or false if unable to find image.
     */
-  function image($name, $options = array()){
+  function image($name, $options = array()) {
     $this->fileName = $name;
     //options takes in a width as well
-    if(is_int($options)){
+    if (is_int($options)) {
       $width = $options;
       $options = array();
       $options['width'] = $width;
@@ -113,14 +113,14 @@ 
     $this->settings = array_merge($this->settings, $options);
 
     $img = false;
-    if(is_string($name)){
+    if (is_string($name)) {
       $img = $this->_getImageByName();
     }
-    elseif(is_int($name)){
+    elseif (is_int($name)) {
       $img = $this->_getImageById();
     }
 
-    if($img){
+    if ($img) {
       return $img;
     }
 
@@ -135,13 +135,13 @@ 
     * @return String HTML form input element configured for the FileUploadComponent
     * @access public
     */
-  function input($options = array()){
+  function input($options = array()) {
     $options = array_merge(
-      array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
+      array('var' => $this->settings['fileVar'], 'model' => $this->settings['fileModel']),
       $options
     );
     $configs = $options;
-    if($configs['model']){
+    if ($configs['model']) {
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
@@ -154,20 +154,20 @@ 
   /**
     * @access protected
     */
-  function _getImageById(){
+  function _getImageById() {
     App::import('Component', 'FileUpload.FileUpload');
     $this->FileUpload = new FileUploadComponent;
 
     $id = $this->fileName;
     $this->FileUpload->options['fileModel'] = $this->settings['fileModel'];
-    $Model =& $this->FileUpload->getModel();
+    $Model = & $this->FileUpload->getModel();
     $Model->recursive = -1;
     $upload = $Model->findById($id);
-    if(!empty($upload)){
+    if (!empty($upload)) {
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
     }
-    else{
+    else {
       return false;
     }
   }
@@ -177,12 +177,12 @@ 
     * @access protected
     * @return String full path of the file name
     */
-  function _getFullPath(){
-    if($this->_isOutsideSource()){
+  function _getFullPath() {
+    if ($this->_isOutsideSource()) {
       return $this->fileName;
     }
     else {
-      return WWW_ROOT . $this->_getUploadPath();
+      return WWW_ROOT.$this->_getUploadPath();
     }
   }
 
@@ -191,12 +191,12 @@ 
     * @access protected
     * @return String full path of the file name
     */
-  function _getImagePath(){
-    if($this->_isOutsideSource()){
+  function _getImagePath() {
+    if ($this->_isOutsideSource()) {
       return $this->fileName;
     }
     else {
-      return '/' . $this->_getUploadPath();
+      return '/'.$this->_getUploadPath();
     }
   }
 
@@ -205,8 +205,8 @@ 
     * @access protected
     * @return String upload path of all files
     */
-  function _getUploadPath(){
-    return $this->settings['uploadDir'] . '/' . $this->fileName;
+  function _getUploadPath() {
+    return $this->settings['uploadDir'].'/'.$this->fileName;
   }
 
   /**
@@ -214,8 +214,8 @@ 
     * @access protected
     * @return String extension of filename
     */
-  function _getExt(){
-    return strrchr($this->fileName,".");
+  function _getExt() {
+    return strrchr($this->fileName, ".");
   }
 
   /**
@@ -225,12 +225,12 @@ 
     * if not, make it, save it, and return it.
     * @return String HTML of resized or full image.
     */
-  function _getImageByName(){
+  function _getImageByName() {
     //only proceed if we actually have the file in question
-    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
+    if (!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
 
     //resize if we have resize on, a width, and if it doesn't already exist.
-    if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
+    if ($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))) {
       $this->_resizeImage();
     }
     return $this->_htmlImage();
@@ -240,11 +240,11 @@ 
     * @return String of the resizedpath of a filename or path.
     * @access protected
     */
-  function _getResizeNameOrPath($file_name_or_path){
+  function _getResizeNameOrPath($file_name_or_path) {
     $file_name = basename($file_name_or_path);
     $path = substr($file_name_or_path, 0, strlen($file_name_or_path) - strlen($file_name));
-    $temp_path = substr($file_name,0,strlen($file_name) - strlen($this->_getExt())) . "x" . $this->options['width'] . $this->_getExt();
-    $full_path = (strlen($this->options['resizedDir']) > 0) ? $path . $this->options['resizedDir'] . '/' . $temp_path : $path . $temp_path;
+    $temp_path = substr($file_name, 0, strlen($file_name) - strlen($this->_getExt()))."x".$this->options['width'].$this->_getExt();
+    $full_path = (strlen($this->options['resizedDir']) > 0) ? $path.$this->options['resizedDir'].'/'.$temp_path : $path.$temp_path;
     return $full_path;
   }
 
@@ -253,9 +253,9 @@ 
     * @access protected
     * @return null
     */
-  function _resizeImage(){
+  function _resizeImage() {
     $this->newImage = new RResizeImage($this->_getFullPath());
-    if($this->newImage->imgWidth > $this->options['width']){
+    if ($this->newImage->imgWidth > $this->options['width']) {
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
     }
     else {
@@ -268,9 +268,9 @@ 
     * @access protected
     * @return String HTML image asked for
     */
-  function _htmlImage(){
-    if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
-      if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
+  function _htmlImage() {
+    if (!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0) {
+      if (isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']) {
         $image = $this->_getImagePath();
       }
       else {
@@ -285,10 +285,10 @@ 
     //unset the default options
     unset($options['resizedDir'], $options['uploadDir'], $options['imagePathOnly'], $options['autoResize'], $options['resizeThumbOnly']);
     //unset width only if we're not an outsourced image, we have resize turned on, or we don't have a width to begin with.
-    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
+    if (!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
 
     //return the impage path or image html
-    if($this->options['imagePathOnly']){
+    if ($this->options['imagePathOnly']) {
       return $image;
     }
     else {
@@ -299,7 +299,7 @@ 
   /**
     * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
     */
-  function _isOutsideSource(){
+  function _isOutsideSource() {
     return !!strpos($this->fileName, '://');
   }
 }
@@ -315,15 +315,15 @@ 
 	 *
 	 */
 	//define("HAR_AUTO_NAME",1);
-	Class RResizeImage	{
-		var $imgFile="";
-		var $imgWidth=0;
-		var $imgHeight=0;
-		var $imgType="";
-		var $imgAttr="";
-		var $type=NULL;
-		var $_img=NULL;
-		var $_error="";
+	Class RResizeImage {
+		var $imgFile = "";
+		var $imgWidth = 0;
+		var $imgHeight = 0;
+		var $imgType = "";
+		var $imgAttr = "";
+		var $type = NULL;
+		var $_img = NULL;
+		var $_error = "";
 
 		/**
 		 * Constructor
@@ -331,14 +331,14 @@ 
 		 * @param [String $imgFile] Image File Name
 		 * @return RESIZEIMAGE (Class Object)
 		 */
-		function __construct($imgFile=""){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
+		function __construct($imgFile = "") {
+			if (!function_exists("imagecreate")) {
+				$this->_error = "Error: GD Library is not available.";
 				return false;
 			}
 
-			$this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
-			if(!empty($imgFile)){
+			$this->type = Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
+			if (!empty($imgFile)) {
 				$this->setImage($imgFile);
       }
 		}
@@ -348,7 +348,7 @@ 
 		 *
 		 * @return String
 		 */
-		function error(){
+		function error() {
 			return $this->_error;
 		}
 
@@ -358,15 +358,15 @@ 
 		 * @param String $imgFile
 		 * @return void
 		 */
-		function setImage($imgFile){
-			$this->imgFile=$imgFile;
+		function setImage($imgFile) {
+			$this->imgFile = $imgFile;
 			return $this->_createImage();
 		}
 
     /**
 		 * @return void
 		 */
-		function close(){
+		function close() {
 			return @imagedestroy($this->_img);
 		}
 
@@ -377,18 +377,18 @@ 
 		 * @param Numnber $imgheight
 		 * @param String $newfile
 		 */
-		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
+		function resize_limitwh($imgwidth, $imgheight, $newfile = NULL) {
 			$image_per = 100;
 			list($width, $height, $type, $attr) = @getimagesize($this->imgFile);
-			if($width > $imgwidth && $imgwidth > 0){
-				$image_per = (double)(($imgwidth * 100) / $width);
+			if ($width > $imgwidth && $imgwidth > 0) {
+				$image_per = (double) (($imgwidth * 100) / $width);
       }
 
-			if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
-				$image_per = (double)(($imgheight * 100) / $height);
+			if (floor(($height * $image_per) / 100) > $imgheight && $imgheight > 0) {
+				$image_per = (double) (($imgheight * 100) / $height);
       }
 
-			$this->resize_percentage($image_per,$newfile);
+			$this->resize_percentage($image_per, $newfile);
 		}
 
     /**
@@ -398,10 +398,10 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize_percentage($percent=100,$newfile=NULL)	{
-			$newWidth=($this->imgWidth*$percent)/100;
-			$newHeight=($this->imgHeight*$percent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
+		function resize_percentage($percent = 100, $newfile = NULL) {
+			$newWidth = ($this->imgWidth * $percent) / 100;
+			$newHeight = ($this->imgHeight * $percent) / 100;
+			return $this->resize($newWidth, $newHeight, $newfile);
 		}
 
     /**
@@ -412,10 +412,10 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
-			$newWidth=($this->imgWidth*$xpercent)/100;
-			$newHeight=($this->imgHeight*$ypercent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
+		function resize_xypercentage($xpercent = 100, $ypercent = 100, $newfile = NULL) {
+			$newWidth = ($this->imgWidth * $xpercent) / 100;
+			$newHeight = ($this->imgHeight * $ypercent) / 100;
+			return $this->resize($newWidth, $newHeight, $newfile);
 		}
 
 		/**
@@ -426,19 +426,19 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize($width,$height,$newfile=NULL){
-			if(empty($this->imgFile)){
-				$this->_error="File name is not initialised.";
+		function resize($width, $height, $newfile = NULL) {
+			if (empty($this->imgFile)) {
+				$this->_error = "File name is not initialised.";
 				return false;
 			}
-			if($this->imgWidth<=0 || $this->imgHeight<=0){
-				$this->_error="Could not resize given image";
+			if ($this->imgWidth <= 0 || $this->imgHeight <= 0) {
+				$this->_error = "Could not resize given image";
 				return false;
 			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
+			if ($width <= 0)	$width = $this->imgWidth;
+			if ($height <= 0) $height = $this->imgHeight;
 
-			return $this->_resize($width,$height,$newfile);
+			return $this->_resize($width, $height, $newfile);
 		}
 
 		/**
@@ -448,8 +448,8 @@ 
 		 */
 		function _getImageInfo()
 		{
-			@list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
-			$this->imgType=$this->type[$type];
+			@list($this->imgWidth, $this->imgHeight, $type, $this->imgAttr) = @getimagesize($this->imgFile);
+			$this->imgType = $this->type[$type];
 		}
 
 		/**
@@ -457,20 +457,20 @@ 
 		 * @access Private
 		 * @return Boolean
 		 */
-		function _createImage(){
+		function _createImage() {
 			$this->_getImageInfo();
-			if($this->imgType=='GIF'){
-				$this->_img=@imagecreatefromgif($this->imgFile);
+			if ($this->imgType == 'GIF') {
+				$this->_img = @imagecreatefromgif($this->imgFile);
 			}
-			elseif($this->imgType=='JPG'){
-				$this->_img=@imagecreatefromjpeg($this->imgFile);
+			elseif ($this->imgType == 'JPG') {
+				$this->_img = @imagecreatefromjpeg($this->imgFile);
 			}
-			elseif($this->imgType=='PNG'){
-				$this->_img=@imagecreatefrompng($this->imgFile);
+			elseif ($this->imgType == 'PNG') {
+				$this->_img = @imagecreatefrompng($this->imgFile);
 			}
 
-			if(!$this->_img || !@is_resource($this->_img)){
-				$this->_error="Error loading ".$this->imgFile;
+			if (!$this->_img || !@is_resource($this->_img)) {
+				$this->_error = "Error loading ".$this->imgFile;
 				return false;
 			}
 			return true;
@@ -485,64 +485,64 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function _resize($width,$height,$newfile=NULL){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
+		function _resize($width, $height, $newfile = NULL) {
+			if (!function_exists("imagecreate")) {
+				$this->_error = "Error: GD Library is not available.";
 				return false;
 			}
 
-			$newimg=@imagecreatetruecolor($width,$height);
+			$newimg = @imagecreatetruecolor($width, $height);
 			//imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
 
-			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
+			if ($this->imgType == 'GIF' || $this->imgType == 'PNG') {
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
 				if ($colorcount == 0) $colorcount = 256;
-				imagetruecolortopalette($newimg,true,$colorcount);
-				imagepalettecopy($newimg,$this->_img);
+				imagetruecolortopalette($newimg, true, $colorcount);
+				imagepalettecopy($newimg, $this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
-				imagefill($newimg,0,0,$transparentcolor);
-				imagecolortransparent($newimg,$transparentcolor);
+				imagefill($newimg, 0, 0, $transparentcolor);
+				imagecolortransparent($newimg, $transparentcolor);
 			}
 
-			@imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight);
+			@imagecopyresampled($newimg, $this->_img, 0, 0, 0, 0, $width, $height, $this->imgWidth, $this->imgHeight);
 
-			if($newfile===1)	{
-				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
+			if ($newfile === 1) {
+				if (@preg_match("/\..*+$/", @basename($this->imgFile), $matches)) {
+			   		$newfile = @substr_replace($this->imgFile, "_har", -@strlen($matches[0]), 0);
         }
 			}
-			elseif(!empty($newfile)){
-				if(!@preg_match("/\..*+$/",@basename($newfile))){
-					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-					   $newfile=$newfile.$matches[0];
+			elseif (!empty($newfile)) {
+				if (!@preg_match("/\..*+$/", @basename($newfile))) {
+					if (@preg_match("/\..*+$/", @basename($this->imgFile), $matches)) {
+					   $newfile = $newfile.$matches[0];
           }
 				}
 			}
 
-			if($this->imgType=='GIF'){
-				if(!empty($newfile)){
-          @imagegif($newimg,$newfile);
+			if ($this->imgType == 'GIF') {
+				if (!empty($newfile)) {
+          @imagegif($newimg, $newfile);
         }
 				else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
 			}
-			elseif($this->imgType=='JPG'){
-				if(!empty($newfile)){
-					@imagejpeg($newimg,$newfile);
+			elseif ($this->imgType == 'JPG') {
+				if (!empty($newfile)) {
+					@imagejpeg($newimg, $newfile);
         }
-				else	{
+				else {
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
 			}
-			elseif($this->imgType=='PNG'){
-				if(!empty($newfile)){
-					@imagepng($newimg,$newfile);
+			elseif ($this->imgType == 'PNG') {
+				if (!empty($newfile)) {
+					@imagepng($newimg, $newfile);
         }
-				else{
+				else {
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

Braces +32 added lines, -39 removed lines

@@ -115,8 +115,7 @@ 
     $img = false;
     if(is_string($name)){
       $img = $this->_getImageByName();
-    }
-    elseif(is_int($name)){
+    } elseif(is_int($name)){
       $img = $this->_getImageById();
     }
 
@@ -145,8 +144,7 @@ 
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
-    }
-    else {
+    } else {
       return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
     }
   }
@@ -166,8 +164,7 @@ 
     if(!empty($upload)){
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
-    }
-    else{
+    } else{
       return false;
     }
   }
@@ -180,8 +177,7 @@ 
   function _getFullPath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return WWW_ROOT . $this->_getUploadPath();
     }
   }
@@ -194,8 +190,7 @@ 
   function _getImagePath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return '/' . $this->_getUploadPath();
     }
   }
@@ -227,7 +222,9 @@ 
     */
   function _getImageByName(){
     //only proceed if we actually have the file in question
-    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
+    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) {
+        return false;
+    }
 
     //resize if we have resize on, a width, and if it doesn't already exist.
     if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
@@ -257,8 +254,7 @@ 
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
-    }
-    else {
+    } else {
       //$this->autoResize = false;
     }
   }
@@ -272,12 +268,10 @@ 
     if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
       if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
         $image = $this->_getImagePath();
-      }
-      else {
+      } else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
       }
-    }
-    else {
+    } else {
       $image = $this->_getImagePath();
     }
 
@@ -285,13 +279,14 @@ 
     //unset the default options
     unset($options['resizedDir'], $options['uploadDir'], $options['imagePathOnly'], $options['autoResize'], $options['resizeThumbOnly']);
     //unset width only if we're not an outsourced image, we have resize turned on, or we don't have a width to begin with.
-    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
+    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) {
+        unset($options['width']);
+    }
 
     //return the impage path or image html
     if($this->options['imagePathOnly']){
       return $image;
-    }
-    else {
+    } else {
       return $this->Html->image($image, $options);
     }
   }
@@ -435,8 +430,12 @@ 
 				$this->_error="Could not resize given image";
 				return false;
 			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
+			if($width<=0) {
+			    $width=$this->imgWidth;
+			}
+			if($height<=0) {
+			    $height=$this->imgHeight;
+			}
 
 			return $this->_resize($width,$height,$newfile);
 		}
@@ -461,11 +460,9 @@ 
 			$this->_getImageInfo();
 			if($this->imgType=='GIF'){
 				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				$this->_img=@imagecreatefrompng($this->imgFile);
 			}
 
@@ -497,7 +494,9 @@ 
 			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
-				if ($colorcount == 0) $colorcount = 256;
+				if ($colorcount == 0) {
+				    $colorcount = 256;
+				}
 				imagetruecolortopalette($newimg,true,$colorcount);
 				imagepalettecopy($newimg,$this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
@@ -511,8 +510,7 @@ 
 				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
         }
-			}
-			elseif(!empty($newfile)){
+			} elseif(!empty($newfile)){
 				if(!@preg_match("/\..*+$/",@basename($newfile))){
 					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 					   $newfile=$newfile.$matches[0];
@@ -523,26 +521,21 @@ 
 			if($this->imgType=='GIF'){
 				if(!empty($newfile)){
           @imagegif($newimg,$newfile);
-        }
-				else {
+        } else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				if(!empty($newfile)){
 					@imagejpeg($newimg,$newfile);
-        }
-				else	{
+        } else	{
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				if(!empty($newfile)){
 					@imagepng($newimg,$newfile);
-        }
-				else{
+        } else{
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

app/Plugin/Install/Controller/InstallController.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
  * credentials or create the missing database
  * Create the database file and insert the submitted details
  *
- * @return void
+ * @return null|CakeResponse
  * @access public
  */
 	public function database() {

Indentation +176 added lines, -176 removed lines

@@ -21,7 +21,7 @@ 
  * @var string
  * @access public
  */
-	public $name = 'Install';
+    public $name = 'Install';
 
 /**
  * No models required
@@ -29,7 +29,7 @@ 
  * @var array
  * @access public
  */
-	public $uses = null;
+    public $uses = null;
 
 /**
  * No components required
@@ -37,7 +37,7 @@ 
  * @var array
  * @access public
  */
-	public $components = null;
+    public $components = null;
 
 /**
  * Default configuration
@@ -45,19 +45,19 @@ 
  * @var array
  * @access public
  */
-	public $defaultConfig = array(
-		'name' => 'default',
-		'datasource'=> 'Database/Mysql',
-		'persistent'=> false,
-		'host'=> 'localhost',
-		'login'=> 'root',
-		'password'=> '',
-		'database'=> 'croogo',
-		'schema'=> null,
-		'prefix'=> null,
-		'encoding' => 'utf8',
-		'port' => null,
-	);
+    public $defaultConfig = array(
+        'name' => 'default',
+        'datasource'=> 'Database/Mysql',
+        'persistent'=> false,
+        'host'=> 'localhost',
+        'login'=> 'root',
+        'password'=> '',
+        'database'=> 'croogo',
+        'schema'=> null,
+        'prefix'=> null,
+        'encoding' => 'utf8',
+        'port' => null,
+    );
 
 /**
  * beforeFilter
@@ -65,30 +65,30 @@ 
  * @return void
  * @access public
  */
-	public function beforeFilter() {
-		parent::beforeFilter();
-		$this->_check();
+    public function beforeFilter() {
+        parent::beforeFilter();
+        $this->_check();
 
-		$this->layout = 'install';
-		App::import('Component', 'Session');
-		$this->Session = new SessionComponent($this->Components);
+        $this->layout = 'install';
+        App::import('Component', 'Session');
+        $this->Session = new SessionComponent($this->Components);
 
-		Cache::clear(false, '_cake_core_');
-		Cache::clear(false, '_cake_model_');
-	}
+        Cache::clear(false, '_cake_core_');
+        Cache::clear(false, '_cake_model_');
+    }
 
 /**
  * If settings.yml exists, app is already installed
  *
  * @return void
  */
-	protected function _check() {
-		if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
+    protected function _check() {
+        if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
 //		if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
-			$this->Session->setFlash('Already Installed');
-			$this->redirect('/');
-		}
-	}
+            $this->Session->setFlash('Already Installed');
+            $this->redirect('/');
+        }
+    }
 
 /**
  * Step 0: welcome
@@ -98,10 +98,10 @@ 
  * @return void
  * @access public
  */
-	public function index() {
-		$this->_check();
-		$this->set('title_for_layout', __('Installation: Welcome'));
-	}
+    public function index() {
+        $this->_check();
+        $this->set('title_for_layout', __('Installation: Welcome'));
+    }
 
 /**
  * Step 1: database
@@ -113,63 +113,63 @@ 
  * @return void
  * @access public
  */
-	public function database() {
-		$this->_check();
-		$this->set('title_for_layout', __('Step 1: Database'));
+    public function database() {
+        $this->_check();
+        $this->set('title_for_layout', __('Step 1: Database'));
 
 
-		if (empty($this->request->data)) {
-			return;
-		}
+        if (empty($this->request->data)) {
+            return;
+        }
 
-		@App::import('Model', 'ConnectionManager');
-		$config = $this->defaultConfig;
-		foreach ($this->request->data['Install'] AS $key => $value) {
-			if (isset($this->request->data['Install'][$key])) {
-				$config[$key] = $value;
-			}
-		}
-		try {
-			@ConnectionManager::create('default', $config);
-			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
-			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
-			$this->redirect(array('action' => 'database'));
-		}
-		if (!$db->isConnected()) {
-			$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
-			return;
-		}
+        @App::import('Model', 'ConnectionManager');
+        $config = $this->defaultConfig;
+        foreach ($this->request->data['Install'] AS $key => $value) {
+            if (isset($this->request->data['Install'][$key])) {
+                $config[$key] = $value;
+            }
+        }
+        try {
+            @ConnectionManager::create('default', $config);
+            $db = ConnectionManager::getDataSource('default');
+        }
+        catch (MissingConnectionException $e) {
+            $this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
+            $this->redirect(array('action' => 'database'));
+        }
+        if (!$db->isConnected()) {
+            $this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
+            return;
+        }
 
-		copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
-		App::uses('File', 'Utility');
-		$file = new File(APP . 'Config' . DS.'database.php', true);
-		$content = $file->read();
+        copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
+        App::uses('File', 'Utility');
+        $file = new File(APP . 'Config' . DS.'database.php', true);
+        $content = $file->read();
 
-		foreach ($config AS $configKey => $configValue) {
-			$content = str_replace('{default_' . $configKey . '}', $configValue, $content);
-		}
+        foreach ($config AS $configKey => $configValue) {
+            $content = str_replace('{default_' . $configKey . '}', $configValue, $content);
+        }
 
-		if($file->write($content) ) {
-			return $this->redirect(array('action' => 'data'));
-		} else {
-			$this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
-		}
-	}
+        if($file->write($content) ) {
+            return $this->redirect(array('action' => 'data'));
+        } else {
+            $this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
+        }
+    }
 
-	/**
-	 * Fixes Postgres sequence
-	 */
-	protected function _fixSequence($model) {
-		$db = $model->getDataSource();
-		$nextValue = $model->find('first', array(
-			'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
-			));
-		$nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
-		$sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
-		$db->execute($sql);
-	}
+    /**
+     * Fixes Postgres sequence
+     */
+    protected function _fixSequence($model) {
+        $db = $model->getDataSource();
+        $nextValue = $model->find('first', array(
+            'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
+            ));
+        $nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
+        $sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
+        $db->execute($sql);
+    }
 
 /**
  * Step 2: Run the initial sql scripts to create the db and seed it with data
@@ -177,83 +177,83 @@ 
  * @return void
  * @access public
  */
-	public function data() {
-		$this->_check();
-		$this->set('title_for_layout', __('Step 2: Build database'));
-		if (isset($this->params['named']['run'])) {
-			App::uses('File', 'Utility');
-			App::import('Model', 'CakeSchema', false);
-			App::import('Model', 'ConnectionManager');
+    public function data() {
+        $this->_check();
+        $this->set('title_for_layout', __('Step 2: Build database'));
+        if (isset($this->params['named']['run'])) {
+            App::uses('File', 'Utility');
+            App::import('Model', 'CakeSchema', false);
+            App::import('Model', 'ConnectionManager');
 
-			$db = ConnectionManager::getDataSource('default');
-			$brokenSequence = $db instanceof Postgres;
-			if(!$db->isConnected()) {
-				$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
-			} else {
-				$schema = new CakeSchema(array('name'=>'app'));
-				$schema = $schema->load();
-				foreach($schema->tables as $table => $fields) {
-					$create = $db->createSchema($schema, $table);
-					try {
-						$db->execute($create);
-					}
-					catch (PDOException $e) {
-						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
-						$this->redirect(array('action' => 'database'));
-					}
-				}
+            $db = ConnectionManager::getDataSource('default');
+            $brokenSequence = $db instanceof Postgres;
+            if(!$db->isConnected()) {
+                $this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
+            } else {
+                $schema = new CakeSchema(array('name'=>'app'));
+                $schema = $schema->load();
+                foreach($schema->tables as $table => $fields) {
+                    $create = $db->createSchema($schema, $table);
+                    try {
+                        $db->execute($create);
+                    }
+                    catch (PDOException $e) {
+                        $this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
+                        $this->redirect(array('action' => 'database'));
+                    }
+                }
 
-				$path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
-				$dataObjects = App::objects('class', $path);
-				foreach ($dataObjects as $data) {
-					include($path . $data . '.php');
-					$classVars = get_class_vars($data);
-					$modelAlias = substr($data, 0, -4);
-					$table = $classVars['table'];
-					$records = $classVars['records'];
-					App::import('Model', 'Model', false);
-					$modelObject = new Model(array(
-						'name' => $modelAlias,
-						'table' => $table,
-						'ds' => 'default',
-					));
-					if (is_array($records) && count($records) > 0) {
-						$i = 1;
-						foreach($records as $record) {
-							if (!isset($record['id'])) {
-								$record['id'] = $i++;
-							}
-							$modelObject->create($record);
-							$modelObject->save();
-						}
-					}
-					if ($brokenSequence) {
-						// $this->_fixSequence($modelObject);
-					}
-				}
+                $path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
+                $dataObjects = App::objects('class', $path);
+                foreach ($dataObjects as $data) {
+                    include($path . $data . '.php');
+                    $classVars = get_class_vars($data);
+                    $modelAlias = substr($data, 0, -4);
+                    $table = $classVars['table'];
+                    $records = $classVars['records'];
+                    App::import('Model', 'Model', false);
+                    $modelObject = new Model(array(
+                        'name' => $modelAlias,
+                        'table' => $table,
+                        'ds' => 'default',
+                    ));
+                    if (is_array($records) && count($records) > 0) {
+                        $i = 1;
+                        foreach($records as $record) {
+                            if (!isset($record['id'])) {
+                                $record['id'] = $i++;
+                            }
+                            $modelObject->create($record);
+                            $modelObject->save();
+                        }
+                    }
+                    if ($brokenSequence) {
+                        // $this->_fixSequence($modelObject);
+                    }
+                }
 
-				$this->redirect(array('action' => 'adminuser'));
-			}
-		}
-	}
+                $this->redirect(array('action' => 'adminuser'));
+            }
+        }
+    }
 
 /**
  * Step 3: get username and passwords for administrative user
  */
-	public function adminuser() {
+    public function adminuser() {
 //		if ($this->request->is('post')) {
-			$this->loadModel('User');
+            $this->loadModel('User');
 //			$this->User->set($this->request->data);
 //			if ($this->User->validates()) {
-				$token = uniqid();
-				$this->Session->write('Install', array(
-					'token' => $token,
+                $token = uniqid();
+                $this->Session->write('Install', array(
+                    'token' => $token,
 //					'User' => $this->request->data['User'],
-					));
-				$this->redirect(array('action' => 'finish', $token));
+                    ));
+                $this->redirect(array('action' => 'finish', $token));
 //			}
 //		}
-	}
+    }
 
 /**
  * Step 4: finish
@@ -263,33 +263,33 @@ 
  * @return void
  * @access public
  */
-	public function finish($token = null) {
-		$this->set('title_for_layout', __('Installation completed successfully'));
-		$this->_check();
-		$this->loadModel('Install.Install');
-		$install = $this->Session->read('Install');
-		if ($install['token'] == $token) {
-			unset($install['token']);
-			if ($this->Install->finalize($install)) {
-				$urlBlogAdd = Router::url(array(
-					'plugin' => false, 'admin' => true,
-					'controller' => 'nodes', 'action' => 'add', 'blog',
-					));
-				$urlSettings = Router::url(array(
-					'plugin' => false, 'admin' => true,
-					'controller' => 'settings', 'action' => 'prefix', 'Site',
-					));
-				$this->set('user', $install);
-				$this->set(compact('urlBlogAdd', 'urlSettings'));
-			} else {
-				$this->Session->setFlash('Something went wrong during installation. Please check your server logs.');
-				$this->redirect(array('action' => 'adminuser'));
-			}
-			$this->Session->delete('Install');
-		} else {
-			$this->redirect('/');
-		}
-	}
+    public function finish($token = null) {
+        $this->set('title_for_layout', __('Installation completed successfully'));
+        $this->_check();
+        $this->loadModel('Install.Install');
+        $install = $this->Session->read('Install');
+        if ($install['token'] == $token) {
+            unset($install['token']);
+            if ($this->Install->finalize($install)) {
+                $urlBlogAdd = Router::url(array(
+                    'plugin' => false, 'admin' => true,
+                    'controller' => 'nodes', 'action' => 'add', 'blog',
+                    ));
+                $urlSettings = Router::url(array(
+                    'plugin' => false, 'admin' => true,
+                    'controller' => 'settings', 'action' => 'prefix', 'Site',
+                    ));
+                $this->set('user', $install);
+                $this->set(compact('urlBlogAdd', 'urlSettings'));
+            } else {
+                $this->Session->setFlash('Something went wrong during installation. Please check your server logs.');
+                $this->redirect(array('action' => 'adminuser'));
+            }
+            $this->Session->delete('Install');
+        } else {
+            $this->redirect('/');
+        }
+    }
 
 }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -83,7 +83,7 @@ 
  * @return void
  */
 	protected function _check() {
-		if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
+		if (file_exists(APP.'Config'.DS.'installed.txt')) {
 //		if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
 			$this->Session->setFlash('Already Installed');
 			$this->redirect('/');
@@ -142,16 +142,16 @@ 
 			return;
 		}
 
-		copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
+		copy(APP.'Config'.DS.'database.php.install', APP.'Config'.DS.'database.php');
 		App::uses('File', 'Utility');
-		$file = new File(APP . 'Config' . DS.'database.php', true);
+		$file = new File(APP.'Config'.DS.'database.php', true);
 		$content = $file->read();
 
 		foreach ($config AS $configKey => $configValue) {
-			$content = str_replace('{default_' . $configKey . '}', $configValue, $content);
+			$content = str_replace('{default_'.$configKey.'}', $configValue, $content);
 		}
 
-		if($file->write($content) ) {
+		if ($file->write($content)) {
 			return $this->redirect(array('action' => 'data'));
 		} else {
 			$this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
@@ -166,7 +166,7 @@ 
 		$nextValue = $model->find('first', array(
 			'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
 			));
-		$nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
+		$nextValue = empty($nextValue[0]['max']) ? 1 : $nextValue[0]['max'] + 1;
 		$sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
 		$db->execute($sql);
 	}
@@ -187,12 +187,12 @@ 
 
 			$db = ConnectionManager::getDataSource('default');
 			$brokenSequence = $db instanceof Postgres;
-			if(!$db->isConnected()) {
+			if (!$db->isConnected()) {
 				$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
 			} else {
 				$schema = new CakeSchema(array('name'=>'app'));
 				$schema = $schema->load();
-				foreach($schema->tables as $table => $fields) {
+				foreach ($schema->tables as $table => $fields) {
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
@@ -203,10 +203,10 @@ 
 					}
 				}
 
-				$path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
+				$path = CakePlugin::path('Install').DS.'Config'.DS.'Data'.DS;
 				$dataObjects = App::objects('class', $path);
 				foreach ($dataObjects as $data) {
-					include($path . $data . '.php');
+					include($path.$data.'.php');
 					$classVars = get_class_vars($data);
 					$modelAlias = substr($data, 0, -4);
 					$table = $classVars['table'];
@@ -219,7 +219,7 @@ 
 					));
 					if (is_array($records) && count($records) > 0) {
 						$i = 1;
-						foreach($records as $record) {
+						foreach ($records as $record) {
 							if (!isset($record['id'])) {
 								$record['id'] = $i++;
 							}

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
 		try {
 			@ConnectionManager::create('default', $config);
 			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
+		} catch (MissingConnectionException $e) {
 			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
 			$this->redirect(array('action' => 'database'));
 		}
@@ -196,8 +195,7 @@ 
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
-					}
-					catch (PDOException $e) {
+					} catch (PDOException $e) {
 						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
 						$this->redirect(array('action' => 'database'));
 					}

app/Plugin/Install/Model/Install.php

Doc Comments +4 added lines, -1 removed lines

@@ -15,7 +15,7 @@ 
 		 * Finalize installation
 		 *
 		 * @param $user
-		 * @return mixed if false, indicates processing failure
+		 * @return boolean if false, indicates processing failure
 		 */
 		public function finalize($user) {
 			if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
@@ -58,6 +58,9 @@ 
 			Configure::write('Security.cipherSeed', $seed);
 		}
 
+		/**
+		 * @param false|null $salt
+		 */
 		protected function _createAdmin($salt) {
 			$User = ClassRegistry::init('User');
 			$User->id = $User->field('id', ['username' => 'admin']);

Indentation +79 added lines, -79 removed lines

@@ -1,77 +1,77 @@ 
 <?php
 
-	App::uses('InstallAppModel', 'Install.Model');
-	App::uses('CakeTime', 'Utility');
-	App::uses('Security', 'Utility');
-	App::uses('File', 'Utility');
-
-	class Install extends InstallAppModel {
-
-		public $name = 'Install';
-
-		public $useTable = false;
-
-		/**
-		 * Finalize installation
-		 *
-		 * @param $user
-		 * @return mixed if false, indicates processing failure
-		 */
-		public function finalize($user) {
-			if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
-				return false;
-			}
-
-			$this->_markInstalled();
-			$salt = $this->_createSecurity();
-			$saved = $this->_createAdmin($salt);
-
-			return $saved;
-		}
-
-		protected function _markInstalled() {
-			touch(APP . 'Config' . DS . 'installed.txt');
-		}
-
-		protected function _createSecurity() {
-			$File = new File(APP . 'Config' . DS . 'core.php');
-
-			// save previous core file
-			// copy(APP . 'Config' . DS.'settings.yml.install', APP . 'Config' . DS.'settings.yml');
-			$File->copy(APP . 'Config' . DS . 'core.' . date('YmdHis',
-					time()) . '.php');
-
-			// set new salt and seed value
-			$salt = Security::generateAuthKey();
-			$seed = mt_rand() . mt_rand();
-			$contents = $File->read();
-			$contents = preg_replace('/(?<=Configure::write\(\'Security.salt\', \')([^\' ]+)(?=\'\))/',
-					$salt,
-					$contents);
-			$contents = preg_replace('/(?<=Configure::write\(\'Security.cipherSeed\', \')(\d+)(?=\'\))/',
-					$seed,
-					$contents);
-			if (!$File->write($contents)) {
-				return false;
-			}
-			Configure::write('Security.salt', $salt);
-			Configure::write('Security.cipherSeed', $seed);
-		}
-
-		protected function _createAdmin($salt) {
-			$User = ClassRegistry::init('User');
-			$User->id = $User->field('id', ['username' => 'admin']);
-			Security::setHash('md5');
-			Configure::write('Security.salt', $salt);
-			$saved = $User->save([
-					'User' => [
-							'password' => 'password',
-							'password_confirm' => 'password',
-							'registered' => date('Y-m-d H:i:s')
-					]
-			]);
-
-			/*
+    App::uses('InstallAppModel', 'Install.Model');
+    App::uses('CakeTime', 'Utility');
+    App::uses('Security', 'Utility');
+    App::uses('File', 'Utility');
+
+    class Install extends InstallAppModel {
+
+        public $name = 'Install';
+
+        public $useTable = false;
+
+        /**
+         * Finalize installation
+         *
+         * @param $user
+         * @return mixed if false, indicates processing failure
+         */
+        public function finalize($user) {
+            if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
+                return false;
+            }
+
+            $this->_markInstalled();
+            $salt = $this->_createSecurity();
+            $saved = $this->_createAdmin($salt);
+
+            return $saved;
+        }
+
+        protected function _markInstalled() {
+            touch(APP . 'Config' . DS . 'installed.txt');
+        }
+
+        protected function _createSecurity() {
+            $File = new File(APP . 'Config' . DS . 'core.php');
+
+            // save previous core file
+            // copy(APP . 'Config' . DS.'settings.yml.install', APP . 'Config' . DS.'settings.yml');
+            $File->copy(APP . 'Config' . DS . 'core.' . date('YmdHis',
+                    time()) . '.php');
+
+            // set new salt and seed value
+            $salt = Security::generateAuthKey();
+            $seed = mt_rand() . mt_rand();
+            $contents = $File->read();
+            $contents = preg_replace('/(?<=Configure::write\(\'Security.salt\', \')([^\' ]+)(?=\'\))/',
+                    $salt,
+                    $contents);
+            $contents = preg_replace('/(?<=Configure::write\(\'Security.cipherSeed\', \')(\d+)(?=\'\))/',
+                    $seed,
+                    $contents);
+            if (!$File->write($contents)) {
+                return false;
+            }
+            Configure::write('Security.salt', $salt);
+            Configure::write('Security.cipherSeed', $seed);
+        }
+
+        protected function _createAdmin($salt) {
+            $User = ClassRegistry::init('User');
+            $User->id = $User->field('id', ['username' => 'admin']);
+            Security::setHash('md5');
+            Configure::write('Security.salt', $salt);
+            $saved = $User->save([
+                    'User' => [
+                            'password' => 'password',
+                            'password_confirm' => 'password',
+                            'registered' => date('Y-m-d H:i:s')
+                    ]
+            ]);
+
+            /*
 			// create administrative user
 			$User = ClassRegistry::init('User');
 			$User->Role->Behaviors->attach('Aliasable');
@@ -87,12 +87,12 @@ 
 			 *
 			 */
 
-			if (!$saved) {
-				$this->log('Unable to create administrative user. Validation errors:');
-				$this->log($User->validationErrors);
-			}
+            if (!$saved) {
+                $this->log('Unable to create administrative user. Validation errors:');
+                $this->log($User->validationErrors);
+            }
 
-			return (bool)$saved;
-		}
+            return (bool)$saved;
+        }
 
-	}
+    }

Spacing +6 added lines, -6 removed lines

@@ -30,20 +30,20 @@ 
 		}
 
 		protected function _markInstalled() {
-			touch(APP . 'Config' . DS . 'installed.txt');
+			touch(APP.'Config'.DS.'installed.txt');
 		}
 
 		protected function _createSecurity() {
-			$File = new File(APP . 'Config' . DS . 'core.php');
+			$File = new File(APP.'Config'.DS.'core.php');
 
 			// save previous core file
 			// copy(APP . 'Config' . DS.'settings.yml.install', APP . 'Config' . DS.'settings.yml');
-			$File->copy(APP . 'Config' . DS . 'core.' . date('YmdHis',
-					time()) . '.php');
+			$File->copy(APP.'Config'.DS.'core.'.date('YmdHis',
+					time()).'.php');
 
 			// set new salt and seed value
 			$salt = Security::generateAuthKey();
-			$seed = mt_rand() . mt_rand();
+			$seed = mt_rand().mt_rand();
 			$contents = $File->read();
 			$contents = preg_replace('/(?<=Configure::write\(\'Security.salt\', \')([^\' ]+)(?=\'\))/',
 					$salt,
@@ -92,7 +92,7 @@ 
 				$this->log($User->validationErrors);
 			}
 
-			return (bool)$saved;
+			return (bool) $saved;
 		}
 
 	}

app/Plugin/Markitup/Vendor/parser/markdown/markdown.php

Doc Comments +19 added lines

@@ -1028,6 +1028,10 @@ 
 
 	var $list_level = 0;
 
+	/**
+	 * @param string $list_str
+	 * @param string $marker_any_re
+	 */
 	function processListItems($list_str, $marker_any_re) {
 	#
 	#	Process the contents of a single ordered or unordered list, splitting it
@@ -1131,6 +1135,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	function makeCodeSpan($code) {
 	#
 	# Create a code span markup for $code. Called from handleSpanToken.
@@ -1612,6 +1619,9 @@ 
 	# hanlde UTF-8 if the default function does not exist.
 	var $utf8_strlen = 'mb_strlen';
 
+	/**
+	 * @param string $text
+	 */
 	function detab($text) {
 	#
 	# Replace tabs with the appropriate amount of space.
@@ -2035,6 +2045,12 @@ 
 
 		return array($parsed, $text);
 	}
+
+	/**
+	 * @param string $text
+	 * @param string $hash_method
+	 * @param boolean $md_attr
+	 */
 	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 	#
 	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
@@ -2464,6 +2480,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	function processDefListItems($list_str) {
 	#
 	#	Process the contents of a single definition list, splitting it

Indentation +2139 added lines, -2139 removed lines

@@ -53,15 +53,15 @@ 
 #
 # Initialize the parser and return the result of its transform method.
 #
-	# Setup static parser variable.
-	static $parser;
-	if (!isset($parser)) {
-		$parser_class = MARKDOWN_PARSER_CLASS;
-		$parser = new $parser_class;
-	}
-
-	# Transform text using parser.
-	return $parser->transform($text);
+    # Setup static parser variable.
+    static $parser;
+    if (!isset($parser)) {
+        $parser_class = MARKDOWN_PARSER_CLASS;
+        $parser = new $parser_class;
+    }
+
+    # Transform text using parser.
+    return $parser->transform($text);
 }
 
 
@@ -77,109 +77,109 @@ 
 */
 
 if (isset($wp_version)) {
-	# More details about how it works here:
-	# <http://michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
-
-	# Post content and excerpts
-	# - Remove WordPress paragraph generator.
-	# - Run Markdown on excerpt, then remove all tags.
-	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
-	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
+    # More details about how it works here:
+    # <http://michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
+
+    # Post content and excerpts
+    # - Remove WordPress paragraph generator.
+    # - Run Markdown on excerpt, then remove all tags.
+    # - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
+    if (MARKDOWN_WP_POSTS) {
+        remove_filter('the_content',     'wpautop');
         remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+        remove_filter('the_excerpt',     'wpautop');
+        add_filter('the_content',     'mdwp_MarkdownPost', 6);
         add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
-		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
-		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
-		add_filter('the_excerpt_rss', 'mdwp_strip_p');
-
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
-		add_filter('get_the_excerpt', 'balanceTags', 9);
-	}
-
-	# Add a footnote id prefix to posts when inside a loop.
-	function mdwp_MarkdownPost($text) {
-		static $parser;
-		if (!$parser) {
-			$parser_class = MARKDOWN_PARSER_CLASS;
-			$parser = new $parser_class;
-		}
-		if (is_single() || is_page() || is_feed()) {
-			$parser->fn_id_prefix = "";
-		} else {
-			$parser->fn_id_prefix = get_the_ID() . ".";
-		}
-		return $parser->transform($text);
-	}
-
-	# Comments
-	# - Remove WordPress paragraph generator.
-	# - Remove WordPress auto-link generator.
-	# - Scramble important tags before passing them to the kses filter.
-	# - Run Markdown on excerpt then remove paragraph tags.
-	if (MARKDOWN_WP_COMMENTS) {
-		remove_filter('comment_text', 'wpautop', 30);
-		remove_filter('comment_text', 'make_clickable');
-		add_filter('pre_comment_content', 'Markdown', 6);
-		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
-		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
-		add_filter('get_comment_excerpt', 'Markdown', 6);
-		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
-
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		$mdwp_hidden_tags = explode(' ',
-			'<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
-		$mdwp_placeholders = explode(' ', str_rot13(
-			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
-			'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
-	}
-
-	function mdwp_add_p($text) {
-		if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
-			$text = '<p>'.$text.'</p>';
-			$text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
-		}
-		return $text;
-	}
-
-	function mdwp_strip_p($t) { return preg_replace('{</?p>}i', '', $t); }
-
-	function mdwp_hide_tags($text) {
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
-	}
-	function mdwp_show_tags($text) {
-		global $mdwp_hidden_tags, $mdwp_placeholders;
-		return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
-	}
+        add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
+        add_filter('get_the_excerpt', 'trim', 7);
+        add_filter('the_excerpt',     'mdwp_add_p');
+        add_filter('the_excerpt_rss', 'mdwp_strip_p');
+
+        remove_filter('content_save_pre',  'balanceTags', 50);
+        remove_filter('excerpt_save_pre',  'balanceTags', 50);
+        add_filter('the_content',  	  'balanceTags', 50);
+        add_filter('get_the_excerpt', 'balanceTags', 9);
+    }
+
+    # Add a footnote id prefix to posts when inside a loop.
+    function mdwp_MarkdownPost($text) {
+        static $parser;
+        if (!$parser) {
+            $parser_class = MARKDOWN_PARSER_CLASS;
+            $parser = new $parser_class;
+        }
+        if (is_single() || is_page() || is_feed()) {
+            $parser->fn_id_prefix = "";
+        } else {
+            $parser->fn_id_prefix = get_the_ID() . ".";
+        }
+        return $parser->transform($text);
+    }
+
+    # Comments
+    # - Remove WordPress paragraph generator.
+    # - Remove WordPress auto-link generator.
+    # - Scramble important tags before passing them to the kses filter.
+    # - Run Markdown on excerpt then remove paragraph tags.
+    if (MARKDOWN_WP_COMMENTS) {
+        remove_filter('comment_text', 'wpautop', 30);
+        remove_filter('comment_text', 'make_clickable');
+        add_filter('pre_comment_content', 'Markdown', 6);
+        add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
+        add_filter('pre_comment_content', 'mdwp_show_tags', 12);
+        add_filter('get_comment_text',    'Markdown', 6);
+        add_filter('get_comment_excerpt', 'Markdown', 6);
+        add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
+
+        global $mdwp_hidden_tags, $mdwp_placeholders;
+        $mdwp_hidden_tags = explode(' ',
+            '<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
+        $mdwp_placeholders = explode(' ', str_rot13(
+            'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
+            'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
+    }
+
+    function mdwp_add_p($text) {
+        if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
+            $text = '<p>'.$text.'</p>';
+            $text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
+        }
+        return $text;
+    }
+
+    function mdwp_strip_p($t) { return preg_replace('{</?p>}i', '', $t); }
+
+    function mdwp_hide_tags($text) {
+        global $mdwp_hidden_tags, $mdwp_placeholders;
+        return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
+    }
+    function mdwp_show_tags($text) {
+        global $mdwp_hidden_tags, $mdwp_placeholders;
+        return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
+    }
 }
 
 
 ### bBlog Plugin Info ###
 
 function identify_modifier_markdown() {
-	return array(
-		'name' => 'markdown',
-		'type' => 'modifier',
-		'nicename' => 'PHP Markdown Extra',
-		'description' => 'A text-to-HTML conversion tool for web writers',
-		'authors' => 'Michel Fortin and John Gruber',
-		'licence' => 'GPL',
-		'version' => MARKDOWNEXTRA_VERSION,
-		'help' => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://michelf.com/projects/php-markdown/">More...</a>',
-		);
+    return array(
+        'name' => 'markdown',
+        'type' => 'modifier',
+        'nicename' => 'PHP Markdown Extra',
+        'description' => 'A text-to-HTML conversion tool for web writers',
+        'authors' => 'Michel Fortin and John Gruber',
+        'licence' => 'GPL',
+        'version' => MARKDOWNEXTRA_VERSION,
+        'help' => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://michelf.com/projects/php-markdown/">More...</a>',
+        );
 }
 
 
 ### Smarty Modifier Interface ###
 
 function smarty_modifier_markdown($text) {
-	return Markdown($text);
+    return Markdown($text);
 }
 
 
@@ -188,22 +188,22 @@ 
 # Rename this file to "classTextile.php" and it can replace Textile everywhere.
 
 if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) {
-	# Try to include PHP SmartyPants. Should be in the same directory.
-	@include_once 'smartypants.php';
-	# Fake Textile class. It calls Markdown instead.
-	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
-			if ($lite == '' && $encode == '')    $text = Markdown($text);
-			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
-			return $text;
-		}
-		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
-			return $this->TextileThis($text, $lite);
-		}
-		# Workaround to ensure compatibility with TextPattern 4.0.3.
-		function blockLite($text) { return $text; }
-	}
+    # Try to include PHP SmartyPants. Should be in the same directory.
+    @include_once 'smartypants.php';
+    # Fake Textile class. It calls Markdown instead.
+    class Textile {
+        function TextileThis($text, $lite='', $encode='') {
+            if ($lite == '' && $encode == '')    $text = Markdown($text);
+            if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+            return $text;
+        }
+        # Fake restricted version: restrictions are not supported for now.
+        function TextileRestricted($text, $lite='', $noimage='') {
+            return $this->TextileThis($text, $lite);
+        }
+        # Workaround to ensure compatibility with TextPattern 4.0.3.
+        function blockLite($text) { return $text; }
+    }
 }
 
 
@@ -214,144 +214,144 @@ 
 
 class Markdown_Parser {
 
-	# Regex to match balanced [brackets].
-	# Needed to insert a maximum bracked depth while converting to PHP.
-	var $nested_brackets_depth = 6;
-	var $nested_brackets_re;
+    # Regex to match balanced [brackets].
+    # Needed to insert a maximum bracked depth while converting to PHP.
+    var $nested_brackets_depth = 6;
+    var $nested_brackets_re;
 
-	var $nested_url_parenthesis_depth = 4;
-	var $nested_url_parenthesis_re;
+    var $nested_url_parenthesis_depth = 4;
+    var $nested_url_parenthesis_re;
 
-	# Table of hash values for escaped characters:
-	var $escape_chars = '\`*_{}[]()>#+-.!';
-	var $escape_chars_re;
+    # Table of hash values for escaped characters:
+    var $escape_chars = '\`*_{}[]()>#+-.!';
+    var $escape_chars_re;
 
-	# Change to ">" for HTML output.
-	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
-	var $tab_width = MARKDOWN_TAB_WIDTH;
+    # Change to ">" for HTML output.
+    var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+    var $tab_width = MARKDOWN_TAB_WIDTH;
 
-	# Change to `true` to disallow markup or entities.
-	var $no_markup = false;
-	var $no_entities = false;
+    # Change to `true` to disallow markup or entities.
+    var $no_markup = false;
+    var $no_entities = false;
 
-	# Predefined urls and titles for reference links and images.
-	var $predef_urls = array();
-	var $predef_titles = array();
+    # Predefined urls and titles for reference links and images.
+    var $predef_urls = array();
+    var $predef_titles = array();
 
 
-	function Markdown_Parser() {
-	#
-	# Constructor function. Initialize appropriate member variables.
-	#
-		$this->_initDetab();
-		$this->prepareItalicsAndBold();
+    function Markdown_Parser() {
+    #
+    # Constructor function. Initialize appropriate member variables.
+    #
+        $this->_initDetab();
+        $this->prepareItalicsAndBold();
 
-		$this->nested_brackets_re =
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-			str_repeat('\])*', $this->nested_brackets_depth);
+        $this->nested_brackets_re =
+            str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+            str_repeat('\])*', $this->nested_brackets_depth);
 
-		$this->nested_url_parenthesis_re =
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+        $this->nested_url_parenthesis_re =
+            str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+            str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
 
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+        $this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
 
-		# Sort document, block, and span gamut in ascendent priority order.
-		asort($this->document_gamut);
-		asort($this->block_gamut);
-		asort($this->span_gamut);
-	}
+        # Sort document, block, and span gamut in ascendent priority order.
+        asort($this->document_gamut);
+        asort($this->block_gamut);
+        asort($this->span_gamut);
+    }
 
 
-	# Internal hashes used during transformation.
-	var $urls = array();
-	var $titles = array();
-	var $html_hashes = array();
+    # Internal hashes used during transformation.
+    var $urls = array();
+    var $titles = array();
+    var $html_hashes = array();
 
-	# Status flag to avoid invalid nesting.
-	var $in_anchor = false;
+    # Status flag to avoid invalid nesting.
+    var $in_anchor = false;
 
 
-	function setup() {
-	#
-	# Called before the transformation process starts to setup parser
-	# states.
-	#
-		# Clear global hashes.
-		$this->urls = $this->predef_urls;
-		$this->titles = $this->predef_titles;
-		$this->html_hashes = array();
+    function setup() {
+    #
+    # Called before the transformation process starts to setup parser
+    # states.
+    #
+        # Clear global hashes.
+        $this->urls = $this->predef_urls;
+        $this->titles = $this->predef_titles;
+        $this->html_hashes = array();
 
-		$in_anchor = false;
-	}
+        $in_anchor = false;
+    }
 
-	function teardown() {
-	#
-	# Called after the transformation process to clear any variable
-	# which may be taking up memory unnecessarly.
-	#
-		$this->urls = array();
-		$this->titles = array();
-		$this->html_hashes = array();
-	}
+    function teardown() {
+    #
+    # Called after the transformation process to clear any variable
+    # which may be taking up memory unnecessarly.
+    #
+        $this->urls = array();
+        $this->titles = array();
+        $this->html_hashes = array();
+    }
 
 
-	function transform($text) {
-	#
-	# Main function. Performs some preprocessing on the input text
-	# and pass it through the document gamut.
-	#
-		$this->setup();
+    function transform($text) {
+    #
+    # Main function. Performs some preprocessing on the input text
+    # and pass it through the document gamut.
+    #
+        $this->setup();
 
-		# Remove UTF-8 BOM and marker character in input, if present.
-		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+        # Remove UTF-8 BOM and marker character in input, if present.
+        $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
 
-		# Standardize line endings:
-		#   DOS to Unix and Mac to Unix
-		$text = preg_replace('{\r\n?}', "\n", $text);
+        # Standardize line endings:
+        #   DOS to Unix and Mac to Unix
+        $text = preg_replace('{\r\n?}', "\n", $text);
 
-		# Make sure $text ends with a couple of newlines:
-		$text .= "\n\n";
+        # Make sure $text ends with a couple of newlines:
+        $text .= "\n\n";
 
-		# Convert all tabs to spaces.
-		$text = $this->detab($text);
+        # Convert all tabs to spaces.
+        $text = $this->detab($text);
 
-		# Turn block-level HTML blocks into hash entries
-		$text = $this->hashHTMLBlocks($text);
+        # Turn block-level HTML blocks into hash entries
+        $text = $this->hashHTMLBlocks($text);
 
-		# Strip any lines consisting only of spaces and tabs.
-		# This makes subsequent regexen easier to write, because we can
-		# match consecutive blank lines with /\n+/ instead of something
-		# contorted like /[ ]*\n+/ .
-		$text = preg_replace('/^[ ]+$/m', '', $text);
+        # Strip any lines consisting only of spaces and tabs.
+        # This makes subsequent regexen easier to write, because we can
+        # match consecutive blank lines with /\n+/ instead of something
+        # contorted like /[ ]*\n+/ .
+        $text = preg_replace('/^[ ]+$/m', '', $text);
 
-		# Run document gamut methods.
-		foreach ($this->document_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
+        # Run document gamut methods.
+        foreach ($this->document_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
 
-		$this->teardown();
+        $this->teardown();
 
-		return $text . "\n";
-	}
+        return $text . "\n";
+    }
 
-	var $document_gamut = array(
-		# Strip link definitions, store in hashes.
-		"stripLinkDefinitions" => 20,
+    var $document_gamut = array(
+        # Strip link definitions, store in hashes.
+        "stripLinkDefinitions" => 20,
 
-		"runBasicBlockGamut"   => 30,
-		);
+        "runBasicBlockGamut"   => 30,
+        );
 
 
-	function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
+    function stripLinkDefinitions($text) {
+    #
+    # Strips link definitions from text, stores the URLs and titles in
+    # hash references.
+    #
+        $less_than_tab = $this->tab_width - 1;
 
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
+        # Link defs are in the form: ^[id]: url "optional title"
+        $text = preg_replace_callback('{
 							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -373,44 +373,44 @@ 
 							)?	# title is optional
 							(?:\n+|\Z)
 			}xm',
-			array(&$this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		return ''; # String that will replace the block
-	}
-
-
-	function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
-
-		$less_than_tab = $this->tab_width - 1;
-
-		# Hashify HTML blocks:
-		# We only want to do this for block-level HTML tags, such as headers,
-		# lists, and tables. That's because we still want to wrap <p>s around
-		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-		# phrase emphasis, and spans. The list of tags we're looking for is
-		# hard-coded:
-		#
-		# *  List "a" is made of tags which can be both inline or block-level.
-		#    These will be treated block-level when the start tag is alone on
-		#    its line, otherwise they're not matched here and will be taken as
-		#    inline later.
-		# *  List "b" is made of tags which are always block-level;
-		#
-		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|form|fieldset|iframe|math';
-
-		# Regular expression for the content of a block tag.
-		$nested_tags_level = 4;
-		$attr = '
+            array(&$this, '_stripLinkDefinitions_callback'),
+            $text);
+        return $text;
+    }
+    function _stripLinkDefinitions_callback($matches) {
+        $link_id = strtolower($matches[1]);
+        $url = $matches[2] == '' ? $matches[3] : $matches[2];
+        $this->urls[$link_id] = $url;
+        $this->titles[$link_id] =& $matches[4];
+        return ''; # String that will replace the block
+    }
+
+
+    function hashHTMLBlocks($text) {
+        if ($this->no_markup)  return $text;
+
+        $less_than_tab = $this->tab_width - 1;
+
+        # Hashify HTML blocks:
+        # We only want to do this for block-level HTML tags, such as headers,
+        # lists, and tables. That's because we still want to wrap <p>s around
+        # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+        # phrase emphasis, and spans. The list of tags we're looking for is
+        # hard-coded:
+        #
+        # *  List "a" is made of tags which can be both inline or block-level.
+        #    These will be treated block-level when the start tag is alone on
+        #    its line, otherwise they're not matched here and will be taken as
+        #    inline later.
+        # *  List "b" is made of tags which are always block-level;
+        #
+        $block_tags_a_re = 'ins|del';
+        $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+                            'script|noscript|form|fieldset|iframe|math';
+
+        # Regular expression for the content of a block tag.
+        $nested_tags_level = 4;
+        $attr = '
 			(?>				# optional tag attributes
 			  \s			# starts with whitespace
 			  (?>
@@ -424,8 +424,8 @@ 
 			  )*
 			)?
 			';
-		$content =
-			str_repeat('
+        $content =
+            str_repeat('
 				(?>
 				  [^<]+			# content without tag
 				|
@@ -435,29 +435,29 @@ 
 					  />
 					|
 					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
-			str_repeat('
+                        '.*?'.					# last level nested tag content
+            str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
 				  |
 					<(?!/\2\s*>	# other tags with a different name
 				  )
 				)*',
-				$nested_tags_level);
-		$content2 = str_replace('\2', '\3', $content);
-
-		# First, look for nested blocks, e.g.:
-		# 	<div>
-		# 		<div>
-		# 		tags for inner block must be indented.
-		# 		</div>
-		# 	</div>
-		#
-		# The outermost tags must start at the left margin for this to match, and
-		# the inner nested divs must be indented.
-		# We need to do this before the next, more liberal match, because the next
-		# match will start at the first `<div>` and stop at the first `</div>`.
-		$text = preg_replace_callback('{(?>
+                $nested_tags_level);
+        $content2 = str_replace('\2', '\3', $content);
+
+        # First, look for nested blocks, e.g.:
+        # 	<div>
+        # 		<div>
+        # 		tags for inner block must be indented.
+        # 		</div>
+        # 	</div>
+        #
+        # The outermost tags must start at the left margin for this to match, and
+        # the inner nested divs must be indented.
+        # We need to do this before the next, more liberal match, because the next
+        # match will start at the first `<div>` and stop at the first `</div>`.
+        $text = preg_replace_callback('{(?>
 			(?>
 				(?<=\n\n)		# Starting after a blank line
 				|				# or
@@ -518,97 +518,97 @@ 
 
 			)
 			)}Sxmi',
-			array(&$this, '_hashHTMLBlocks_callback'),
-			$text);
-
-		return $text;
-	}
-	function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
-		$key  = $this->hashBlock($text);
-		return "\n\n$key\n\n";
-	}
-
-
-	function hashPart($text, $boundary = 'X') {
-	#
-	# Called whenever a tag must be hashed when a function insert an atomic
-	# element in the text stream. Passing $text to through this function gives
-	# a unique text-token which will be reverted back when calling unhash.
-	#
-	# The $boundary argument specify what character should be used to surround
-	# the token. By convension, "B" is used for block elements that needs not
-	# to be wrapped into paragraph tags at the end, ":" is used for elements
-	# that are word separators and "X" is used in the general case.
-	#
-		# Swap back any tag hash found in $text so we do not have to `unhash`
-		# multiple times at the end.
-		$text = $this->unhash($text);
-
-		# Then hash the block.
-		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
-		return $key; # String that will replace the tag.
-	}
-
-
-	function hashBlock($text) {
-	#
-	# Shortcut function for hashPart with block-level boundaries.
-	#
-		return $this->hashPart($text, 'B');
-	}
-
-
-	var $block_gamut = array(
-	#
-	# These are all the transformations that form block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		"doHeaders"         => 10,
-		"doHorizontalRules" => 20,
-
-		"doLists"           => 40,
-		"doCodeBlocks"      => 50,
-		"doBlockQuotes"     => 60,
-		);
-
-	function runBlockGamut($text) {
-	#
-	# Run block gamut tranformations.
-	#
-		# We need to escape raw HTML in Markdown source before doing anything
-		# else. This need to be done for each block, and not only at the
-		# begining in the Markdown function since hashed blocks can be part of
-		# list items and could have been indented. Indented blocks would have
-		# been seen as a code block in a previous pass of hashHTMLBlocks.
-		$text = $this->hashHTMLBlocks($text);
-
-		return $this->runBasicBlockGamut($text);
-	}
-
-	function runBasicBlockGamut($text) {
-	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is
-	# useful when HTML blocks are known to be already hashed, like in the first
-	# whole-document pass.
-	#
-		foreach ($this->block_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		# Finally form paragraph and restore hashed blocks.
-		$text = $this->formParagraphs($text);
-
-		return $text;
-	}
-
-
-	function doHorizontalRules($text) {
-		# Do Horizontal Rules:
-		return preg_replace(
-			'{
+            array(&$this, '_hashHTMLBlocks_callback'),
+            $text);
+
+        return $text;
+    }
+    function _hashHTMLBlocks_callback($matches) {
+        $text = $matches[1];
+        $key  = $this->hashBlock($text);
+        return "\n\n$key\n\n";
+    }
+
+
+    function hashPart($text, $boundary = 'X') {
+    #
+    # Called whenever a tag must be hashed when a function insert an atomic
+    # element in the text stream. Passing $text to through this function gives
+    # a unique text-token which will be reverted back when calling unhash.
+    #
+    # The $boundary argument specify what character should be used to surround
+    # the token. By convension, "B" is used for block elements that needs not
+    # to be wrapped into paragraph tags at the end, ":" is used for elements
+    # that are word separators and "X" is used in the general case.
+    #
+        # Swap back any tag hash found in $text so we do not have to `unhash`
+        # multiple times at the end.
+        $text = $this->unhash($text);
+
+        # Then hash the block.
+        static $i = 0;
+        $key = "$boundary\x1A" . ++$i . $boundary;
+        $this->html_hashes[$key] = $text;
+        return $key; # String that will replace the tag.
+    }
+
+
+    function hashBlock($text) {
+    #
+    # Shortcut function for hashPart with block-level boundaries.
+    #
+        return $this->hashPart($text, 'B');
+    }
+
+
+    var $block_gamut = array(
+    #
+    # These are all the transformations that form block-level
+    # tags like paragraphs, headers, and list items.
+    #
+        "doHeaders"         => 10,
+        "doHorizontalRules" => 20,
+
+        "doLists"           => 40,
+        "doCodeBlocks"      => 50,
+        "doBlockQuotes"     => 60,
+        );
+
+    function runBlockGamut($text) {
+    #
+    # Run block gamut tranformations.
+    #
+        # We need to escape raw HTML in Markdown source before doing anything
+        # else. This need to be done for each block, and not only at the
+        # begining in the Markdown function since hashed blocks can be part of
+        # list items and could have been indented. Indented blocks would have
+        # been seen as a code block in a previous pass of hashHTMLBlocks.
+        $text = $this->hashHTMLBlocks($text);
+
+        return $this->runBasicBlockGamut($text);
+    }
+
+    function runBasicBlockGamut($text) {
+    #
+    # Run block gamut tranformations, without hashing HTML blocks. This is
+    # useful when HTML blocks are known to be already hashed, like in the first
+    # whole-document pass.
+    #
+        foreach ($this->block_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        # Finally form paragraph and restore hashed blocks.
+        $text = $this->formParagraphs($text);
+
+        return $text;
+    }
+
+
+    function doHorizontalRules($text) {
+        # Do Horizontal Rules:
+        return preg_replace(
+            '{
 				^[ ]{0,3}	# Leading space
 				([-*_])		# $1: First marker
 				(?>			# Repeated marker group
@@ -618,68 +618,68 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
-			$text);
-	}
-
-
-	var $span_gamut = array(
-	#
-	# These are all the transformations that occur *within* block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		# Process character escapes, code spans, and inline HTML
-		# in one shot.
-		"parseSpan"           => -30,
-
-		# Process anchor and image tags. Images must come first,
-		# because ![foo][f] looks like an anchor.
-		"doImages"            =>  10,
-		"doAnchors"           =>  20,
-
-		# Make links out of things like `<http://example.com/>`
-		# Must come after doAnchors, because you can use < and >
-		# delimiters in inline links like [this](<url>).
-		"doAutoLinks"         =>  30,
-		"encodeAmpsAndAngles" =>  40,
-
-		"doItalicsAndBold"    =>  50,
-		"doHardBreaks"        =>  60,
-		);
-
-	function runSpanGamut($text) {
-	#
-	# Run span gamut tranformations.
-	#
-		foreach ($this->span_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		return $text;
-	}
-
-
-	function doHardBreaks($text) {
-		# Do hard breaks:
-		return preg_replace_callback('/ {2,}\n/',
-			array(&$this, '_doHardBreaks_callback'), $text);
-	}
-	function _doHardBreaks_callback($matches) {
-		return $this->hashPart("<br$this->empty_element_suffix\n");
-	}
-
-
-	function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML <a> tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
-
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
+            "\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
+            $text);
+    }
+
+
+    var $span_gamut = array(
+    #
+    # These are all the transformations that occur *within* block-level
+    # tags like paragraphs, headers, and list items.
+    #
+        # Process character escapes, code spans, and inline HTML
+        # in one shot.
+        "parseSpan"           => -30,
+
+        # Process anchor and image tags. Images must come first,
+        # because ![foo][f] looks like an anchor.
+        "doImages"            =>  10,
+        "doAnchors"           =>  20,
+
+        # Make links out of things like `<http://example.com/>`
+        # Must come after doAnchors, because you can use < and >
+        # delimiters in inline links like [this](<url>).
+        "doAutoLinks"         =>  30,
+        "encodeAmpsAndAngles" =>  40,
+
+        "doItalicsAndBold"    =>  50,
+        "doHardBreaks"        =>  60,
+        );
+
+    function runSpanGamut($text) {
+    #
+    # Run span gamut tranformations.
+    #
+        foreach ($this->span_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        return $text;
+    }
+
+
+    function doHardBreaks($text) {
+        # Do hard breaks:
+        return preg_replace_callback('/ {2,}\n/',
+            array(&$this, '_doHardBreaks_callback'), $text);
+    }
+    function _doHardBreaks_callback($matches) {
+        return $this->hashPart("<br$this->empty_element_suffix\n");
+    }
+
+
+    function doAnchors($text) {
+    #
+    # Turn Markdown link shortcuts into XHTML <a> tags.
+    #
+        if ($this->in_anchor) return $text;
+        $this->in_anchor = true;
+
+        #
+        # First, handle reference-style links: [link text] [id]
+        #
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -693,12 +693,12 @@ 
 			  \]
 			)
 			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
+            array(&$this, '_doAnchors_reference_callback'), $text);
 
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
+        #
+        # Next, inline-style links: [link text](url "optional title")
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -720,88 +720,88 @@ 
 			  \)
 			)
 			}xs',
-			array(&$this, '_doAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link text][1]
-		# or [link text](/foo)
-		#
-		$text = preg_replace_callback('{
+            array(&$this, '_doAnchors_inline_callback'), $text);
+
+        #
+        # Last, handle reference-style shortcuts: [link text]
+        # These must come last in case you've also got [link text][1]
+        # or [link text](/foo)
+        #
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-			array(&$this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
-
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeAttribute($url);
-
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$url = $this->encodeAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
-
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
-
-		return $this->hashPart($result);
-	}
-
-
-	function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into <img> tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
+            array(&$this, '_doAnchors_reference_callback'), $text);
+
+        $this->in_anchor = false;
+        return $text;
+    }
+    function _doAnchors_reference_callback($matches) {
+        $whole_match =  $matches[1];
+        $link_text   =  $matches[2];
+        $link_id     =& $matches[3];
+
+        if ($link_id == "") {
+            # for shortcut links like [this][] or [this].
+            $link_id = $link_text;
+        }
+
+        # lower-case and turn embedded newlines into spaces
+        $link_id = strtolower($link_id);
+        $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+        if (isset($this->urls[$link_id])) {
+            $url = $this->urls[$link_id];
+            $url = $this->encodeAttribute($url);
+
+            $result = "<a href=\"$url\"";
+            if ( isset( $this->titles[$link_id] ) ) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+
+            $link_text = $this->runSpanGamut($link_text);
+            $result .= ">$link_text</a>";
+            $result = $this->hashPart($result);
+        }
+        else {
+            $result = $whole_match;
+        }
+        return $result;
+    }
+    function _doAnchors_inline_callback($matches) {
+        $whole_match	=  $matches[1];
+        $link_text		=  $this->runSpanGamut($matches[2]);
+        $url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        $url = $this->encodeAttribute($url);
+
+        $result = "<a href=\"$url\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\"";
+        }
+
+        $link_text = $this->runSpanGamut($link_text);
+        $result .= ">$link_text</a>";
+
+        return $this->hashPart($result);
+    }
+
+
+    function doImages($text) {
+    #
+    # Turn Markdown image shortcuts into <img> tags.
+    #
+        #
+        # First, handle reference-style labeled images: ![alt text][id]
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -816,13 +816,13 @@ 
 
 			)
 			}xs',
-			array(&$this, '_doImages_reference_callback'), $text);
+            array(&$this, '_doImages_reference_callback'), $text);
 
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
+        #
+        # Next, handle inline images:  ![alt text](url "optional title")
+        # Don't forget: encode * and _
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -845,76 +845,76 @@ 
 			  \)
 			)
 			}xs',
-			array(&$this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	function doHeaders($text) {
-		# Setext-style headers:
-		#	  Header 1
-		#	  ========
-		#
-		#	  Header 2
-		#	  --------
-		#
-		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1
-		#	## Header 2
-		#	## Header 2 with closing hashes ##
-		#	...
-		#	###### Header 6
-		#
-		$text = preg_replace_callback('{
+            array(&$this, '_doImages_inline_callback'), $text);
+
+        return $text;
+    }
+    function _doImages_reference_callback($matches) {
+        $whole_match = $matches[1];
+        $alt_text    = $matches[2];
+        $link_id     = strtolower($matches[3]);
+
+        if ($link_id == "") {
+            $link_id = strtolower($alt_text); # for shortcut links like ![this][].
+        }
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        if (isset($this->urls[$link_id])) {
+            $url = $this->encodeAttribute($this->urls[$link_id]);
+            $result = "<img src=\"$url\" alt=\"$alt_text\"";
+            if (isset($this->titles[$link_id])) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+            $result .= $this->empty_element_suffix;
+            $result = $this->hashPart($result);
+        }
+        else {
+            # If there's no such link ID, leave intact:
+            $result = $whole_match;
+        }
+
+        return $result;
+    }
+    function _doImages_inline_callback($matches) {
+        $whole_match	= $matches[1];
+        $alt_text		= $matches[2];
+        $url			= $matches[3] == '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        $url = $this->encodeAttribute($url);
+        $result = "<img src=\"$url\" alt=\"$alt_text\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\""; # $title already quoted
+        }
+        $result .= $this->empty_element_suffix;
+
+        return $this->hashPart($result);
+    }
+
+
+    function doHeaders($text) {
+        # Setext-style headers:
+        #	  Header 1
+        #	  ========
+        #
+        #	  Header 2
+        #	  --------
+        #
+        $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+            array(&$this, '_doHeaders_callback_setext'), $text);
+
+        # atx-style headers:
+        #	# Header 1
+        #	## Header 2
+        #	## Header 2 with closing hashes ##
+        #	...
+        #	###### Header 6
+        #
+        $text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -922,45 +922,45 @@ 
 				\#*			# optional closing #\'s (not counted)
 				\n+
 			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	function _doHeaders_callback_setext($matches) {
-		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
-
-		$level = $matches[2]{0} == '=' ? 1 : 2;
-		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	function doLists($text) {
-	#
-	# Form HTML ordered (numbered) and unordered (bulleted) lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
-		$markers_relist = array(
-			$marker_ul_re => $marker_ol_re,
-			$marker_ol_re => $marker_ul_re,
-			);
-
-		foreach ($markers_relist as $marker_re => $other_marker_re) {
-			# Re-usable pattern to match any entirel ul or ol list:
-			$whole_list_re = '
+            array(&$this, '_doHeaders_callback_atx'), $text);
+
+        return $text;
+    }
+    function _doHeaders_callback_setext($matches) {
+        # Terrible hack to check we haven't found an empty list item.
+        if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+            return $matches[0];
+
+        $level = $matches[2]{0} == '=' ? 1 : 2;
+        $block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+    function _doHeaders_callback_atx($matches) {
+        $level = strlen($matches[1]);
+        $block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+
+    function doLists($text) {
+    #
+    # Form HTML ordered (numbered) and unordered (bulleted) lists.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[.]';
+        $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+        $markers_relist = array(
+            $marker_ul_re => $marker_ol_re,
+            $marker_ol_re => $marker_ul_re,
+            );
+
+        foreach ($markers_relist as $marker_re => $other_marker_re) {
+            # Re-usable pattern to match any entirel ul or ol list:
+            $whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
 					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
@@ -987,79 +987,79 @@ 
 				)
 			'; // mx
 
-			# We use a different prefix before nested lists than top-level lists.
-			# See extended comment in _ProcessListItems().
+            # We use a different prefix before nested lists than top-level lists.
+            # See extended comment in _ProcessListItems().
 
-			if ($this->list_level) {
-				$text = preg_replace_callback('{
+            if ($this->list_level) {
+                $text = preg_replace_callback('{
 						^
 						'.$whole_list_re.'
 					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
-				$text = preg_replace_callback('{
+                    array(&$this, '_doLists_callback'), $text);
+            }
+            else {
+                $text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
 					}mx',
-					array(&$this, '_doLists_callback'), $text);
-			}
-		}
-
-		return $text;
-	}
-	function _doLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-
-		$list .= "\n";
-		$result = $this->processListItems($list, $marker_any_re);
-
-		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
-	}
-
-	var $list_level = 0;
-
-	function processListItems($list_str, $marker_any_re) {
-	#
-	#	Process the contents of a single ordered or unordered list, splitting it
-	#	into individual list items.
-	#
-		# The $this->list_level global keeps track of when we're inside a list.
-		# Each time we enter a list, we increment it; when we leave a list,
-		# we decrement. If it's zero, we're not in a list anymore.
-		#
-		# We do this because when we're not inside a list, we want to treat
-		# something like this:
-		#
-		#		I recommend upgrading to version
-		#		8. Oops, now this line is treated
-		#		as a sub-list.
-		#
-		# As a single paragraph, despite the fact that the second line starts
-		# with a digit-period-space sequence.
-		#
-		# Whereas when we're inside a list (or sub-list), that line will be
-		# treated as the start of a sub-list. What a kludge, huh? This is
-		# an aspect of Markdown's syntax that's hard to parse perfectly
-		# without resorting to mind-reading. Perhaps the solution is to
-		# change the syntax rules such that sub-lists must start with a
-		# starting cardinal number; e.g. "1." or "a.".
-
-		$this->list_level++;
-
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		$list_str = preg_replace_callback('{
+                    array(&$this, '_doLists_callback'), $text);
+            }
+        }
+
+        return $text;
+    }
+    function _doLists_callback($matches) {
+        # Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[.]';
+        $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+        $list = $matches[1];
+        $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
+
+        $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+
+        $list .= "\n";
+        $result = $this->processListItems($list, $marker_any_re);
+
+        $result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+        return "\n". $result ."\n\n";
+    }
+
+    var $list_level = 0;
+
+    function processListItems($list_str, $marker_any_re) {
+    #
+    #	Process the contents of a single ordered or unordered list, splitting it
+    #	into individual list items.
+    #
+        # The $this->list_level global keeps track of when we're inside a list.
+        # Each time we enter a list, we increment it; when we leave a list,
+        # we decrement. If it's zero, we're not in a list anymore.
+        #
+        # We do this because when we're not inside a list, we want to treat
+        # something like this:
+        #
+        #		I recommend upgrading to version
+        #		8. Oops, now this line is treated
+        #		as a sub-list.
+        #
+        # As a single paragraph, despite the fact that the second line starts
+        # with a digit-period-space sequence.
+        #
+        # Whereas when we're inside a list (or sub-list), that line will be
+        # treated as the start of a sub-list. What a kludge, huh? This is
+        # an aspect of Markdown's syntax that's hard to parse perfectly
+        # without resorting to mind-reading. Perhaps the solution is to
+        # change the syntax rules such that sub-lists must start with a
+        # starting cardinal number; e.g. "1." or "a.".
+
+        $this->list_level++;
+
+        # trim trailing blank lines:
+        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+        $list_str = preg_replace_callback('{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
 			('.$marker_any_re.'				# list marker and space = $3
@@ -1069,41 +1069,41 @@ 
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
 			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
 			}xm',
-			array(&$this, '_processListItems_callback'), $list_str);
-
-		$this->list_level--;
-		return $list_str;
-	}
-	function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
-
-		if ($leading_line || $tailing_blank_line ||
-			preg_match('/\n{2,}/', $item))
-		{
-			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
-			# Recursion for sub-lists:
-			$item = $this->doLists($this->outdent($item));
-			$item = preg_replace('/\n+$/', '', $item);
-			$item = $this->runSpanGamut($item);
-		}
-
-		return "<li>" . $item . "</li>\n";
-	}
-
-
-	function doCodeBlocks($text) {
-	#
-	#	Process Markdown `<pre><code>` blocks.
-	#
-		$text = preg_replace_callback('{
+            array(&$this, '_processListItems_callback'), $list_str);
+
+        $this->list_level--;
+        return $list_str;
+    }
+    function _processListItems_callback($matches) {
+        $item = $matches[4];
+        $leading_line =& $matches[1];
+        $leading_space =& $matches[2];
+        $marker_space = $matches[3];
+        $tailing_blank_line =& $matches[5];
+
+        if ($leading_line || $tailing_blank_line ||
+            preg_match('/\n{2,}/', $item))
+        {
+            # Replace marker with the appropriate whitespace indentation
+            $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+            $item = $this->runBlockGamut($this->outdent($item)."\n");
+        }
+        else {
+            # Recursion for sub-lists:
+            $item = $this->doLists($this->outdent($item));
+            $item = preg_replace('/\n+$/', '', $item);
+            $item = $this->runSpanGamut($item);
+        }
+
+        return "<li>" . $item . "</li>\n";
+    }
+
+
+    function doCodeBlocks($text) {
+    #
+    #	Process Markdown `<pre><code>` blocks.
+    #
+        $text = preg_replace_callback('{
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
 				  (?>
@@ -1113,197 +1113,197 @@ 
 				)
 				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
-			array(&$this, '_doCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
-
-		$codeblock = $this->outdent($codeblock);
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
-		# trim leading newlines and trailing newlines
-		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
-		$codeblock = "<pre><code>$codeblock\n</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-
-
-	function makeCodeSpan($code) {
-	#
-	# Create a code span markup for $code. Called from handleSpanToken.
-	#
-		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-		return $this->hashPart("<code>$code</code>");
-	}
-
-
-	var $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![.,:;]\s)',
-		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
-		'_' => '(?<=\S|^)(?<!_)_(?!_)',
-		);
-	var $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![.,:;]\s)',
-		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
-		'__' => '(?<=\S|^)(?<!_)__(?!_)',
-		);
-	var $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![.,:;]\s)',
-		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
-		'___' => '(?<=\S|^)(?<!_)___(?!_)',
-		);
-	var $em_strong_prepared_relist;
-
-	function prepareItalicsAndBold() {
-	#
-	# Prepare regular expressions for searching emphasis tokens in any
-	# context.
-	#
-		foreach ($this->em_relist as $em => $em_re) {
-			foreach ($this->strong_relist as $strong => $strong_re) {
-				# Construct list of allowed token expressions.
-				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
-				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
-
-				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
-			}
-		}
-	}
-
-	function doItalicsAndBold($text) {
-		$token_stack = array('');
-		$text_stack = array('');
-		$em = '';
-		$strong = '';
-		$tree_char_em = false;
-
-		while (1) {
-			#
-			# Get prepared regular expression for seraching emphasis tokens
-			# in current context.
-			#
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
-
-			#
-			# Each loop iteration search for the next emphasis token.
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
-
-			if (empty($token)) {
-				# Reached end of text span: empty stack without emitting.
-				# any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
-				}
-				break;
-			}
-
-			$token_len = strlen($token);
-			if ($tree_char_em) {
-				# Reached closing marker while inside a three-char emphasis.
-				if ($token_len == 3) {
-					# Three-char closing marker, close em and strong.
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong><em>$span</em></strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$em = '';
-					$strong = '';
-				} else {
-					# Other closing marker: close one em or strong and
-					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
-					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
-					$span = $this->runSpanGamut($span);
-					$span = "<$tag>$span</$tag>";
-					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; # $$tag stands for $em or $strong
-				}
-				$tree_char_em = false;
-			} else if ($token_len == 3) {
-				if ($em) {
-					# Reached closing marker for both em and strong.
-					# Closing strong marker:
-					for ($i = 0; $i < 2; ++$i) {
-						$shifted_token = array_shift($token_stack);
-						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<$tag>$span</$tag>";
-						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; # $$tag stands for $em or $strong
-					}
-				} else {
-					# Reached opening three-char emphasis marker. Push on token
-					# stack; will be handled by the special condition above.
-					$em = $token{0};
-					$strong = "$em$em";
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$tree_char_em = true;
-				}
-			} else if ($token_len == 2) {
-				if ($strong) {
-					# Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
-					}
-					# Closing strong marker:
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong>$span</strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$strong = '';
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$strong = $token;
-				}
-			} else {
-				# Here $token_len == 1
-				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
-						# Closing emphasis marker:
-						array_shift($token_stack);
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<em>$span</em>";
-						$text_stack[0] .= $this->hashPart($span);
-						$em = '';
-					} else {
-						$text_stack[0] .= $token;
-					}
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$em = $token;
-				}
-			}
-		}
-		return $text_stack[0];
-	}
-
-
-	function doBlockQuotes($text) {
-		$text = preg_replace_callback('/
+            array(&$this, '_doCodeBlocks_callback'), $text);
+
+        return $text;
+    }
+    function _doCodeBlocks_callback($matches) {
+        $codeblock = $matches[1];
+
+        $codeblock = $this->outdent($codeblock);
+        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+        # trim leading newlines and trailing newlines
+        $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+        $codeblock = "<pre><code>$codeblock\n</code></pre>";
+        return "\n\n".$this->hashBlock($codeblock)."\n\n";
+    }
+
+
+    function makeCodeSpan($code) {
+    #
+    # Create a code span markup for $code. Called from handleSpanToken.
+    #
+        $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+        return $this->hashPart("<code>$code</code>");
+    }
+
+
+    var $em_relist = array(
+        ''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S|$)(?![.,:;]\s)',
+        '*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
+        '_' => '(?<=\S|^)(?<!_)_(?!_)',
+        );
+    var $strong_relist = array(
+        ''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S|$)(?![.,:;]\s)',
+        '**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
+        '__' => '(?<=\S|^)(?<!_)__(?!_)',
+        );
+    var $em_strong_relist = array(
+        ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S|$)(?![.,:;]\s)',
+        '***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
+        '___' => '(?<=\S|^)(?<!_)___(?!_)',
+        );
+    var $em_strong_prepared_relist;
+
+    function prepareItalicsAndBold() {
+    #
+    # Prepare regular expressions for searching emphasis tokens in any
+    # context.
+    #
+        foreach ($this->em_relist as $em => $em_re) {
+            foreach ($this->strong_relist as $strong => $strong_re) {
+                # Construct list of allowed token expressions.
+                $token_relist = array();
+                if (isset($this->em_strong_relist["$em$strong"])) {
+                    $token_relist[] = $this->em_strong_relist["$em$strong"];
+                }
+                $token_relist[] = $em_re;
+                $token_relist[] = $strong_re;
+
+                # Construct master expression from list.
+                $token_re = '{('. implode('|', $token_relist) .')}';
+                $this->em_strong_prepared_relist["$em$strong"] = $token_re;
+            }
+        }
+    }
+
+    function doItalicsAndBold($text) {
+        $token_stack = array('');
+        $text_stack = array('');
+        $em = '';
+        $strong = '';
+        $tree_char_em = false;
+
+        while (1) {
+            #
+            # Get prepared regular expression for seraching emphasis tokens
+            # in current context.
+            #
+            $token_re = $this->em_strong_prepared_relist["$em$strong"];
+
+            #
+            # Each loop iteration search for the next emphasis token.
+            # Each token is then passed to handleSpanToken.
+            #
+            $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+            $text_stack[0] .= $parts[0];
+            $token =& $parts[1];
+            $text =& $parts[2];
+
+            if (empty($token)) {
+                # Reached end of text span: empty stack without emitting.
+                # any more emphasis.
+                while ($token_stack[0]) {
+                    $text_stack[1] .= array_shift($token_stack);
+                    $text_stack[0] .= array_shift($text_stack);
+                }
+                break;
+            }
+
+            $token_len = strlen($token);
+            if ($tree_char_em) {
+                # Reached closing marker while inside a three-char emphasis.
+                if ($token_len == 3) {
+                    # Three-char closing marker, close em and strong.
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong><em>$span</em></strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $em = '';
+                    $strong = '';
+                } else {
+                    # Other closing marker: close one em or strong and
+                    # change current token state to match the other
+                    $token_stack[0] = str_repeat($token{0}, 3-$token_len);
+                    $tag = $token_len == 2 ? "strong" : "em";
+                    $span = $text_stack[0];
+                    $span = $this->runSpanGamut($span);
+                    $span = "<$tag>$span</$tag>";
+                    $text_stack[0] = $this->hashPart($span);
+                    $$tag = ''; # $$tag stands for $em or $strong
+                }
+                $tree_char_em = false;
+            } else if ($token_len == 3) {
+                if ($em) {
+                    # Reached closing marker for both em and strong.
+                    # Closing strong marker:
+                    for ($i = 0; $i < 2; ++$i) {
+                        $shifted_token = array_shift($token_stack);
+                        $tag = strlen($shifted_token) == 2 ? "strong" : "em";
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<$tag>$span</$tag>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $$tag = ''; # $$tag stands for $em or $strong
+                    }
+                } else {
+                    # Reached opening three-char emphasis marker. Push on token
+                    # stack; will be handled by the special condition above.
+                    $em = $token{0};
+                    $strong = "$em$em";
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $tree_char_em = true;
+                }
+            } else if ($token_len == 2) {
+                if ($strong) {
+                    # Unwind any dangling emphasis marker:
+                    if (strlen($token_stack[0]) == 1) {
+                        $text_stack[1] .= array_shift($token_stack);
+                        $text_stack[0] .= array_shift($text_stack);
+                    }
+                    # Closing strong marker:
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong>$span</strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $strong = '';
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $strong = $token;
+                }
+            } else {
+                # Here $token_len == 1
+                if ($em) {
+                    if (strlen($token_stack[0]) == 1) {
+                        # Closing emphasis marker:
+                        array_shift($token_stack);
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<em>$span</em>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $em = '';
+                    } else {
+                        $text_stack[0] .= $token;
+                    }
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $em = $token;
+                }
+            }
+        }
+        return $text_stack[0];
+    }
+
+
+    function doBlockQuotes($text) {
+        $text = preg_replace_callback('/
 			  (								# Wrap whole match in $1
 				(?>
 				  ^[ ]*>[ ]?			# ">" at the start of a line
@@ -1313,58 +1313,58 @@ 
 				)+
 			  )
 			/xm',
-			array(&$this, '_doBlockQuotes_callback'), $text);
-
-		return $text;
-	}
-	function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
-		# trim one level of quoting - trim whitespace-only lines
-		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
-
-		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with <pre> content,
-		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
-			array(&$this, '_doBlockQuotes_callback2'), $bq);
-
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
-	}
-	function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
-		$pre = preg_replace('/^  /m', '', $pre);
-		return $pre;
-	}
-
-
-	function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html <p> tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap <p> tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				# Is a paragraph.
-				$value = $this->runSpanGamut($value);
-				$value = preg_replace('/^([ ]*)/', "<p>", $value);
-				$value .= "</p>";
-				$grafs[$key] = $this->unhash($value);
-			}
-			else {
-				# Is a block.
-				# Modify elements of @grafs in-place...
-				$graf = $value;
-				$block = $this->html_hashes[$graf];
-				$graf = $block;
+            array(&$this, '_doBlockQuotes_callback'), $text);
+
+        return $text;
+    }
+    function _doBlockQuotes_callback($matches) {
+        $bq = $matches[1];
+        # trim one level of quoting - trim whitespace-only lines
+        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+        $bq = $this->runBlockGamut($bq);		# recurse
+
+        $bq = preg_replace('/^/m', "  ", $bq);
+        # These leading spaces cause problem with <pre> content,
+        # so we need to fix that:
+        $bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
+            array(&$this, '_doBlockQuotes_callback2'), $bq);
+
+        return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+    }
+    function _doBlockQuotes_callback2($matches) {
+        $pre = $matches[1];
+        $pre = preg_replace('/^  /m', '', $pre);
+        return $pre;
+    }
+
+
+    function formParagraphs($text) {
+    #
+    #	Params:
+    #		$text - string to process with html <p> tags
+    #
+        # Strip leading and trailing lines:
+        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+        #
+        # Wrap <p> tags and unhashify HTML blocks
+        #
+        foreach ($grafs as $key => $value) {
+            if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+                # Is a paragraph.
+                $value = $this->runSpanGamut($value);
+                $value = preg_replace('/^([ ]*)/', "<p>", $value);
+                $value .= "</p>";
+                $grafs[$key] = $this->unhash($value);
+            }
+            else {
+                # Is a block.
+                # Modify elements of @grafs in-place...
+                $graf = $value;
+                $block = $this->html_hashes[$graf];
+                $graf = $block;
 //				if (preg_match('{
 //					\A
 //					(							# $1 = <div> tag
@@ -1400,52 +1400,52 @@ 
 //
 //					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
 //				}
-				$grafs[$key] = $graf;
-			}
-		}
-
-		return implode("\n\n", $grafs);
-	}
-
-
-	function encodeAttribute($text) {
-	#
-	# Encode text for a double-quoted HTML attribute. This function
-	# is *not* suitable for attributes enclosed in single quotes.
-	#
-		$text = $this->encodeAmpsAndAngles($text);
-		$text = str_replace('"', '&quot;', $text);
-		return $text;
-	}
-
-
-	function encodeAmpsAndAngles($text) {
-	#
-	# Smart processing for ampersands and angle brackets that need to
-	# be encoded. Valid character entities are left alone unless the
-	# no-entities mode is set.
-	#
-		if ($this->no_entities) {
-			$text = str_replace('&', '&amp;', $text);
-		} else {
-			# Ampersand-encoding based entirely on Nat Irons's Amputator
-			# MT plugin: <http://bumppo.net/projects/amputator/>
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
-								'&amp;', $text);;
-		}
-		# Encode remaining <'s
-		$text = str_replace('<', '&lt;', $text);
-
-		return $text;
-	}
-
-
-	function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i',
-			array(&$this, '_doAutoLinks_url_callback'), $text);
-
-		# Email addresses: <address@domain.foo>
-		$text = preg_replace_callback('{
+                $grafs[$key] = $graf;
+            }
+        }
+
+        return implode("\n\n", $grafs);
+    }
+
+
+    function encodeAttribute($text) {
+    #
+    # Encode text for a double-quoted HTML attribute. This function
+    # is *not* suitable for attributes enclosed in single quotes.
+    #
+        $text = $this->encodeAmpsAndAngles($text);
+        $text = str_replace('"', '&quot;', $text);
+        return $text;
+    }
+
+
+    function encodeAmpsAndAngles($text) {
+    #
+    # Smart processing for ampersands and angle brackets that need to
+    # be encoded. Valid character entities are left alone unless the
+    # no-entities mode is set.
+    #
+        if ($this->no_entities) {
+            $text = str_replace('&', '&amp;', $text);
+        } else {
+            # Ampersand-encoding based entirely on Nat Irons's Amputator
+            # MT plugin: <http://bumppo.net/projects/amputator/>
+            $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
+                                '&amp;', $text);;
+        }
+        # Encode remaining <'s
+        $text = str_replace('<', '&lt;', $text);
+
+        return $text;
+    }
+
+
+    function doAutoLinks($text) {
+        $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i',
+            array(&$this, '_doAutoLinks_url_callback'), $text);
+
+        # Email addresses: <address@domain.foo>
+        $text = preg_replace_callback('{
 			<
 			(?:mailto:)?
 			(
@@ -1463,71 +1463,71 @@ 
 			)
 			>
 			}xi',
-			array(&$this, '_doAutoLinks_email_callback'), $text);
-
-		return $text;
-	}
-	function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeAttribute($matches[1]);
-		$link = "<a href=\"$url\">$url</a>";
-		return $this->hashPart($link);
-	}
-	function _doAutoLinks_email_callback($matches) {
-		$address = $matches[1];
-		$link = $this->encodeEmailAddress($address);
-		return $this->hashPart($link);
-	}
-
-
-	function encodeEmailAddress($addr) {
-	#
-	#	Input: an email address, e.g. "foo@example.com"
-	#
-	#	Output: the email address as a mailto link, with each character
-	#		of the address encoded as either a decimal or hex entity, in
-	#		the hopes of foiling most address harvesting spam bots. E.g.:
-	#
-	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
-	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
-	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
-	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
-	#
-	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	#   With some optimizations by Milian Wolff.
-	#
-		$addr = "mailto:" . $addr;
-		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
-
-		foreach ($chars as $key => $char) {
-			$ord = ord($char);
-			# Ignore non-ascii chars.
-			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
-				# roughly 10% raw, 45% hex, 45% dec
-				# '@' *must* be encoded. I insist.
-				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
-			}
-		}
-
-		$addr = implode('', $chars);
-		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
-		$addr = "<a href=\"$addr\">$text</a>";
-
-		return $addr;
-	}
-
-
-	function parseSpan($str) {
-	#
-	# Take the string $str and parse it into tokens, hashing embeded HTML,
-	# escaped characters and handling code spans.
-	#
-		$output = '';
-
-		$span_re = '{
+            array(&$this, '_doAutoLinks_email_callback'), $text);
+
+        return $text;
+    }
+    function _doAutoLinks_url_callback($matches) {
+        $url = $this->encodeAttribute($matches[1]);
+        $link = "<a href=\"$url\">$url</a>";
+        return $this->hashPart($link);
+    }
+    function _doAutoLinks_email_callback($matches) {
+        $address = $matches[1];
+        $link = $this->encodeEmailAddress($address);
+        return $this->hashPart($link);
+    }
+
+
+    function encodeEmailAddress($addr) {
+    #
+    #	Input: an email address, e.g. "foo@example.com"
+    #
+    #	Output: the email address as a mailto link, with each character
+    #		of the address encoded as either a decimal or hex entity, in
+    #		the hopes of foiling most address harvesting spam bots. E.g.:
+    #
+    #	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+    #        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+    #        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+    #        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+    #
+    #	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+    #   With some optimizations by Milian Wolff.
+    #
+        $addr = "mailto:" . $addr;
+        $chars = preg_split('/(?<!^)(?!$)/', $addr);
+        $seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+
+        foreach ($chars as $key => $char) {
+            $ord = ord($char);
+            # Ignore non-ascii chars.
+            if ($ord < 128) {
+                $r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+                # roughly 10% raw, 45% hex, 45% dec
+                # '@' *must* be encoded. I insist.
+                if ($r > 90 && $char != '@') /* do nothing */;
+                else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+                else              $chars[$key] = '&#'.$ord.';';
+            }
+        }
+
+        $addr = implode('', $chars);
+        $text = implode('', array_slice($chars, 7)); # text without `mailto:`
+        $addr = "<a href=\"$addr\">$text</a>";
+
+        return $addr;
+    }
+
+
+    function parseSpan($str) {
+    #
+    # Take the string $str and parse it into tokens, hashing embeded HTML,
+    # escaped characters and handling code spans.
+    #
+        $output = '';
+
+        $span_re = '{
 				(
 					\\\\'.$this->escape_chars_re.'
 				|
@@ -1549,123 +1549,123 @@ 
 				)
 				}xs';
 
-		while (1) {
-			#
-			# Each loop iteration seach for either the next tag, the next
-			# openning code span marker, or the next escaped character.
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-
-			# Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
-			}
-
-			# Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
-			}
-			else {
-				break;
-			}
-		}
-
-		return $output;
-	}
-
-
-	function handleSpanToken($token, &$str) {
-	#
-	# Handle $token provided by parseSpan by determining its nature and
-	# returning the corresponding value that should replace it.
-	#
-		switch ($token{0}) {
-			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
-			case "`":
-				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
-					$str, $matches))
-				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
-					return $this->hashPart($codespan);
-				}
-				return $token; // return as text since no ending marker found.
-			default:
-				return $this->hashPart($token);
-		}
-	}
-
-
-	function outdent($text) {
-	#
-	# Remove one level of line-leading tabs or spaces
-	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
-	}
-
-
-	# String length function for detab. `_initDetab` will create a function to
-	# hanlde UTF-8 if the default function does not exist.
-	var $utf8_strlen = 'mb_strlen';
-
-	function detab($text) {
-	#
-	# Replace tabs with the appropriate amount of space.
-	#
-		# For each line we separate the line in blocks delemited by
-		# tab characters. Then we reconstruct every line by adding the
-		# appropriate number of space between each blocks.
-
-		$text = preg_replace_callback('/^.*\t.*$/m',
-			array(&$this, '_detab_callback'), $text);
-
-		return $text;
-	}
-	function _detab_callback($matches) {
-		$line = $matches[0];
-		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
-
-		# Split in blocks.
-		$blocks = explode("\t", $line);
-		# Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
-		foreach ($blocks as $block) {
-			# Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width -
-				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
-		}
-		return $line;
-	}
-	function _initDetab() {
-	#
-	# Check for the availability of the function in the `utf8_strlen` property
-	# (initially `mb_strlen`). If the function is not available, create a
-	# function that will loosely count the number of UTF-8 characters with a
-	# regular expression.
-	#
-		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+        while (1) {
+            #
+            # Each loop iteration seach for either the next tag, the next
+            # openning code span marker, or the next escaped character.
+            # Each token is then passed to handleSpanToken.
+            #
+            $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+            # Create token from text preceding tag.
+            if ($parts[0] != "") {
+                $output .= $parts[0];
+            }
+
+            # Check if we reach the end.
+            if (isset($parts[1])) {
+                $output .= $this->handleSpanToken($parts[1], $parts[2]);
+                $str = $parts[2];
+            }
+            else {
+                break;
+            }
+        }
+
+        return $output;
+    }
+
+
+    function handleSpanToken($token, &$str) {
+    #
+    # Handle $token provided by parseSpan by determining its nature and
+    # returning the corresponding value that should replace it.
+    #
+        switch ($token{0}) {
+            case "\\":
+                return $this->hashPart("&#". ord($token{1}). ";");
+            case "`":
+                # Search for end marker in remaining text.
+                if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
+                    $str, $matches))
+                {
+                    $str = $matches[2];
+                    $codespan = $this->makeCodeSpan($matches[1]);
+                    return $this->hashPart($codespan);
+                }
+                return $token; // return as text since no ending marker found.
+            default:
+                return $this->hashPart($token);
+        }
+    }
+
+
+    function outdent($text) {
+    #
+    # Remove one level of line-leading tabs or spaces
+    #
+        return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+    }
+
+
+    # String length function for detab. `_initDetab` will create a function to
+    # hanlde UTF-8 if the default function does not exist.
+    var $utf8_strlen = 'mb_strlen';
+
+    function detab($text) {
+    #
+    # Replace tabs with the appropriate amount of space.
+    #
+        # For each line we separate the line in blocks delemited by
+        # tab characters. Then we reconstruct every line by adding the
+        # appropriate number of space between each blocks.
+
+        $text = preg_replace_callback('/^.*\t.*$/m',
+            array(&$this, '_detab_callback'), $text);
+
+        return $text;
+    }
+    function _detab_callback($matches) {
+        $line = $matches[0];
+        $strlen = $this->utf8_strlen; # strlen function for UTF-8.
+
+        # Split in blocks.
+        $blocks = explode("\t", $line);
+        # Add each blocks to the line.
+        $line = $blocks[0];
+        unset($blocks[0]); # Do not add first block twice.
+        foreach ($blocks as $block) {
+            # Calculate amount of space, insert spaces, insert block.
+            $amount = $this->tab_width -
+                $strlen($line, 'UTF-8') % $this->tab_width;
+            $line .= str_repeat(" ", $amount) . $block;
+        }
+        return $line;
+    }
+    function _initDetab() {
+    #
+    # Check for the availability of the function in the `utf8_strlen` property
+    # (initially `mb_strlen`). If the function is not available, create a
+    # function that will loosely count the number of UTF-8 characters with a
+    # regular expression.
+    #
+        if (function_exists($this->utf8_strlen)) return;
+        $this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');
-	}
+    }
 
 
-	function unhash($text) {
-	#
-	# Swap back in all the tags hashed by _HashHTMLBlocks.
-	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/',
-			array(&$this, '_unhash_callback'), $text);
-	}
-	function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
-	}
+    function unhash($text) {
+    #
+    # Swap back in all the tags hashed by _HashHTMLBlocks.
+    #
+        return preg_replace_callback('/(.)\x1A[0-9]+\1/',
+            array(&$this, '_unhash_callback'), $text);
+    }
+    function _unhash_callback($matches) {
+        return $this->html_hashes[$matches[0]];
+    }
 
 }
 
@@ -1676,178 +1676,178 @@ 
 
 class MarkdownExtra_Parser extends Markdown_Parser {
 
-	# Prefix for footnote ids.
-	var $fn_id_prefix = "";
-
-	# Optional title attribute for footnote links and backlinks.
-	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
-	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
-
-	# Optional class attribute for footnote links and backlinks.
-	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
-	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
-
-	# Predefined abbreviations.
-	var $predef_abbr = array();
-
-
-	function MarkdownExtra_Parser() {
-	#
-	# Constructor function. Initialize the parser object.
-	#
-		# Add extra escapable characters before parent constructor
-		# initialize the table.
-		$this->escape_chars .= ':|';
-
-		# Insert extra document, block, and span transformations.
-		# Parent constructor will do the sorting.
-		$this->document_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"stripFootnotes"     => 15,
-			"stripAbbreviations" => 25,
-			"appendFootnotes"    => 50,
-			);
-		$this->block_gamut += array(
-			"doFencedCodeBlocks" => 5,
-			"doTables"           => 15,
-			"doDefLists"         => 45,
-			);
-		$this->span_gamut += array(
-			"doFootnotes"        => 5,
-			"doAbbreviations"    => 70,
-			);
-
-		parent::Markdown_Parser();
-	}
-
-
-	# Extra variables used during extra transformations.
-	var $footnotes = array();
-	var $footnotes_ordered = array();
-	var $abbr_desciptions = array();
-	var $abbr_word_re = '';
-
-	# Give the current footnote number.
-	var $footnote_counter = 1;
-
-
-	function setup() {
-	#
-	# Setting up Extra-specific variables.
-	#
-		parent::setup();
-
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-		$this->footnote_counter = 1;
-
-		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
-			$this->abbr_word_re .= preg_quote($abbr_word);
-			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		}
-	}
-
-	function teardown() {
-	#
-	# Clearing Extra-specific variables.
-	#
-		$this->footnotes = array();
-		$this->footnotes_ordered = array();
-		$this->abbr_desciptions = array();
-		$this->abbr_word_re = '';
-
-		parent::teardown();
-	}
-
-
-	### HTML Block Parser ###
-
-	# Tags that are always treated as block tags:
-	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
-
-	# Tags treated as block tags only if the opening tag is alone on it's line:
-	var $context_block_tags_re = 'script|noscript|math|ins|del';
-
-	# Tags where markdown="1" default to span mode:
-	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-
-	# Tags which must not have their contents modified, no matter where
-	# they appear:
-	var $clean_tags_re = 'script|math';
-
-	# Tags that do not need to be closed.
-	var $auto_close_tags_re = 'hr|img';
-
-
-	function hashHTMLBlocks($text) {
-	#
-	# Hashify HTML Blocks and "clean tags".
-	#
-	# We only want to do this for block-level HTML tags, such as headers,
-	# lists, and tables. That's because we still want to wrap <p>s around
-	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-	# phrase emphasis, and spans. The list of tags we're looking for is
-	# hard-coded.
-	#
-	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
-	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
-	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
-	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
-	# These two functions are calling each other. It's recursive!
-	#
-		#
-		# Call the HTML-in-Markdown hasher.
-		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-
-		return $text;
-	}
-	function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
-										$enclosing_tag_re = '', $span = false)
-	{
-	#
-	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
-	#
-	# *   $indent is the number of space to be ignored when checking for code
-	#     blocks. This is important because if we don't take the indent into
-	#     account, something like this (which looks right) won't work as expected:
-	#
-	#     <div>
-	#         <div markdown="1">
-	#         Hello World.  <-- Is this a Markdown code block or text?
-	#         </div>  <-- Is this a Markdown code block or a real tag?
-	#     <div>
-	#
-	#     If you don't like this, just don't indent the tag on which
-	#     you apply the markdown="1" attribute.
-	#
-	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
-	#     tag with that name. Nested tags supported.
-	#
-	# *   If $span is true, text inside must treated as span. So any double
-	#     newline will be replaced by a single newline so that it does not create
-	#     paragraphs.
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-
-		# Regex to check for the presense of newlines around a block tag.
-		$newline_before_re = '/(?:^\n?|\n\n)*$/';
-		$newline_after_re =
-			'{
+    # Prefix for footnote ids.
+    var $fn_id_prefix = "";
+
+    # Optional title attribute for footnote links and backlinks.
+    var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+    var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+
+    # Optional class attribute for footnote links and backlinks.
+    var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+    var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+
+    # Predefined abbreviations.
+    var $predef_abbr = array();
+
+
+    function MarkdownExtra_Parser() {
+    #
+    # Constructor function. Initialize the parser object.
+    #
+        # Add extra escapable characters before parent constructor
+        # initialize the table.
+        $this->escape_chars .= ':|';
+
+        # Insert extra document, block, and span transformations.
+        # Parent constructor will do the sorting.
+        $this->document_gamut += array(
+            "doFencedCodeBlocks" => 5,
+            "stripFootnotes"     => 15,
+            "stripAbbreviations" => 25,
+            "appendFootnotes"    => 50,
+            );
+        $this->block_gamut += array(
+            "doFencedCodeBlocks" => 5,
+            "doTables"           => 15,
+            "doDefLists"         => 45,
+            );
+        $this->span_gamut += array(
+            "doFootnotes"        => 5,
+            "doAbbreviations"    => 70,
+            );
+
+        parent::Markdown_Parser();
+    }
+
+
+    # Extra variables used during extra transformations.
+    var $footnotes = array();
+    var $footnotes_ordered = array();
+    var $abbr_desciptions = array();
+    var $abbr_word_re = '';
+
+    # Give the current footnote number.
+    var $footnote_counter = 1;
+
+
+    function setup() {
+    #
+    # Setting up Extra-specific variables.
+    #
+        parent::setup();
+
+        $this->footnotes = array();
+        $this->footnotes_ordered = array();
+        $this->abbr_desciptions = array();
+        $this->abbr_word_re = '';
+        $this->footnote_counter = 1;
+
+        foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+            if ($this->abbr_word_re)
+                $this->abbr_word_re .= '|';
+            $this->abbr_word_re .= preg_quote($abbr_word);
+            $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+        }
+    }
+
+    function teardown() {
+    #
+    # Clearing Extra-specific variables.
+    #
+        $this->footnotes = array();
+        $this->footnotes_ordered = array();
+        $this->abbr_desciptions = array();
+        $this->abbr_word_re = '';
+
+        parent::teardown();
+    }
+
+
+    ### HTML Block Parser ###
+
+    # Tags that are always treated as block tags:
+    var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+
+    # Tags treated as block tags only if the opening tag is alone on it's line:
+    var $context_block_tags_re = 'script|noscript|math|ins|del';
+
+    # Tags where markdown="1" default to span mode:
+    var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+
+    # Tags which must not have their contents modified, no matter where
+    # they appear:
+    var $clean_tags_re = 'script|math';
+
+    # Tags that do not need to be closed.
+    var $auto_close_tags_re = 'hr|img';
+
+
+    function hashHTMLBlocks($text) {
+    #
+    # Hashify HTML Blocks and "clean tags".
+    #
+    # We only want to do this for block-level HTML tags, such as headers,
+    # lists, and tables. That's because we still want to wrap <p>s around
+    # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+    # phrase emphasis, and spans. The list of tags we're looking for is
+    # hard-coded.
+    #
+    # This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+    # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
+    # attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+    #  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+    # These two functions are calling each other. It's recursive!
+    #
+        #
+        # Call the HTML-in-Markdown hasher.
+        #
+        list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+
+        return $text;
+    }
+    function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
+                                        $enclosing_tag_re = '', $span = false)
+    {
+    #
+    # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+    #
+    # *   $indent is the number of space to be ignored when checking for code
+    #     blocks. This is important because if we don't take the indent into
+    #     account, something like this (which looks right) won't work as expected:
+    #
+    #     <div>
+    #         <div markdown="1">
+    #         Hello World.  <-- Is this a Markdown code block or text?
+    #         </div>  <-- Is this a Markdown code block or a real tag?
+    #     <div>
+    #
+    #     If you don't like this, just don't indent the tag on which
+    #     you apply the markdown="1" attribute.
+    #
+    # *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
+    #     tag with that name. Nested tags supported.
+    #
+    # *   If $span is true, text inside must treated as span. So any double
+    #     newline will be replaced by a single newline so that it does not create
+    #     paragraphs.
+    #
+    # Returns an array of that form: ( processed text , remaining text )
+    #
+        if ($text === '') return array('', '');
+
+        # Regex to check for the presense of newlines around a block tag.
+        $newline_before_re = '/(?:^\n?|\n\n)*$/';
+        $newline_after_re =
+            '{
 				^						# Start of text following the tag.
 				(?>[ ]*<!--.*?-->)?		# Optional comment.
 				[ ]*\n					# Must be followed by newline.
 			}xs';
 
-		# Regex to match any tag.
-		$block_tag_re =
-			'{
+        # Regex to match any tag.
+        $block_tag_re =
+            '{
 				(					# $2: Capture hole tag.
 					</?					# Any opening or closing tag.
 						(?>				# Tag name.
@@ -1891,165 +1891,165 @@ 
 			}xs';
 
 
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
-
-		#
-		# Loop through every tag until we find the closing tag of the parent
-		# or loop until reaching the end of text if no parent tag specified.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made
-			# by the pattern.
-			#
-			$parts = preg_split($block_tag_re, $text, 2,
-								PREG_SPLIT_DELIM_CAPTURE);
-
-			# If in Markdown span mode, add a empty-string span-level hash
-			# after each newline to prevent triggering any block element.
-			if ($span) {
-				$void = $this->hashPart("", ':');
-				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
-			}
-
-			$parsed .= $parts[0]; # Text before current tag.
-
-			# If end of $text has been reached. Stop loop.
-			if (count($parts) < 3) {
-				$text = "";
-				break;
-			}
-
-			$tag  = $parts[1]; # Tag to handle.
-			$text = $parts[2]; # Remaining text after current tag.
-			$tag_re = preg_quote($tag); # For use in a regular expression.
-
-			#
-			# Check for: Code span marker
-			#
-			if ($tag{0} == "`") {
-				# Find corresponding end marker.
-				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
-					$text, $matches))
-				{
-					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					# Unmatched marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			#
-			# Check for: Indented code block.
-			#
-			else if ($tag{0} == "\n" || $tag{0} == " ") {
-				# Indented code block: pass it unchanged, will be handled
-				# later.
-				$parsed .= $tag;
-			}
-			#
-			# Check for: Fenced code block marker.
-			#
-			else if ($tag{0} == "~") {
-				# Fenced code block marker: find matching end marker.
-				$tag_re = preg_quote(trim($tag));
-				if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text,
-					$matches))
-				{
-					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
-					$text = substr($text, strlen($matches[0]));
-				}
-				else {
-					# No end marker: just skip it.
-					$parsed .= $tag;
-				}
-			}
-			#
-			# Check for: Opening Block level tag or
-			#            Opening Context Block tag (like ins and del)
-			#               used as a block tag (tag is alone on it's line).
-			#
-			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
-					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
-				)
-			{
-				# Need to parse tag and following text using the HTML parser.
-				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-
-				# Make sure it stays outside of any paragraph by adding newlines.
-				$parsed .= "\n\n$block_text\n\n";
-			}
-			#
-			# Check for: Clean tag (like script, math)
-			#            HTML Comments, processing instructions.
-			#
-			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Need to parse tag and following text using the HTML parser.
-				# (don't check for markdown attribute)
-				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-
-				$parsed .= $block_text;
-			}
-			#
-			# Check for: Tag with same name as enclosing tag.
-			#
-			else if ($enclosing_tag_re !== '' &&
-				# Same name as enclosing tag.
-				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
-			{
-				#
-				# Increase/decrease nested tag count.
-				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
-
-				if ($depth < 0) {
-					#
-					# Going out of parent element. Clean up and break so we
-					# return to the calling function.
-					#
-					$text = $tag . $text;
-					break;
-				}
-
-				$parsed .= $tag;
-			}
-			else {
-				$parsed .= $tag;
-			}
-		} while ($depth >= 0);
-
-		return array($parsed, $text);
-	}
-	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
-	#
-	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
-	#
-	# *   Calls $hash_method to convert any blocks.
-	# *   Stops when the first opening tag closes.
-	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
-	#     (it is not inside clean tags)
-	#
-	# Returns an array of that form: ( processed text , remaining text )
-	#
-		if ($text === '') return array('', '');
-
-		# Regex to match `markdown` attribute inside of a tag.
-		$markdown_attr_re = '
+        $depth = 0;		# Current depth inside the tag tree.
+        $parsed = "";	# Parsed text that will be returned.
+
+        #
+        # Loop through every tag until we find the closing tag of the parent
+        # or loop until reaching the end of text if no parent tag specified.
+        #
+        do {
+            #
+            # Split the text using the first $tag_match pattern found.
+            # Text before  pattern will be first in the array, text after
+            # pattern will be at the end, and between will be any catches made
+            # by the pattern.
+            #
+            $parts = preg_split($block_tag_re, $text, 2,
+                                PREG_SPLIT_DELIM_CAPTURE);
+
+            # If in Markdown span mode, add a empty-string span-level hash
+            # after each newline to prevent triggering any block element.
+            if ($span) {
+                $void = $this->hashPart("", ':');
+                $newline = "$void\n";
+                $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+            }
+
+            $parsed .= $parts[0]; # Text before current tag.
+
+            # If end of $text has been reached. Stop loop.
+            if (count($parts) < 3) {
+                $text = "";
+                break;
+            }
+
+            $tag  = $parts[1]; # Tag to handle.
+            $text = $parts[2]; # Remaining text after current tag.
+            $tag_re = preg_quote($tag); # For use in a regular expression.
+
+            #
+            # Check for: Code span marker
+            #
+            if ($tag{0} == "`") {
+                # Find corresponding end marker.
+                $tag_re = preg_quote($tag);
+                if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
+                    $text, $matches))
+                {
+                    # End marker found: pass text unchanged until marker.
+                    $parsed .= $tag . $matches[0];
+                    $text = substr($text, strlen($matches[0]));
+                }
+                else {
+                    # Unmatched marker: just skip it.
+                    $parsed .= $tag;
+                }
+            }
+            #
+            # Check for: Indented code block.
+            #
+            else if ($tag{0} == "\n" || $tag{0} == " ") {
+                # Indented code block: pass it unchanged, will be handled
+                # later.
+                $parsed .= $tag;
+            }
+            #
+            # Check for: Fenced code block marker.
+            #
+            else if ($tag{0} == "~") {
+                # Fenced code block marker: find matching end marker.
+                $tag_re = preg_quote(trim($tag));
+                if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text,
+                    $matches))
+                {
+                    # End marker found: pass text unchanged until marker.
+                    $parsed .= $tag . $matches[0];
+                    $text = substr($text, strlen($matches[0]));
+                }
+                else {
+                    # No end marker: just skip it.
+                    $parsed .= $tag;
+                }
+            }
+            #
+            # Check for: Opening Block level tag or
+            #            Opening Context Block tag (like ins and del)
+            #               used as a block tag (tag is alone on it's line).
+            #
+            else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
+                (	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+                    preg_match($newline_before_re, $parsed) &&
+                    preg_match($newline_after_re, $text)	)
+                )
+            {
+                # Need to parse tag and following text using the HTML parser.
+                list($block_text, $text) =
+                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+
+                # Make sure it stays outside of any paragraph by adding newlines.
+                $parsed .= "\n\n$block_text\n\n";
+            }
+            #
+            # Check for: Clean tag (like script, math)
+            #            HTML Comments, processing instructions.
+            #
+            else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+                $tag{1} == '!' || $tag{1} == '?')
+            {
+                # Need to parse tag and following text using the HTML parser.
+                # (don't check for markdown attribute)
+                list($block_text, $text) =
+                    $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+
+                $parsed .= $block_text;
+            }
+            #
+            # Check for: Tag with same name as enclosing tag.
+            #
+            else if ($enclosing_tag_re !== '' &&
+                # Same name as enclosing tag.
+                preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
+            {
+                #
+                # Increase/decrease nested tag count.
+                #
+                if ($tag{1} == '/')						$depth--;
+                else if ($tag{strlen($tag)-2} != '/')	$depth++;
+
+                if ($depth < 0) {
+                    #
+                    # Going out of parent element. Clean up and break so we
+                    # return to the calling function.
+                    #
+                    $text = $tag . $text;
+                    break;
+                }
+
+                $parsed .= $tag;
+            }
+            else {
+                $parsed .= $tag;
+            }
+        } while ($depth >= 0);
+
+        return array($parsed, $text);
+    }
+    function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+    #
+    # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+    #
+    # *   Calls $hash_method to convert any blocks.
+    # *   Stops when the first opening tag closes.
+    # *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+    #     (it is not inside clean tags)
+    #
+    # Returns an array of that form: ( processed text , remaining text )
+    #
+        if ($text === '') return array('', '');
+
+        # Regex to match `markdown` attribute inside of a tag.
+        $markdown_attr_re = '
 			{
 				\s*			# Eat whitespace before the `markdown` attribute
 				markdown
@@ -2064,8 +2064,8 @@ 
 				()				# $4: make $3 always defined (avoid warnings)
 			}xs';
 
-		# Regex to match any tag.
-		$tag_re = '{
+        # Regex to match any tag.
+        $tag_re = '{
 				(					# $2: Capture hole tag.
 					</?					# Any opening or closing tag.
 						[\w:$]+			# Tag name.
@@ -2087,166 +2087,166 @@ 
 				)
 			}xs';
 
-		$original_text = $text;		# Save original text in case of faliure.
-
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
-
-		#
-		# Get the name of the starting tag.
-		# (This pattern makes $base_tag_name_re safe without quoting.)
-		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
-
-		#
-		# Loop through every tag until we find the corresponding closing tag.
-		#
-		do {
-			#
-			# Split the text using the first $tag_match pattern found.
-			# Text before  pattern will be first in the array, text after
-			# pattern will be at the end, and between will be any catches made
-			# by the pattern.
-			#
-			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-
-			if (count($parts) < 3) {
-				#
-				# End of $text reached with unbalenced tag(s).
-				# In that case, we return original text unchanged and pass the
-				# first character as filtered to prevent an infinite loop in the
-				# parent function.
-				#
-				return array($original_text{0}, substr($original_text, 1));
-			}
-
-			$block_text .= $parts[0]; # Text before current tag.
-			$tag         = $parts[1]; # Tag to handle.
-			$text        = $parts[2]; # Remaining text after current tag.
-
-			#
-			# Check for: Auto-close tag (like <hr/>)
-			#			 Comments and Processing Instructions.
-			#
-			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
-				$tag{1} == '!' || $tag{1} == '?')
-			{
-				# Just add the tag to the block as if it was text.
-				$block_text .= $tag;
-			}
-			else {
-				#
-				# Increase/decrease nested tag count. Only do so if
-				# the tag's name match base tag's.
-				#
-				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
-				}
-
-				#
-				# Check for `markdown="1"` attribute and handle it.
-				#
-				if ($md_attr &&
-					preg_match($markdown_attr_re, $tag, $attr_m) &&
-					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
-				{
-					# Remove `markdown` attribute from opening tag.
-					$tag = preg_replace($markdown_attr_re, '', $tag);
-
-					# Check if text inside this tag must be parsed in span mode.
-					$this->mode = $attr_m[2] . $attr_m[3];
-					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-
-					# Calculate indent before tag.
-					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
-						$strlen = $this->utf8_strlen;
-						$indent = $strlen($matches[1], 'UTF-8');
-					} else {
-						$indent = 0;
-					}
-
-					# End preceding block with this tag.
-					$block_text .= $tag;
-					$parsed .= $this->$hash_method($block_text);
-
-					# Get enclosing tag name for the ParseMarkdown function.
-					# (This pattern makes $tag_name_re safe without quoting.)
-					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
-					$tag_name_re = $matches[1];
-
-					# Parse the content using the HTML-in-Markdown parser.
-					list ($block_text, $text)
-						= $this->_hashHTMLBlocks_inMarkdown($text, $indent,
-							$tag_name_re, $span_mode);
-
-					# Outdent markdown text.
-					if ($indent > 0) {
-						$block_text = preg_replace("/^[ ]{1,$indent}/m", "",
-													$block_text);
-					}
-
-					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
-
-					# Start over a new block.
-					$block_text = "";
-				}
-				else $block_text .= $tag;
-			}
-
-		} while ($depth > 0);
-
-		#
-		# Hash last block text that wasn't processed inside the loop.
-		#
-		$parsed .= $this->$hash_method($block_text);
-
-		return array($parsed, $text);
-	}
-
-
-	function hashClean($text) {
-	#
-	# Called whenever a tag must be hashed when a function insert a "clean" tag
-	# in $text, it pass through this function and is automaticaly escaped,
-	# blocking invalid nested overlap.
-	#
-		return $this->hashPart($text, 'C');
-	}
-
-
-	function doHeaders($text) {
-	#
-	# Redefined to add id attribute support.
-	#
-		# Setext-style headers:
-		#	  Header 1  {#header1}
-		#	  ========
-		#
-		#	  Header 2  {#header2}
-		#	  --------
-		#
-		$text = preg_replace_callback(
-			'{
+        $original_text = $text;		# Save original text in case of faliure.
+
+        $depth		= 0;	# Current depth inside the tag tree.
+        $block_text	= "";	# Temporary text holder for current text.
+        $parsed		= "";	# Parsed text that will be returned.
+
+        #
+        # Get the name of the starting tag.
+        # (This pattern makes $base_tag_name_re safe without quoting.)
+        #
+        if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+            $base_tag_name_re = $matches[1];
+
+        #
+        # Loop through every tag until we find the corresponding closing tag.
+        #
+        do {
+            #
+            # Split the text using the first $tag_match pattern found.
+            # Text before  pattern will be first in the array, text after
+            # pattern will be at the end, and between will be any catches made
+            # by the pattern.
+            #
+            $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+            if (count($parts) < 3) {
+                #
+                # End of $text reached with unbalenced tag(s).
+                # In that case, we return original text unchanged and pass the
+                # first character as filtered to prevent an infinite loop in the
+                # parent function.
+                #
+                return array($original_text{0}, substr($original_text, 1));
+            }
+
+            $block_text .= $parts[0]; # Text before current tag.
+            $tag         = $parts[1]; # Tag to handle.
+            $text        = $parts[2]; # Remaining text after current tag.
+
+            #
+            # Check for: Auto-close tag (like <hr/>)
+            #			 Comments and Processing Instructions.
+            #
+            if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
+                $tag{1} == '!' || $tag{1} == '?')
+            {
+                # Just add the tag to the block as if it was text.
+                $block_text .= $tag;
+            }
+            else {
+                #
+                # Increase/decrease nested tag count. Only do so if
+                # the tag's name match base tag's.
+                #
+                if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
+                    if ($tag{1} == '/')						$depth--;
+                    else if ($tag{strlen($tag)-2} != '/')	$depth++;
+                }
+
+                #
+                # Check for `markdown="1"` attribute and handle it.
+                #
+                if ($md_attr &&
+                    preg_match($markdown_attr_re, $tag, $attr_m) &&
+                    preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+                {
+                    # Remove `markdown` attribute from opening tag.
+                    $tag = preg_replace($markdown_attr_re, '', $tag);
+
+                    # Check if text inside this tag must be parsed in span mode.
+                    $this->mode = $attr_m[2] . $attr_m[3];
+                    $span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+                        preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+
+                    # Calculate indent before tag.
+                    if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+                        $strlen = $this->utf8_strlen;
+                        $indent = $strlen($matches[1], 'UTF-8');
+                    } else {
+                        $indent = 0;
+                    }
+
+                    # End preceding block with this tag.
+                    $block_text .= $tag;
+                    $parsed .= $this->$hash_method($block_text);
+
+                    # Get enclosing tag name for the ParseMarkdown function.
+                    # (This pattern makes $tag_name_re safe without quoting.)
+                    preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+                    $tag_name_re = $matches[1];
+
+                    # Parse the content using the HTML-in-Markdown parser.
+                    list ($block_text, $text)
+                        = $this->_hashHTMLBlocks_inMarkdown($text, $indent,
+                            $tag_name_re, $span_mode);
+
+                    # Outdent markdown text.
+                    if ($indent > 0) {
+                        $block_text = preg_replace("/^[ ]{1,$indent}/m", "",
+                                                    $block_text);
+                    }
+
+                    # Append tag content to parsed text.
+                    if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+                    else				$parsed .= "$block_text";
+
+                    # Start over a new block.
+                    $block_text = "";
+                }
+                else $block_text .= $tag;
+            }
+
+        } while ($depth > 0);
+
+        #
+        # Hash last block text that wasn't processed inside the loop.
+        #
+        $parsed .= $this->$hash_method($block_text);
+
+        return array($parsed, $text);
+    }
+
+
+    function hashClean($text) {
+    #
+    # Called whenever a tag must be hashed when a function insert a "clean" tag
+    # in $text, it pass through this function and is automaticaly escaped,
+    # blocking invalid nested overlap.
+    #
+        return $this->hashPart($text, 'C');
+    }
+
+
+    function doHeaders($text) {
+    #
+    # Redefined to add id attribute support.
+    #
+        # Setext-style headers:
+        #	  Header 1  {#header1}
+        #	  ========
+        #
+        #	  Header 2  {#header2}
+        #	  --------
+        #
+        $text = preg_replace_callback(
+            '{
 				(^.+?)								# $1: Header text
 				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
 				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
 			}mx',
-			array(&$this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1        {#header1}
-		#	## Header 2       {#header2}
-		#	## Header 2 with closing hashes ##  {#header3}
-		#	...
-		#	###### Header 6   {#header2}
-		#
-		$text = preg_replace_callback('{
+            array(&$this, '_doHeaders_callback_setext'), $text);
+
+        # atx-style headers:
+        #	# Header 1        {#header1}
+        #	## Header 2       {#header2}
+        #	## Header 2 with closing hashes ##  {#header3}
+        #	...
+        #	###### Header 6   {#header2}
+        #
+        $text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -2256,44 +2256,44 @@ 
 				[ ]*
 				\n+
 			}xm',
-			array(&$this, '_doHeaders_callback_atx'), $text);
-
-		return $text;
-	}
-	function _doHeaders_attr($attr) {
-		if (empty($attr))  return "";
-		return " id=\"$attr\"";
-	}
-	function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
-		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	function _doHeaders_callback_atx($matches) {
-		$level = strlen($matches[1]);
-		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-
-	function doTables($text) {
-	#
-	# Form HTML tables.
-	#
-		$less_than_tab = $this->tab_width - 1;
-		#
-		# Find tables with leading pipe.
-		#
-		#	| Header 1 | Header 2
-		#	| -------- | --------
-		#	| Cell 1   | Cell 2
-		#	| Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
+            array(&$this, '_doHeaders_callback_atx'), $text);
+
+        return $text;
+    }
+    function _doHeaders_attr($attr) {
+        if (empty($attr))  return "";
+        return " id=\"$attr\"";
+    }
+    function _doHeaders_callback_setext($matches) {
+        if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+            return $matches[0];
+        $level = $matches[3]{0} == '=' ? 1 : 2;
+        $attr  = $this->_doHeaders_attr($id =& $matches[2]);
+        $block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+    function _doHeaders_callback_atx($matches) {
+        $level = strlen($matches[1]);
+        $attr  = $this->_doHeaders_attr($id =& $matches[3]);
+        $block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+
+    function doTables($text) {
+    #
+    # Form HTML tables.
+    #
+        $less_than_tab = $this->tab_width - 1;
+        #
+        # Find tables with leading pipe.
+        #
+        #	| Header 1 | Header 2
+        #	| -------- | --------
+        #	| Cell 1   | Cell 2
+        #	| Cell 3   | Cell 4
+        #
+        $text = preg_replace_callback('
 			{
 				^							# Start of a line
 				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
@@ -2311,17 +2311,17 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-			array(&$this, '_doTable_leadingPipe_callback'), $text);
-
-		#
-		# Find tables without leading pipe.
-		#
-		#	Header 1 | Header 2
-		#	-------- | --------
-		#	Cell 1   | Cell 2
-		#	Cell 3   | Cell 4
-		#
-		$text = preg_replace_callback('
+            array(&$this, '_doTable_leadingPipe_callback'), $text);
+
+        #
+        # Find tables without leading pipe.
+        #
+        #	Header 1 | Header 2
+        #	-------- | --------
+        #	Cell 1   | Cell 2
+        #	Cell 3   | Cell 4
+        #
+        $text = preg_replace_callback('
 			{
 				^							# Start of a line
 				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
@@ -2337,87 +2337,87 @@ 
 				)
 				(?=\n|\Z)					# Stop at final double newline.
 			}xm',
-			array(&$this, '_DoTable_callback'), $text);
-
-		return $text;
-	}
-	function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		# Remove leading pipe for each row.
-		$content	= preg_replace('/^ *[|]/m', '', $content);
-
-		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
-	}
-	function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
-
-		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
-
-		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
-		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
-			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
-			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
-			else									$attr[$n] = '';
-		}
-
-		# Parsing span elements, including code spans, character escapes,
-		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-
-		# Write column headers.
-		$text = "<table>\n";
-		$text .= "<thead>\n";
-		$text .= "<tr>\n";
-		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
-		$text .= "</tr>\n";
-		$text .= "</thead>\n";
-
-		# Split content by row.
-		$rows = explode("\n", trim($content, "\n"));
-
-		$text .= "<tbody>\n";
-		foreach ($rows as $row) {
-			# Parsing span elements, including code spans, character escapes,
-			# and inline HTML tags, so that pipes inside those gets ignored.
-			$row = $this->parseSpan($row);
-
-			# Split row by cell.
-			$row_cells = preg_split('/ *[|] */', $row, $col_count);
-			$row_cells = array_pad($row_cells, $col_count, '');
-
-			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
-			$text .= "</tr>\n";
-		}
-		$text .= "</tbody>\n";
-		$text .= "</table>";
-
-		return $this->hashBlock($text) . "\n";
-	}
-
-
-	function doDefLists($text) {
-	#
-	# Form HTML definition lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable pattern to match any entire dl list:
-		$whole_list_re = '(?>
+            array(&$this, '_DoTable_callback'), $text);
+
+        return $text;
+    }
+    function _doTable_leadingPipe_callback($matches) {
+        $head		= $matches[1];
+        $underline	= $matches[2];
+        $content	= $matches[3];
+
+        # Remove leading pipe for each row.
+        $content	= preg_replace('/^ *[|]/m', '', $content);
+
+        return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+    }
+    function _doTable_callback($matches) {
+        $head		= $matches[1];
+        $underline	= $matches[2];
+        $content	= $matches[3];
+
+        # Remove any tailing pipes for each line.
+        $head		= preg_replace('/[|] *$/m', '', $head);
+        $underline	= preg_replace('/[|] *$/m', '', $underline);
+        $content	= preg_replace('/[|] *$/m', '', $content);
+
+        # Reading alignement from header underline.
+        $separators	= preg_split('/ *[|] */', $underline);
+        foreach ($separators as $n => $s) {
+            if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+            else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+            else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+            else									$attr[$n] = '';
+        }
+
+        # Parsing span elements, including code spans, character escapes,
+        # and inline HTML tags, so that pipes inside those gets ignored.
+        $head		= $this->parseSpan($head);
+        $headers	= preg_split('/ *[|] */', $head);
+        $col_count	= count($headers);
+
+        # Write column headers.
+        $text = "<table>\n";
+        $text .= "<thead>\n";
+        $text .= "<tr>\n";
+        foreach ($headers as $n => $header)
+            $text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+        $text .= "</tr>\n";
+        $text .= "</thead>\n";
+
+        # Split content by row.
+        $rows = explode("\n", trim($content, "\n"));
+
+        $text .= "<tbody>\n";
+        foreach ($rows as $row) {
+            # Parsing span elements, including code spans, character escapes,
+            # and inline HTML tags, so that pipes inside those gets ignored.
+            $row = $this->parseSpan($row);
+
+            # Split row by cell.
+            $row_cells = preg_split('/ *[|] */', $row, $col_count);
+            $row_cells = array_pad($row_cells, $col_count, '');
+
+            $text .= "<tr>\n";
+            foreach ($row_cells as $n => $cell)
+                $text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+            $text .= "</tr>\n";
+        }
+        $text .= "</tbody>\n";
+        $text .= "</table>";
+
+        return $this->hashBlock($text) . "\n";
+    }
+
+
+    function doDefLists($text) {
+    #
+    # Form HTML definition lists.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # Re-usable pattern to match any entire dl list:
+        $whole_list_re = '(?>
 			(								# $1 = whole list
 			  (								# $2
 				[ ]{0,'.$less_than_tab.'}
@@ -2444,38 +2444,38 @@ 
 			)
 		)'; // mx
 
-		$text = preg_replace_callback('{
+        $text = preg_replace_callback('{
 				(?>\A\n?|(?<=\n\n))
 				'.$whole_list_re.'
 			}mx',
-			array(&$this, '_doDefLists_callback'), $text);
-
-		return $text;
-	}
-	function _doDefLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$list = $matches[1];
-
-		# Turn double returns into triple returns, so that we can make a
-		# paragraph for the last item in a list, if necessary:
-		$result = trim($this->processDefListItems($list));
-		$result = "<dl>\n" . $result . "\n</dl>";
-		return $this->hashBlock($result) . "\n\n";
-	}
-
-
-	function processDefListItems($list_str) {
-	#
-	#	Process the contents of a single definition list, splitting it
-	#	into individual term and definition list items.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
-		# Process definition terms.
-		$list_str = preg_replace_callback('{
+            array(&$this, '_doDefLists_callback'), $text);
+
+        return $text;
+    }
+    function _doDefLists_callback($matches) {
+        # Re-usable patterns to match list item bullets and number markers:
+        $list = $matches[1];
+
+        # Turn double returns into triple returns, so that we can make a
+        # paragraph for the last item in a list, if necessary:
+        $result = trim($this->processDefListItems($list));
+        $result = "<dl>\n" . $result . "\n</dl>";
+        return $this->hashBlock($result) . "\n\n";
+    }
+
+
+    function processDefListItems($list_str) {
+    #
+    #	Process the contents of a single definition list, splitting it
+    #	into individual term and definition list items.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # trim trailing blank lines:
+        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+        # Process definition terms.
+        $list_str = preg_replace_callback('{
 			(?>\A\n?|\n\n+)					# leading line
 			(								# definition terms = $1
 				[ ]{0,'.$less_than_tab.'}	# leading whitespace
@@ -2486,10 +2486,10 @@ 
 			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed
 											#   with a definition mark.
 			}xm',
-			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+            array(&$this, '_processDefListItems_callback_dt'), $list_str);
 
-		# Process actual definitions.
-		$list_str = preg_replace_callback('{
+        # Process actual definitions.
+        $list_str = preg_replace_callback('{
 			\n(\n+)?						# leading line = $1
 			(								# marker space = $2
 				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
@@ -2503,50 +2503,50 @@ 
 				)
 			)
 			}xm',
-			array(&$this, '_processDefListItems_callback_dd'), $list_str);
-
-		return $list_str;
-	}
-	function _processDefListItems_callback_dt($matches) {
-		$terms = explode("\n", trim($matches[1]));
-		$text = '';
-		foreach ($terms as $term) {
-			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n<dt>" . $term . "</dt>";
-		}
-		return $text . "\n";
-	}
-	function _processDefListItems_callback_dd($matches) {
-		$leading_line	= $matches[1];
-		$marker_space	= $matches[2];
-		$def			= $matches[3];
-
-		if ($leading_line || preg_match('/\n{2,}/', $def)) {
-			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
-		}
-		else {
-			$def = rtrim($def);
-			$def = $this->runSpanGamut($this->outdent($def));
-		}
-
-		return "\n<dd>" . $def . "</dd>\n";
-	}
-
-
-	function doFencedCodeBlocks($text) {
-	#
-	# Adding the fenced code block syntax to regular Markdown:
-	#
-	# ~~~
-	# Code block
-	# ~~~
-	#
-		$less_than_tab = $this->tab_width;
-
-		$text = preg_replace_callback('{
+            array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+        return $list_str;
+    }
+    function _processDefListItems_callback_dt($matches) {
+        $terms = explode("\n", trim($matches[1]));
+        $text = '';
+        foreach ($terms as $term) {
+            $term = $this->runSpanGamut(trim($term));
+            $text .= "\n<dt>" . $term . "</dt>";
+        }
+        return $text . "\n";
+    }
+    function _processDefListItems_callback_dd($matches) {
+        $leading_line	= $matches[1];
+        $marker_space	= $matches[2];
+        $def			= $matches[3];
+
+        if ($leading_line || preg_match('/\n{2,}/', $def)) {
+            # Replace marker with the appropriate whitespace indentation
+            $def = str_repeat(' ', strlen($marker_space)) . $def;
+            $def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+            $def = "\n". $def ."\n";
+        }
+        else {
+            $def = rtrim($def);
+            $def = $this->runSpanGamut($this->outdent($def));
+        }
+
+        return "\n<dd>" . $def . "</dd>\n";
+    }
+
+
+    function doFencedCodeBlocks($text) {
+    #
+    # Adding the fenced code block syntax to regular Markdown:
+    #
+    # ~~~
+    # Code block
+    # ~~~
+    #
+        $less_than_tab = $this->tab_width;
+
+        $text = preg_replace_callback('{
 				(?:\n|\A)
 				# 1: Opening marker
 				(
@@ -2565,92 +2565,92 @@ 
 				# Closing marker.
 				\1 [ ]* \n
 			}xm',
-			array(&$this, '_doFencedCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	function _doFencedCodeBlocks_callback($matches) {
-		$codeblock = $matches[2];
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-		$codeblock = preg_replace_callback('/^\n+/',
-			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
-		$codeblock = "<pre><code>$codeblock</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-	function _doFencedCodeBlocks_newlines($matches) {
-		return str_repeat("<br$this->empty_element_suffix",
-			strlen($matches[0]));
-	}
-
-
-	#
-	# Redefining emphasis markers so that emphasis by underscore does not
-	# work in the middle of a word.
-	#
-	var $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![.,:;]\s)',
-		'*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
-		'_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
-		);
-	var $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![.,:;]\s)',
-		'**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
-		'__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
-		);
-	var $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![.,:;]\s)',
-		'***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
-		'___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
-		);
-
-
-	function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html <p> tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap <p> tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			$value = trim($this->runSpanGamut($value));
-
-			# Check if this should be enclosed in a paragraph.
-			# Clean tag hashes & block tag hashes are left alone.
-			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-
-			if ($is_p) {
-				$value = "<p>$value</p>";
-			}
-			$grafs[$key] = $value;
-		}
-
-		# Join grafs in one text, then unhash HTML tags.
-		$text = implode("\n\n", $grafs);
-
-		# Finish by removing any tag hashes still present in $text.
-		$text = $this->unhash($text);
-
-		return $text;
-	}
-
-
-	### Footnotes
-
-	function stripFootnotes($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [^id]: url "optional title"
-		$text = preg_replace_callback('{
+            array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+        return $text;
+    }
+    function _doFencedCodeBlocks_callback($matches) {
+        $codeblock = $matches[2];
+        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+        $codeblock = preg_replace_callback('/^\n+/',
+            array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+        $codeblock = "<pre><code>$codeblock</code></pre>";
+        return "\n\n".$this->hashBlock($codeblock)."\n\n";
+    }
+    function _doFencedCodeBlocks_newlines($matches) {
+        return str_repeat("<br$this->empty_element_suffix",
+            strlen($matches[0]));
+    }
+
+
+    #
+    # Redefining emphasis markers so that emphasis by underscore does not
+    # work in the middle of a word.
+    #
+    var $em_relist = array(
+        ''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S|$)(?![.,:;]\s)',
+        '*' => '(?<=\S|^)(?<!\*)\*(?!\*)',
+        '_' => '(?<=\S|^)(?<!_)_(?![a-zA-Z0-9_])',
+        );
+    var $strong_relist = array(
+        ''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S|$)(?![.,:;]\s)',
+        '**' => '(?<=\S|^)(?<!\*)\*\*(?!\*)',
+        '__' => '(?<=\S|^)(?<!_)__(?![a-zA-Z0-9_])',
+        );
+    var $em_strong_relist = array(
+        ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S|$)(?![.,:;]\s)',
+        '***' => '(?<=\S|^)(?<!\*)\*\*\*(?!\*)',
+        '___' => '(?<=\S|^)(?<!_)___(?![a-zA-Z0-9_])',
+        );
+
+
+    function formParagraphs($text) {
+    #
+    #	Params:
+    #		$text - string to process with html <p> tags
+    #
+        # Strip leading and trailing lines:
+        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+        #
+        # Wrap <p> tags and unhashify HTML blocks
+        #
+        foreach ($grafs as $key => $value) {
+            $value = trim($this->runSpanGamut($value));
+
+            # Check if this should be enclosed in a paragraph.
+            # Clean tag hashes & block tag hashes are left alone.
+            $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+
+            if ($is_p) {
+                $value = "<p>$value</p>";
+            }
+            $grafs[$key] = $value;
+        }
+
+        # Join grafs in one text, then unhash HTML tags.
+        $text = implode("\n\n", $grafs);
+
+        # Finish by removing any tag hashes still present in $text.
+        $text = $this->unhash($text);
+
+        return $text;
+    }
+
+
+    ### Footnotes
+
+    function stripFootnotes($text) {
+    #
+    # Strips link definitions from text, stores the URLs and titles in
+    # hash references.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # Link defs are in the form: [^id]: url "optional title"
+        $text = preg_replace_callback('{
 			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
 			  [ ]*
 			  \n?					# maybe *one* newline
@@ -2665,180 +2665,180 @@ 
 				)*
 			)
 			}xm',
-			array(&$this, '_stripFootnotes_callback'),
-			$text);
-		return $text;
-	}
-	function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
-		$this->footnotes[$note_id] = $this->outdent($matches[2]);
-		return ''; # String that will replace the block
-	}
-
-
-	function doFootnotes($text) {
-	#
-	# Replace footnote references in $text [^id] with a special text-token
-	# which will be replaced by the actual footnote marker in appendFootnotes.
-	#
-		if (!$this->in_anchor) {
-			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
-		}
-		return $text;
-	}
-
-
-	function appendFootnotes($text) {
-	#
-	# Append footnote list to text.
-	#
-		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
-			array(&$this, '_appendFootnotes_callback'), $text);
-
-		if (!empty($this->footnotes_ordered)) {
-			$text .= "\n\n";
-			$text .= "<div class=\"footnotes\">\n";
-			$text .= "<hr". $this->empty_element_suffix ."\n";
-			$text .= "<ol>\n\n";
-
-			$attr = " rev=\"footnote\"";
-			if ($this->fn_backlink_class != "") {
-				$class = $this->fn_backlink_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_backlink_title != "") {
-				$title = $this->fn_backlink_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-			$num = 0;
-
-			while (!empty($this->footnotes_ordered)) {
-				$footnote = reset($this->footnotes_ordered);
-				$note_id = key($this->footnotes_ordered);
-				unset($this->footnotes_ordered[$note_id]);
-
-				$footnote .= "\n"; # Need to append newline before parsing.
-				$footnote = $this->runBlockGamut("$footnote\n");
-				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
-					array(&$this, '_appendFootnotes_callback'), $footnote);
-
-				$attr = str_replace("%%", ++$num, $attr);
-				$note_id = $this->encodeAttribute($note_id);
-
-				# Add backlink to last paragraph; create new paragraph if needed.
-				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
-				if (preg_match('{</p>$}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
-				} else {
-					$footnote .= "\n\n<p>$backlink</p>";
-				}
-
-				$text .= "<li id=\"fn:$note_id\">\n";
-				$text .= $footnote . "\n";
-				$text .= "</li>\n\n";
-			}
-
-			$text .= "</ol>\n";
-			$text .= "</div>";
-		}
-		return $text;
-	}
-	function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
-
-		# Create footnote marker only if it has a corresponding footnote *and*
-		# the footnote hasn't been used by another marker.
-		if (isset($this->footnotes[$node_id])) {
-			# Transfert footnote content to the ordered list.
-			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
-			unset($this->footnotes[$node_id]);
-
-			$num = $this->footnote_counter++;
-			$attr = " rel=\"footnote\"";
-			if ($this->fn_link_class != "") {
-				$class = $this->fn_link_class;
-				$class = $this->encodeAttribute($class);
-				$attr .= " class=\"$class\"";
-			}
-			if ($this->fn_link_title != "") {
-				$title = $this->fn_link_title;
-				$title = $this->encodeAttribute($title);
-				$attr .= " title=\"$title\"";
-			}
-
-			$attr = str_replace("%%", $num, $attr);
-			$node_id = $this->encodeAttribute($node_id);
-
-			return
-				"<sup id=\"fnref:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
-				"</sup>";
-		}
-
-		return "[^".$matches[1]."]";
-	}
-
-
-	### Abbreviations ###
-
-	function stripAbbreviations($text) {
-	#
-	# Strips abbreviations from text, stores titles in hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Link defs are in the form: [id]*: url "optional title"
-		$text = preg_replace_callback('{
+            array(&$this, '_stripFootnotes_callback'),
+            $text);
+        return $text;
+    }
+    function _stripFootnotes_callback($matches) {
+        $note_id = $this->fn_id_prefix . $matches[1];
+        $this->footnotes[$note_id] = $this->outdent($matches[2]);
+        return ''; # String that will replace the block
+    }
+
+
+    function doFootnotes($text) {
+    #
+    # Replace footnote references in $text [^id] with a special text-token
+    # which will be replaced by the actual footnote marker in appendFootnotes.
+    #
+        if (!$this->in_anchor) {
+            $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+        }
+        return $text;
+    }
+
+
+    function appendFootnotes($text) {
+    #
+    # Append footnote list to text.
+    #
+        $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+            array(&$this, '_appendFootnotes_callback'), $text);
+
+        if (!empty($this->footnotes_ordered)) {
+            $text .= "\n\n";
+            $text .= "<div class=\"footnotes\">\n";
+            $text .= "<hr". $this->empty_element_suffix ."\n";
+            $text .= "<ol>\n\n";
+
+            $attr = " rev=\"footnote\"";
+            if ($this->fn_backlink_class != "") {
+                $class = $this->fn_backlink_class;
+                $class = $this->encodeAttribute($class);
+                $attr .= " class=\"$class\"";
+            }
+            if ($this->fn_backlink_title != "") {
+                $title = $this->fn_backlink_title;
+                $title = $this->encodeAttribute($title);
+                $attr .= " title=\"$title\"";
+            }
+            $num = 0;
+
+            while (!empty($this->footnotes_ordered)) {
+                $footnote = reset($this->footnotes_ordered);
+                $note_id = key($this->footnotes_ordered);
+                unset($this->footnotes_ordered[$note_id]);
+
+                $footnote .= "\n"; # Need to append newline before parsing.
+                $footnote = $this->runBlockGamut("$footnote\n");
+                $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+                    array(&$this, '_appendFootnotes_callback'), $footnote);
+
+                $attr = str_replace("%%", ++$num, $attr);
+                $note_id = $this->encodeAttribute($note_id);
+
+                # Add backlink to last paragraph; create new paragraph if needed.
+                $backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
+                if (preg_match('{</p>$}', $footnote)) {
+                    $footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+                } else {
+                    $footnote .= "\n\n<p>$backlink</p>";
+                }
+
+                $text .= "<li id=\"fn:$note_id\">\n";
+                $text .= $footnote . "\n";
+                $text .= "</li>\n\n";
+            }
+
+            $text .= "</ol>\n";
+            $text .= "</div>";
+        }
+        return $text;
+    }
+    function _appendFootnotes_callback($matches) {
+        $node_id = $this->fn_id_prefix . $matches[1];
+
+        # Create footnote marker only if it has a corresponding footnote *and*
+        # the footnote hasn't been used by another marker.
+        if (isset($this->footnotes[$node_id])) {
+            # Transfert footnote content to the ordered list.
+            $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+            unset($this->footnotes[$node_id]);
+
+            $num = $this->footnote_counter++;
+            $attr = " rel=\"footnote\"";
+            if ($this->fn_link_class != "") {
+                $class = $this->fn_link_class;
+                $class = $this->encodeAttribute($class);
+                $attr .= " class=\"$class\"";
+            }
+            if ($this->fn_link_title != "") {
+                $title = $this->fn_link_title;
+                $title = $this->encodeAttribute($title);
+                $attr .= " title=\"$title\"";
+            }
+
+            $attr = str_replace("%%", $num, $attr);
+            $node_id = $this->encodeAttribute($node_id);
+
+            return
+                "<sup id=\"fnref:$node_id\">".
+                "<a href=\"#fn:$node_id\"$attr>$num</a>".
+                "</sup>";
+        }
+
+        return "[^".$matches[1]."]";
+    }
+
+
+    ### Abbreviations ###
+
+    function stripAbbreviations($text) {
+    #
+    # Strips abbreviations from text, stores titles in hash references.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # Link defs are in the form: [id]*: url "optional title"
+        $text = preg_replace_callback('{
 			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
 			(.*)					# text = $2 (no blank lines allowed)
 			}xm',
-			array(&$this, '_stripAbbreviations_callback'),
-			$text);
-		return $text;
-	}
-	function _stripAbbreviations_callback($matches) {
-		$abbr_word = $matches[1];
-		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
-		$this->abbr_word_re .= preg_quote($abbr_word);
-		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
-		return ''; # String that will replace the block
-	}
-
-
-	function doAbbreviations($text) {
-	#
-	# Find defined abbreviations in text and wrap them in <abbr> elements.
-	#
-		if ($this->abbr_word_re) {
-			// cannot use the /x modifier because abbr_word_re may
-			// contain significant spaces:
-			$text = preg_replace_callback('{'.
-				'(?<![\w\x1A])'.
-				'(?:'.$this->abbr_word_re.')'.
-				'(?![\w\x1A])'.
-				'}',
-				array(&$this, '_doAbbreviations_callback'), $text);
-		}
-		return $text;
-	}
-	function _doAbbreviations_callback($matches) {
-		$abbr = $matches[0];
-		if (isset($this->abbr_desciptions[$abbr])) {
-			$desc = $this->abbr_desciptions[$abbr];
-			if (empty($desc)) {
-				return $this->hashPart("<abbr>$abbr</abbr>");
-			} else {
-				$desc = $this->encodeAttribute($desc);
-				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
-			}
-		} else {
-			return $matches[0];
-		}
-	}
+            array(&$this, '_stripAbbreviations_callback'),
+            $text);
+        return $text;
+    }
+    function _stripAbbreviations_callback($matches) {
+        $abbr_word = $matches[1];
+        $abbr_desc = $matches[2];
+        if ($this->abbr_word_re)
+            $this->abbr_word_re .= '|';
+        $this->abbr_word_re .= preg_quote($abbr_word);
+        $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+        return ''; # String that will replace the block
+    }
+
+
+    function doAbbreviations($text) {
+    #
+    # Find defined abbreviations in text and wrap them in <abbr> elements.
+    #
+        if ($this->abbr_word_re) {
+            // cannot use the /x modifier because abbr_word_re may
+            // contain significant spaces:
+            $text = preg_replace_callback('{'.
+                '(?<![\w\x1A])'.
+                '(?:'.$this->abbr_word_re.')'.
+                '(?![\w\x1A])'.
+                '}',
+                array(&$this, '_doAbbreviations_callback'), $text);
+        }
+        return $text;
+    }
+    function _doAbbreviations_callback($matches) {
+        $abbr = $matches[0];
+        if (isset($this->abbr_desciptions[$abbr])) {
+            $desc = $this->abbr_desciptions[$abbr];
+            if (empty($desc)) {
+                return $this->hashPart("<abbr>$abbr</abbr>");
+            } else {
+                $desc = $this->encodeAttribute($desc);
+                return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+            }
+        } else {
+            return $matches[0];
+        }
+    }
 
 }
 

Spacing +119 added lines, -119 removed lines

@@ -12,8 +12,8 @@ 
 #
 
 
-define( 'MARKDOWN_VERSION',  "1.0.1n" ); # Sat 10 Oct 2009
-define( 'MARKDOWNEXTRA_VERSION',  "1.2.4" ); # Sat 10 Oct 2009
+define('MARKDOWN_VERSION', "1.0.1n"); # Sat 10 Oct 2009
+define('MARKDOWNEXTRA_VERSION', "1.2.4"); # Sat 10 Oct 2009
 
 
 #
@@ -21,18 +21,18 @@ 
 #
 
 # Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+@define('MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />");
 
 # Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
+@define('MARKDOWN_TAB_WIDTH', 4);
 
 # Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+@define('MARKDOWN_FN_LINK_TITLE', "");
+@define('MARKDOWN_FN_BACKLINK_TITLE', "");
 
 # Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+@define('MARKDOWN_FN_LINK_CLASS', "");
+@define('MARKDOWN_FN_BACKLINK_CLASS', "");
 
 
 #
@@ -40,14 +40,14 @@ 
 #
 
 # Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
+@define('MARKDOWN_WP_POSTS', true);
+@define('MARKDOWN_WP_COMMENTS', true);
 
 
 
 ### Standard Function Interface ###
 
-@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+@define('MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser');
 
 function Markdown($text) {
 #
@@ -85,19 +85,19 @@ 
 	# - Run Markdown on excerpt, then remove all tags.
 	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
 	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
+		remove_filter('the_content', 'wpautop');
         remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+		remove_filter('the_excerpt', 'wpautop');
+		add_filter('the_content', 'mdwp_MarkdownPost', 6);
         add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt', 'mdwp_add_p');
 		add_filter('the_excerpt_rss', 'mdwp_strip_p');
 
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
+		remove_filter('content_save_pre', 'balanceTags', 50);
+		remove_filter('excerpt_save_pre', 'balanceTags', 50);
+		add_filter('the_content', 'balanceTags', 50);
 		add_filter('get_the_excerpt', 'balanceTags', 9);
 	}
 
@@ -111,7 +111,7 @@ 
 		if (is_single() || is_page() || is_feed()) {
 			$parser->fn_id_prefix = "";
 		} else {
-			$parser->fn_id_prefix = get_the_ID() . ".";
+			$parser->fn_id_prefix = get_the_ID().".";
 		}
 		return $parser->transform($text);
 	}
@@ -127,7 +127,7 @@ 
 		add_filter('pre_comment_content', 'Markdown', 6);
 		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
 		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_text', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
 
@@ -192,13 +192,13 @@ 
 	@include_once 'smartypants.php';
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
+		function TextileThis($text, $lite = '', $encode = '') {
 			if ($lite == '' && $encode == '')    $text = Markdown($text);
 			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
+		function TextileRestricted($text, $lite = '', $noimage = '') {
 			return $this->TextileThis($text, $lite);
 		}
 		# Workaround to ensure compatibility with TextPattern 4.0.3.
@@ -332,7 +332,7 @@ 
 
 		$this->teardown();
 
-		return $text . "\n";
+		return $text."\n";
 	}
 
 	var $document_gamut = array(
@@ -381,7 +381,7 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
+		$this->titles[$link_id] = & $matches[4];
 		return ''; # String that will replace the block
 	}
 
@@ -434,8 +434,8 @@ 
 					(?>
 					  />
 					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
+					  >', $nested_tags_level).# end of opening tag
+					  '.*?'.# last level nested tag content
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
@@ -547,7 +547,7 @@ 
 
 		# Then hash the block.
 		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
+		$key = "$boundary\x1A".++$i.$boundary;
 		$this->html_hashes[$key] = $text;
 		return $key; # String that will replace the tag.
 	}
@@ -740,9 +740,9 @@ 
 		return $text;
 	}
 	function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			# for shortcut links like [this][] or [this].
@@ -758,10 +758,10 @@ 
 			$url = $this->encodeAttribute($url);
 
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 
 			$link_text = $this->runSpanGamut($link_text);
@@ -774,17 +774,17 @@ 
 		return $result;
 	}
 	function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$url = $this->encodeAttribute($url);
 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		$link_text = $this->runSpanGamut($link_text);
@@ -865,7 +865,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
@@ -878,17 +878,17 @@ 
 		return $result;
 	}
 	function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$alt_text = $matches[2];
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -933,12 +933,12 @@ 
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
 		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 
@@ -1017,13 +1017,13 @@ 
 		$list = $matches[1];
 		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
 
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		$marker_any_re = ($list_type == "ul" ? $marker_ul_re : $marker_ol_re);
 
 		$list .= "\n";
 		$result = $this->processListItems($list, $marker_any_re);
 
-		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
+		$result = $this->hashBlock("<$list_type>\n".$result."</$list_type>");
+		return "\n".$result."\n\n";
 	}
 
 	var $list_level = 0;
@@ -1076,16 +1076,16 @@ 
 	}
 	function _processListItems_callback($matches) {
 		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
+		$leading_line = & $matches[1];
+		$leading_space = & $matches[2];
 		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
+		$tailing_blank_line = & $matches[5];
 
 		if ($leading_line || $tailing_blank_line ||
 			preg_match('/\n{2,}/', $item))
 		{
 			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $leading_space.str_repeat(' ', strlen($marker_space)).$item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
 		}
 		else {
@@ -1095,7 +1095,7 @@ 
 			$item = $this->runSpanGamut($item);
 		}
 
-		return "<li>" . $item . "</li>\n";
+		return "<li>".$item."</li>\n";
 	}
 
 
@@ -1173,7 +1173,7 @@ 
 				$token_relist[] = $strong_re;
 
 				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
+				$token_re = '{('.implode('|', $token_relist).')}';
 				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
 			}
 		}
@@ -1199,8 +1199,8 @@ 
 			#
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
 			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+			$token = & $parts[1];
+			$text = & $parts[2];
 
 			if (empty($token)) {
 				# Reached end of text span: empty stack without emitting.
@@ -1227,7 +1227,7 @@ 
 				} else {
 					# Other closing marker: close one em or strong and
 					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$token_stack[0] = str_repeat($token{0}, 3 - $token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
@@ -1321,7 +1321,7 @@ 
 		$bq = $matches[1];
 		# trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); # recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
 		# These leading spaces cause problem with <pre> content,
@@ -1329,7 +1329,7 @@ 
 		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
 			array(&$this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+		return "\n".$this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
 	}
 	function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
@@ -1431,7 +1431,7 @@ 
 			# Ampersand-encoding based entirely on Nat Irons's Amputator
 			# MT plugin: <http://bumppo.net/projects/amputator/>
 			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
-								'&amp;', $text);;
+								'&amp;', $text); ;
 		}
 		# Encode remaining <'s
 		$text = str_replace('<', '&lt;', $text);
@@ -1495,9 +1495,9 @@ 
 	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
 	#   With some optimizations by Milian Wolff.
 	#
-		$addr = "mailto:" . $addr;
+		$addr = "mailto:".$addr;
 		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		$seed = (int) abs(crc32($addr) / strlen($addr)); # Deterministic seed.
 
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
@@ -1533,7 +1533,7 @@ 
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1583,7 +1583,7 @@ 
 	#
 		switch ($token{0}) {
 			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
+				return $this->hashPart("&#".ord($token{1}).";");
 			case "`":
 				# Search for end marker in remaining text.
 				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
@@ -1638,7 +1638,7 @@ 
 			# Calculate amount of space, insert spaces, insert block.
 			$amount = $this->tab_width -
 				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
+			$line .= str_repeat(" ", $amount).$block;
 		}
 		return $line;
 	}
@@ -1802,7 +1802,7 @@ 
 		#
 		# Call the HTML-in-Markdown hasher.
 		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -1874,25 +1874,25 @@ 
 				|
 					# Code span marker
 					`+
-				'. ( !$span ? ' # If not in span.
+				'. (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
+					[ ]{'.($indent + 4).'}[^\n]* \n
 					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+						(?: [ ]{'.($indent + 4).'}[^\n]* | [ ]* ) \n
 					)*
 				|
 					# Fenced code block marker
 					(?> ^ | \n )
 					[ ]{'.($indent).'}~~~+[ ]*\n
-				' : '' ). ' # End (if not is span).
+				' : '').' # End (if not is span).
 				)
 			}xs';
 
 
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Loop through every tag until we find the closing tag of the parent
@@ -1913,7 +1913,7 @@ 
 			if ($span) {
 				$void = $this->hashPart("", ':');
 				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+				$parts[0] = $void.str_replace("\n", $newline, $parts[0]).$void;
 			}
 
 			$parsed .= $parts[0]; # Text before current tag.
@@ -1938,7 +1938,7 @@ 
 					$text, $matches))
 				{
 					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
+					$parsed .= $tag.$matches[0];
 					$text = substr($text, strlen($matches[0]));
 				}
 				else {
@@ -1964,7 +1964,7 @@ 
 					$matches))
 				{
 					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
+					$parsed .= $tag.$matches[0];
 					$text = substr($text, strlen($matches[0]));
 				}
 				else {
@@ -1978,14 +1978,14 @@ 
 			#               used as a block tag (tag is alone on it's line).
 			#
 			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+				(preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
 					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
+					preg_match($newline_after_re, $text))
 				)
 			{
 				# Need to parse tag and following text using the HTML parser.
 				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+					$this->_hashHTMLBlocks_inHTML($tag.$text, "hashBlock", true);
 
 				# Make sure it stays outside of any paragraph by adding newlines.
 				$parsed .= "\n\n$block_text\n\n";
@@ -2000,7 +2000,7 @@ 
 				# Need to parse tag and following text using the HTML parser.
 				# (don't check for markdown attribute)
 				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+					$this->_hashHTMLBlocks_inHTML($tag.$text, "hashClean", false);
 
 				$parsed .= $block_text;
 			}
@@ -2015,14 +2015,14 @@ 
 				# Increase/decrease nested tag count.
 				#
 				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 
 				if ($depth < 0) {
 					#
 					# Going out of parent element. Clean up and break so we
 					# return to the calling function.
 					#
-					$text = $tag . $text;
+					$text = $tag.$text;
 					break;
 				}
 
@@ -2087,11 +2087,11 @@ 
 				)
 			}xs';
 
-		$original_text = $text;		# Save original text in case of faliure.
+		$original_text = $text; # Save original text in case of faliure.
 
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$block_text = ""; # Temporary text holder for current text.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Get the name of the starting tag.
@@ -2143,7 +2143,7 @@ 
 				#
 				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
 					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 				}
 
 				#
@@ -2151,13 +2151,13 @@ 
 				#
 				if ($md_attr &&
 					preg_match($markdown_attr_re, $tag, $attr_m) &&
-					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+					preg_match('/^1|block|span$/', $attr_m[2].$attr_m[3]))
 				{
 					# Remove `markdown` attribute from opening tag.
 					$tag = preg_replace($markdown_attr_re, '', $tag);
 
 					# Check if text inside this tag must be parsed in span mode.
-					$this->mode = $attr_m[2] . $attr_m[3];
+					$this->mode = $attr_m[2].$attr_m[3];
 					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
 						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
 
@@ -2268,15 +2268,15 @@ 
 		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
 			return $matches[0];
 		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$attr  = $this->_doHeaders_attr($id = & $matches[2]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
-		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$attr  = $this->_doHeaders_attr($id = & $matches[3]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 
@@ -2342,8 +2342,8 @@ 
 		return $text;
 	}
 	function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
+		$head = $matches[1];
+		$underline = $matches[2];
 		$content	= $matches[3];
 
 		# Remove leading pipe for each row.
@@ -2352,17 +2352,17 @@ 
 		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
 	}
 	function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
+		$head = $matches[1];
+		$underline = $matches[2];
+		$content = $matches[3];
 
 		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
+		$head = preg_replace('/[|] *$/m', '', $head);
+		$underline = preg_replace('/[|] *$/m', '', $underline);
+		$content = preg_replace('/[|] *$/m', '', $content);
 
 		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
+		$separators = preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
 			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
 			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
@@ -2372,9 +2372,9 @@ 
 
 		# Parsing span elements, including code spans, character escapes,
 		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
+		$head = $this->parseSpan($head);
+		$headers = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
 
 		# Write column headers.
 		$text = "<table>\n";
@@ -2406,7 +2406,7 @@ 
 		$text .= "</tbody>\n";
 		$text .= "</table>";
 
-		return $this->hashBlock($text) . "\n";
+		return $this->hashBlock($text)."\n";
 	}
 
 
@@ -2459,8 +2459,8 @@ 
 		# Turn double returns into triple returns, so that we can make a
 		# paragraph for the last item in a list, if necessary:
 		$result = trim($this->processDefListItems($list));
-		$result = "<dl>\n" . $result . "\n</dl>";
-		return $this->hashBlock($result) . "\n\n";
+		$result = "<dl>\n".$result."\n</dl>";
+		return $this->hashBlock($result)."\n\n";
 	}
 
 
@@ -2512,27 +2512,27 @@ 
 		$text = '';
 		foreach ($terms as $term) {
 			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n<dt>" . $term . "</dt>";
+			$text .= "\n<dt>".$term."</dt>";
 		}
-		return $text . "\n";
+		return $text."\n";
 	}
 	function _processDefListItems_callback_dd($matches) {
 		$leading_line	= $matches[1];
 		$marker_space	= $matches[2];
-		$def			= $matches[3];
+		$def = $matches[3];
 
 		if ($leading_line || preg_match('/\n{2,}/', $def)) {
 			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
+			$def = str_repeat(' ', strlen($marker_space)).$def;
+			$def = $this->runBlockGamut($this->outdent($def."\n\n"));
+			$def = "\n".$def."\n";
 		}
 		else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}
 
-		return "\n<dd>" . $def . "</dd>\n";
+		return "\n<dd>".$def."</dd>\n";
 	}
 
 
@@ -2670,7 +2670,7 @@ 
 		return $text;
 	}
 	function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
+		$note_id = $this->fn_id_prefix.$matches[1];
 		$this->footnotes[$note_id] = $this->outdent($matches[2]);
 		return ''; # String that will replace the block
 	}
@@ -2698,7 +2698,7 @@ 
 		if (!empty($this->footnotes_ordered)) {
 			$text .= "\n\n";
 			$text .= "<div class=\"footnotes\">\n";
-			$text .= "<hr". $this->empty_element_suffix ."\n";
+			$text .= "<hr".$this->empty_element_suffix."\n";
 			$text .= "<ol>\n\n";
 
 			$attr = " rev=\"footnote\"";
@@ -2730,13 +2730,13 @@ 
 				# Add backlink to last paragraph; create new paragraph if needed.
 				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
 				if (preg_match('{</p>$}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+					$footnote = substr($footnote, 0, -4)."&#160;$backlink</p>";
 				} else {
 					$footnote .= "\n\n<p>$backlink</p>";
 				}
 
 				$text .= "<li id=\"fn:$note_id\">\n";
-				$text .= $footnote . "\n";
+				$text .= $footnote."\n";
 				$text .= "</li>\n\n";
 			}
 
@@ -2746,7 +2746,7 @@ 
 		return $text;
 	}
 	function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
+		$node_id = $this->fn_id_prefix.$matches[1];
 
 		# Create footnote marker only if it has a corresponding footnote *and*
 		# the footnote hasn't been used by another marker.

Braces +87 added lines, -57 removed lines

@@ -193,8 +193,12 @@ 
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
 		function TextileThis($text, $lite='', $encode='') {
-			if ($lite == '' && $encode == '')    $text = Markdown($text);
-			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+			if ($lite == '' && $encode == '') {
+			    $text = Markdown($text);
+			}
+			if (function_exists('SmartyPants')) {
+			    $text = SmartyPants($text);
+			}
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
@@ -387,7 +391,9 @@ 
 
 
 	function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
+		if ($this->no_markup) {
+		    return $text;
+		}
 
 		$less_than_tab = $this->tab_width - 1;
 
@@ -673,7 +679,9 @@ 
 	#
 	# Turn Markdown link shortcuts into XHTML <a> tags.
 	#
-		if ($this->in_anchor) return $text;
+		if ($this->in_anchor) {
+		    return $text;
+		}
 		$this->in_anchor = true;
 
 		#
@@ -767,8 +775,7 @@ 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -869,8 +876,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			# If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -928,8 +934,9 @@ 
 	}
 	function _doHeaders_callback_setext($matches) {
 		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
+					return $matches[0];
+		}
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -996,8 +1003,7 @@ 
 						'.$whole_list_re.'
 					}mx',
 					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
+			} else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
@@ -1087,8 +1093,7 @@ 
 			# Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
+		} else {
 			# Recursion for sub-lists:
 			$item = $this->doLists($this->outdent($item));
 			$item = preg_replace('/\n+$/', '', $item);
@@ -1358,8 +1363,7 @@ 
 				$value = preg_replace('/^([ ]*)/', "<p>", $value);
 				$value .= "</p>";
 				$grafs[$key] = $this->unhash($value);
-			}
-			else {
+			} else {
 				# Is a block.
 				# Modify elements of @grafs in-place...
 				$graf = $value;
@@ -1507,8 +1511,11 @@ 
 				# roughly 10% raw, 45% hex, 45% dec
 				# '@' *must* be encoded. I insist.
 				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				else if ($r < 45) {
+				    $chars[$key] = '&#x'.dechex($ord).';';
+				} else {
+				    $chars[$key] = '&#'.$ord.';';
+				}
 			}
 		}
 
@@ -1566,8 +1573,7 @@ 
 			if (isset($parts[1])) {
 				$output .= $this->handleSpanToken($parts[1], $parts[2]);
 				$str = $parts[2];
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -1649,7 +1655,9 @@ 
 	# function that will loosely count the number of UTF-8 characters with a
 	# regular expression.
 	#
-		if (function_exists($this->utf8_strlen)) return;
+		if (function_exists($this->utf8_strlen)) {
+		    return;
+		}
 		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');
@@ -1744,8 +1752,9 @@ 
 		$this->footnote_counter = 1;
 
 		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
+			if ($this->abbr_word_re) {
+							$this->abbr_word_re .= '|';
+			}
 			$this->abbr_word_re .= preg_quote($abbr_word);
 			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		}
@@ -1834,7 +1843,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		# Regex to check for the presense of newlines around a block tag.
 		$newline_before_re = '/(?:^\n?|\n\n)*$/';
@@ -1940,8 +1951,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# Unmatched marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -1966,8 +1976,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# No end marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -2014,8 +2023,11 @@ 
 				#
 				# Increase/decrease nested tag count.
 				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				if ($tag{1} == '/') {
+				    $depth--;
+				} else if ($tag{strlen($tag)-2} != '/') {
+				    $depth++;
+				}
 
 				if ($depth < 0) {
 					#
@@ -2027,8 +2039,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -2046,7 +2057,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		# Regex to match `markdown` attribute inside of a tag.
 		$markdown_attr_re = '
@@ -2097,8 +2110,9 @@ 
 		# Get the name of the starting tag.
 		# (This pattern makes $base_tag_name_re safe without quoting.)
 		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+					$base_tag_name_re = $matches[1];
+		}
 
 		#
 		# Loop through every tag until we find the corresponding closing tag.
@@ -2135,15 +2149,17 @@ 
 			{
 				# Just add the tag to the block as if it was text.
 				$block_text .= $tag;
-			}
-			else {
+			} else {
 				#
 				# Increase/decrease nested tag count. Only do so if
 				# the tag's name match base tag's.
 				#
 				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					if ($tag{1} == '/') {
+					    $depth--;
+					} else if ($tag{strlen($tag)-2} != '/') {
+					    $depth++;
+					}
 				}
 
 				#
@@ -2190,13 +2206,17 @@ 
 					}
 
 					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
+					if (!$span_mode) {
+					    $parsed .= "\n\n$block_text\n\n";
+					} else {
+					    $parsed .= "$block_text";
+					}
 
 					# Start over a new block.
 					$block_text = "";
+				} else {
+				    $block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -2261,12 +2281,15 @@ 
 		return $text;
 	}
 	function _doHeaders_attr($attr) {
-		if (empty($attr))  return "";
+		if (empty($attr)) {
+		    return "";
+		}
 		return " id=\"$attr\"";
 	}
 	function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
+					return $matches[0];
+		}
 		$level = $matches[3]{0} == '=' ? 1 : 2;
 		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -2364,10 +2387,15 @@ 
 		# Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
-			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
-			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
-			else									$attr[$n] = '';
+			if (preg_match('/^ *-+: *$/', $s)) {
+			    $attr[$n] = ' align="right"';
+			} else if (preg_match('/^ *:-+: *$/', $s)) {
+			    $attr[$n] = ' align="center"';
+			} else if (preg_match('/^ *:-+ *$/', $s)) {
+			    $attr[$n] = ' align="left"';
+			} else {
+			    $attr[$n] = '';
+			}
 		}
 
 		# Parsing span elements, including code spans, character escapes,
@@ -2380,8 +2408,9 @@ 
 		$text = "<table>\n";
 		$text .= "<thead>\n";
 		$text .= "<tr>\n";
-		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		foreach ($headers as $n => $header) {
+					$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		}
 		$text .= "</tr>\n";
 		$text .= "</thead>\n";
 
@@ -2399,8 +2428,9 @@ 
 			$row_cells = array_pad($row_cells, $col_count, '');
 
 			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			foreach ($row_cells as $n => $cell) {
+							$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			}
 			$text .= "</tr>\n";
 		}
 		$text .= "</tbody>\n";
@@ -2526,8 +2556,7 @@ 
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
 			$def = "\n". $def ."\n";
-		}
-		else {
+		} else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}
@@ -2801,8 +2830,9 @@ 
 	function _stripAbbreviations_callback($matches) {
 		$abbr_word = $matches[1];
 		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
+		if ($this->abbr_word_re) {
+					$this->abbr_word_re .= '|';
+		}
 		$this->abbr_word_re .= preg_quote($abbr_word);
 		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		return ''; # String that will replace the block

app/Plugin/Search/Model/Behavior/SearchableBehavior.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
  * @param Model $Model
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
  * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
- * @return array Array of records
+ * @return string Array of records
  * @link http://book.cakephp.org/view/1018/find
  */
 	public function getQuery(Model $Model, $type = 'first', $query = array()) {

Indentation +350 added lines, -350 removed lines

@@ -26,13 +26,13 @@ 
  *
  * @var array
  */
-	protected $_defaults = array(
-		'wildcardAny' => '*', //on windows/unix/mac/google/... thats the default one
-		'wildcardOne' => '?', //on windows/unix/mac thats the default one
-		'like' => array('before' => true, 'after' => true),
-		'connectorAnd' => null,
-		'connectorOr' => null,
-	);
+    protected $_defaults = array(
+        'wildcardAny' => '*', //on windows/unix/mac/google/... thats the default one
+        'wildcardOne' => '?', //on windows/unix/mac thats the default one
+        'like' => array('before' => true, 'after' => true),
+        'connectorAnd' => null,
+        'connectorOr' => null,
+    );
 
 /**
  * Configuration of model
@@ -41,24 +41,24 @@ 
  * @param array $config
  * @return void
  */
-	public function setup(Model $Model, $config = array()) {
-		$this->_defaults = array_merge($this->_defaults, (array)Configure::read('Search.Searchable'));
-		$this->settings[$Model->alias] = array_merge($this->_defaults, $config);
-		if (empty($Model->filterArgs)) {
-			return;
-		}
-		foreach ($Model->filterArgs as $key => $val) {
-			if (!isset($val['name'])) {
-				$Model->filterArgs[$key]['name'] = $key;
-			}
-			if (!isset($val['field'])) {
-				$Model->filterArgs[$key]['field'] = $Model->filterArgs[$key]['name'];
-			}
-			if (!isset($val['type'])) {
-				$Model->filterArgs[$key]['type'] = 'value';
-			}
-		}
-	}
+    public function setup(Model $Model, $config = array()) {
+        $this->_defaults = array_merge($this->_defaults, (array)Configure::read('Search.Searchable'));
+        $this->settings[$Model->alias] = array_merge($this->_defaults, $config);
+        if (empty($Model->filterArgs)) {
+            return;
+        }
+        foreach ($Model->filterArgs as $key => $val) {
+            if (!isset($val['name'])) {
+                $Model->filterArgs[$key]['name'] = $key;
+            }
+            if (!isset($val['field'])) {
+                $Model->filterArgs[$key]['field'] = $Model->filterArgs[$key]['name'];
+            }
+            if (!isset($val['type'])) {
+                $Model->filterArgs[$key]['type'] = 'value';
+            }
+        }
+    }
 
 /**
  * parseCriteria
@@ -69,28 +69,28 @@ 
  * @param array $data Criteria of key->value pairs from post/named parameters
  * @return array Array of conditions that express the conditions needed for the search
  */
-	public function parseCriteria(Model $Model, $data) {
-		$conditions = array();
-		foreach ($Model->filterArgs as $field) {
-			// If this field was not passed and a default value exists, use that instead.
-			if (!array_key_exists($field['name'], $data) && array_key_exists('defaultValue', $field)) {
-				$data[$field['name']] = $field['defaultValue'];
-			}
-
-			if (in_array($field['type'], array('like'))) {
-				$this->_addCondLike($Model, $conditions, $data, $field);
-			} elseif (in_array($field['type'], array('value'))) {
-				$this->_addCondValue($Model, $conditions, $data, $field);
-			} elseif ($field['type'] === 'expression') {
-				$this->_addCondExpression($Model, $conditions, $data, $field);
-			} elseif ($field['type'] === 'query') {
-				$this->_addCondQuery($Model, $conditions, $data, $field);
-			} elseif ($field['type'] === 'subquery') {
-				$this->_addCondSubquery($Model, $conditions, $data, $field);
-			}
-		}
-		return $conditions;
-	}
+    public function parseCriteria(Model $Model, $data) {
+        $conditions = array();
+        foreach ($Model->filterArgs as $field) {
+            // If this field was not passed and a default value exists, use that instead.
+            if (!array_key_exists($field['name'], $data) && array_key_exists('defaultValue', $field)) {
+                $data[$field['name']] = $field['defaultValue'];
+            }
+
+            if (in_array($field['type'], array('like'))) {
+                $this->_addCondLike($Model, $conditions, $data, $field);
+            } elseif (in_array($field['type'], array('value'))) {
+                $this->_addCondValue($Model, $conditions, $data, $field);
+            } elseif ($field['type'] === 'expression') {
+                $this->_addCondExpression($Model, $conditions, $data, $field);
+            } elseif ($field['type'] === 'query') {
+                $this->_addCondQuery($Model, $conditions, $data, $field);
+            } elseif ($field['type'] === 'subquery') {
+                $this->_addCondSubquery($Model, $conditions, $data, $field);
+            }
+        }
+        return $conditions;
+    }
 
 /**
  * Validate search
@@ -99,18 +99,18 @@ 
  * @param null $data
  * @return boolean always true
  */
-	public function validateSearch(Model $Model, $data = null) {
-		if (!empty($data)) {
-			$Model->set($data);
-		}
-		$keys = array_keys($Model->data[$Model->alias]);
-		foreach ($keys as $key) {
-			if (empty($Model->data[$Model->alias][$key])) {
-				unset($Model->data[$Model->alias][$key]);
-			}
-		}
-		return true;
-	}
+    public function validateSearch(Model $Model, $data = null) {
+        if (!empty($data)) {
+            $Model->set($data);
+        }
+        $keys = array_keys($Model->data[$Model->alias]);
+        foreach ($keys as $key) {
+            if (empty($Model->data[$Model->alias][$key])) {
+                unset($Model->data[$Model->alias][$key]);
+            }
+        }
+        return true;
+    }
 
 /**
  * filter retrieving variables only that present in  Model::filterArgs
@@ -119,15 +119,15 @@ 
  * @param array $vars
  * @return array, filtered args
  */
-	public function passedArgs(Model $Model, $vars) {
-		$result = array();
-		foreach ($vars as $var => $val) {
-			if (in_array($var, Set::extract($Model->filterArgs, '{n}.name'))) {
-				$result[$var] = $val;
-			}
-		}
-		return $result;
-	}
+    public function passedArgs(Model $Model, $vars) {
+        $result = array();
+        foreach ($vars as $var => $val) {
+            if (in_array($var, Set::extract($Model->filterArgs, '{n}.name'))) {
+                $result[$var] = $val;
+            }
+        }
+        return $result;
+    }
 
 /**
  * Generates a query string using the same API Model::find() uses, calling the beforeFind process for the model
@@ -138,13 +138,13 @@ 
  * @return array Array of records
  * @link http://book.cakephp.org/view/1018/find
  */
-	public function getQuery(Model $Model, $type = 'first', $query = array()) {
-		$Model->findQueryType = $type;
-		$Model->id = $Model->getID();
-		$query = $Model->buildQuery($type, $query);
-		$this->findQueryType = null;
-		return $this->_queryGet($Model, $query);
-	}
+    public function getQuery(Model $Model, $type = 'first', $query = array()) {
+        $Model->findQueryType = $type;
+        $Model->id = $Model->getID();
+        $query = $Model->buildQuery($type, $query);
+        $this->findQueryType = null;
+        return $this->_queryGet($Model, $query);
+    }
 
 /**
  * Clear all associations
@@ -153,14 +153,14 @@ 
  * @param boolean $reset
  * @return void
  */
-	public function unbindAllModels(Model $Model, $reset = false) {
-		$assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
-		$unbind = array();
-		foreach ($assocs as $assoc) {
-			$unbind[$assoc] = array_keys($Model->{$assoc});
-		}
-		$Model->unbindModel($unbind, $reset);
-	}
+    public function unbindAllModels(Model $Model, $reset = false) {
+        $assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+        $unbind = array();
+        foreach ($assocs as $assoc) {
+            $unbind[$assoc] = array_keys($Model->{$assoc});
+        }
+        $Model->unbindModel($unbind, $reset);
+    }
 
 /**
  * For custom queries inside the model
@@ -172,17 +172,17 @@ 
  * @param array $field
  * @return array of conditions
  */
-	public function condLike(Model $Model, $name, $data, $field = array()) {
-		$conditions = array();
-		$field['name'] = $name;
-		if (!is_array($data)) {
-			$data = array($name => $data);
-		}
-		if (!isset($field['field'])) {
-			$field['field'] = $field['name'];
-		}
-		return $this->_addCondLike($Model, $conditions, $data, $field);
-	}
+    public function condLike(Model $Model, $name, $data, $field = array()) {
+        $conditions = array();
+        $field['name'] = $name;
+        if (!is_array($data)) {
+            $data = array($name => $data);
+        }
+        if (!isset($field['field'])) {
+            $field['field'] = $field['name'];
+        }
+        return $this->_addCondLike($Model, $conditions, $data, $field);
+    }
 
 /**
  * Replace substitutions with original wildcards
@@ -193,29 +193,29 @@ 
  * @param array $options
  * @return string queryLikeString
  */
-	public function formatLike(Model $Model, $data, $options = array()) {
-		$options = array_merge($this->settings[$Model->alias], $options);
-		$from = $to = $substFrom = $substTo = array();
-		if ($options['wildcardAny'] !== '%') {
-			$from[] = '%';
-			$to[] = '\%';
-			$substFrom[] = $options['wildcardAny'];
-			$substTo[] = '%';
-		}
-		if ($options['wildcardOne'] !== '_') {
-			$from[] = '_';
-			$to[] = '\_';
-			$substFrom[] = $options['wildcardOne'];
-			$substTo[] = '_';
-		}
-		if (!empty($from)) {
-			// escape first
-			$data = str_replace($from, $to, $data);
-			// replace wildcards
-			$data = str_replace($substFrom, $substTo, $data);
-		}
-		return $data;
-	}
+    public function formatLike(Model $Model, $data, $options = array()) {
+        $options = array_merge($this->settings[$Model->alias], $options);
+        $from = $to = $substFrom = $substTo = array();
+        if ($options['wildcardAny'] !== '%') {
+            $from[] = '%';
+            $to[] = '\%';
+            $substFrom[] = $options['wildcardAny'];
+            $substTo[] = '%';
+        }
+        if ($options['wildcardOne'] !== '_') {
+            $from[] = '_';
+            $to[] = '\_';
+            $substFrom[] = $options['wildcardOne'];
+            $substTo[] = '_';
+        }
+        if (!empty($from)) {
+            // escape first
+            $data = str_replace($from, $to, $data);
+            // replace wildcards
+            $data = str_replace($substFrom, $substTo, $data);
+        }
+        return $data;
+    }
 
 /**
  * Return the current chars for querying LIKE statements on this model
@@ -224,10 +224,10 @@ 
  * @param array $options
  * @return array, [one=>..., any=>...]
  */
-	public function getWildcards(Model $Model, $options = array()) {
-		$options = array_merge($this->settings[$Model->alias], $options);
-		return array('any' => $options['wildcardAny'], 'one' => $options['wildcardOne']);
-	}
+    public function getWildcards(Model $Model, $options = array()) {
+        $options = array_merge($this->settings[$Model->alias], $options);
+        return array('any' => $options['wildcardAny'], 'one' => $options['wildcardOne']);
+    }
 
 /**
  * Add Conditions based on fuzzy comparison
@@ -238,72 +238,72 @@ 
  * @param array $field Field definition information
  * @return array Conditions
  */
-	protected function _addCondLike(Model $Model, &$conditions, $data, $field) {
-		if (!is_array($this->settings[$Model->alias]['like'])) {
-			$this->settings[$Model->alias]['like'] = array('before' => $this->settings[$Model->alias]['like'], 'after' => $this->settings[$Model->alias]['like']);
-		}
-		$field = array_merge($this->settings[$Model->alias]['like'], $field);
-		if (empty($data[$field['name']])) {
-			return $conditions;
-		}
-		$fieldNames = (array)$field['field'];
-
-		$cond = array();
-		foreach ($fieldNames as $fieldName) {
-			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
-			}
-
-			if ($field['before'] === true) {
-				$field['before'] = '%';
-			}
-			if ($field['after'] === true) {
-				$field['after'] = '%';
-			}
-			//if both before and after are false, LIKE allows custom placeholders, % and _ are always treated as normal chars
-			$options = $this->settings[$Model->alias];
-			$from = $to = $substFrom = $substTo = array();
-			if ($options['wildcardAny'] !== '%' || ($field['before'] !== false || $field['after'] !== false)) {
-				$from[] = '%';
-				$to[] = '\%';
-			}
-			if ($options['wildcardOne'] !== '_' || ($field['before'] !== false || $field['after'] !== false)) {
-				$from[] = '_';
-				$to[] = '\_';
-			}
-			$value = $data[$field['name']];
-			if (!empty($from)) {
-				$value = str_replace($from, $to, $value);
-			}
-			if ($field['before'] === false && $field['after'] === false) {
-				if ($options['wildcardAny'] !== '%') {
-					$substFrom[] = $options['wildcardAny'];
-					$substTo[] = '%';
-				}
-				if ($options['wildcardOne'] !== '_') {
-					$substFrom[] = $options['wildcardOne'];
-					$substTo[] = '_';
-				}
-				$value = str_replace($substFrom, $substTo, $value);
-			}
-
-			if (!empty($field['connectorAnd']) || !empty($field['connectorOr'])) {
-				$cond[] = $this->_connectedLike($value, $field, $fieldName);
-			} else {
-				$cond[$fieldName . " LIKE"] = $field['before'] . $value . $field['after'];
-			}
-		}
-		if (count($cond) > 1) {
-			if (isset($conditions['OR'])) {
-				$conditions[]['OR'] = $cond;
-			} else {
-				$conditions['OR'] = $cond;
-			}
-		} else {
-			$conditions = array_merge($conditions, $cond);
-		}
-		return $conditions;
-	}
+    protected function _addCondLike(Model $Model, &$conditions, $data, $field) {
+        if (!is_array($this->settings[$Model->alias]['like'])) {
+            $this->settings[$Model->alias]['like'] = array('before' => $this->settings[$Model->alias]['like'], 'after' => $this->settings[$Model->alias]['like']);
+        }
+        $field = array_merge($this->settings[$Model->alias]['like'], $field);
+        if (empty($data[$field['name']])) {
+            return $conditions;
+        }
+        $fieldNames = (array)$field['field'];
+
+        $cond = array();
+        foreach ($fieldNames as $fieldName) {
+            if (strpos($fieldName, '.') === false) {
+                $fieldName = $Model->alias . '.' . $fieldName;
+            }
+
+            if ($field['before'] === true) {
+                $field['before'] = '%';
+            }
+            if ($field['after'] === true) {
+                $field['after'] = '%';
+            }
+            //if both before and after are false, LIKE allows custom placeholders, % and _ are always treated as normal chars
+            $options = $this->settings[$Model->alias];
+            $from = $to = $substFrom = $substTo = array();
+            if ($options['wildcardAny'] !== '%' || ($field['before'] !== false || $field['after'] !== false)) {
+                $from[] = '%';
+                $to[] = '\%';
+            }
+            if ($options['wildcardOne'] !== '_' || ($field['before'] !== false || $field['after'] !== false)) {
+                $from[] = '_';
+                $to[] = '\_';
+            }
+            $value = $data[$field['name']];
+            if (!empty($from)) {
+                $value = str_replace($from, $to, $value);
+            }
+            if ($field['before'] === false && $field['after'] === false) {
+                if ($options['wildcardAny'] !== '%') {
+                    $substFrom[] = $options['wildcardAny'];
+                    $substTo[] = '%';
+                }
+                if ($options['wildcardOne'] !== '_') {
+                    $substFrom[] = $options['wildcardOne'];
+                    $substTo[] = '_';
+                }
+                $value = str_replace($substFrom, $substTo, $value);
+            }
+
+            if (!empty($field['connectorAnd']) || !empty($field['connectorOr'])) {
+                $cond[] = $this->_connectedLike($value, $field, $fieldName);
+            } else {
+                $cond[$fieldName . " LIKE"] = $field['before'] . $value . $field['after'];
+            }
+        }
+        if (count($cond) > 1) {
+            if (isset($conditions['OR'])) {
+                $conditions[]['OR'] = $cond;
+            } else {
+                $conditions['OR'] = $cond;
+            }
+        } else {
+            $conditions = array_merge($conditions, $cond);
+        }
+        return $conditions;
+    }
 
 /**
  * Form AND/OR query array using String::tokenize to separate
@@ -314,21 +314,21 @@ 
  * @param string $fieldName
  * @return array Conditions
  */
-	protected function _connectedLike($value, $field, $fieldName) {
-		$or = array();
-		$orValues = String::tokenize($value, $field['connectorOr']);
-		foreach ($orValues as $orValue) {
-			$andValues = String::tokenize($orValue, $field['connectorAnd']);
-			$and = array();
-			foreach ($andValues as $andValue) {
-				$and[] = array($fieldName . " LIKE" => $field['before'] . $andValue . $field['after']);
-			}
-
-			$or[] = array('AND' => $and);
-		}
-
-		return array('OR' => $or);
-	}
+    protected function _connectedLike($value, $field, $fieldName) {
+        $or = array();
+        $orValues = String::tokenize($value, $field['connectorOr']);
+        foreach ($orValues as $orValue) {
+            $andValues = String::tokenize($orValue, $field['connectorAnd']);
+            $and = array();
+            foreach ($andValues as $andValue) {
+                $and[] = array($fieldName . " LIKE" => $field['before'] . $andValue . $field['after']);
+            }
+
+            $or[] = array('AND' => $and);
+        }
+
+        return array('OR' => $or);
+    }
 
 /**
  * Add Conditions based on exact comparison
@@ -339,46 +339,46 @@ 
  * @param array $field Field definition information
  * @return array of conditions
  */
-	protected function _addCondValue(Model $Model, &$conditions, $data, $field) {
-		$fieldNames = (array)$field['field'];
-		$fieldValue = isset($data[$field['name']]) ? $data[$field['name']] : null;
-
-		$cond = array();
-		foreach ($fieldNames as $fieldName) {
-			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
-			}
-			if (is_array($fieldValue) && empty($fieldValue)) {
-				continue;
-			}
-			if (!is_array($fieldValue) && ($fieldValue === null || $fieldValue === '' && empty($field['allowEmpty']))) {
-				continue;
-			}
-
-			if (is_array($fieldValue) || !is_array($fieldValue) && (string)$fieldValue !== '') {
-				$cond[$fieldName] = $fieldValue;
-			} elseif (isset($data[$field['name']]) && !empty($field['allowEmpty'])) {
-				$schema = $Model->schema($field['name']);
-				if (isset($schema) && ($schema['default'] !== null || !empty($schema['null']))) {
-					$cond[$fieldName] = $schema['default'];
-				} elseif (!empty($fieldValue)) {
-					$cond[$fieldName] = $fieldValue;
-				} else {
-					$cond[$fieldName] = $fieldValue;
-				}
-			}
-		}
-		if (count($cond) > 1) {
-			if (isset($conditions['OR'])) {
-				$conditions[]['OR'] = $cond;
-			} else {
-				$conditions['OR'] = $cond;
-			}
-		} else {
-			$conditions = array_merge($conditions, $cond);
-		}
-		return $conditions;
-	}
+    protected function _addCondValue(Model $Model, &$conditions, $data, $field) {
+        $fieldNames = (array)$field['field'];
+        $fieldValue = isset($data[$field['name']]) ? $data[$field['name']] : null;
+
+        $cond = array();
+        foreach ($fieldNames as $fieldName) {
+            if (strpos($fieldName, '.') === false) {
+                $fieldName = $Model->alias . '.' . $fieldName;
+            }
+            if (is_array($fieldValue) && empty($fieldValue)) {
+                continue;
+            }
+            if (!is_array($fieldValue) && ($fieldValue === null || $fieldValue === '' && empty($field['allowEmpty']))) {
+                continue;
+            }
+
+            if (is_array($fieldValue) || !is_array($fieldValue) && (string)$fieldValue !== '') {
+                $cond[$fieldName] = $fieldValue;
+            } elseif (isset($data[$field['name']]) && !empty($field['allowEmpty'])) {
+                $schema = $Model->schema($field['name']);
+                if (isset($schema) && ($schema['default'] !== null || !empty($schema['null']))) {
+                    $cond[$fieldName] = $schema['default'];
+                } elseif (!empty($fieldValue)) {
+                    $cond[$fieldName] = $fieldValue;
+                } else {
+                    $cond[$fieldName] = $fieldValue;
+                }
+            }
+        }
+        if (count($cond) > 1) {
+            if (isset($conditions['OR'])) {
+                $conditions[]['OR'] = $cond;
+            } else {
+                $conditions['OR'] = $cond;
+            }
+        } else {
+            $conditions = array_merge($conditions, $cond);
+        }
+        return $conditions;
+    }
 
 /**
  * Add Conditions based expressions to search conditions.
@@ -389,19 +389,19 @@ 
  * @param array $field Info for field.
  * @return array of conditions modified by this method
  */
-	protected function _addCondExpression(Model $Model, &$conditions, $data, $field) {
-		$fieldName = $field['field'];
-
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
-			$fieldValues = $Model->{$field['method']}($data, $field);
-			if (!empty($conditions[$fieldName]) && is_array($conditions[$fieldName])) {
-				$conditions[$fieldName] = array_unique(array_merge(array($conditions[$fieldName]), array($fieldValues)));
-			} else {
-				$conditions[$fieldName] = $fieldValues;
-			}
-		}
-		return $conditions;
-	}
+    protected function _addCondExpression(Model $Model, &$conditions, $data, $field) {
+        $fieldName = $field['field'];
+
+        if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+            $fieldValues = $Model->{$field['method']}($data, $field);
+            if (!empty($conditions[$fieldName]) && is_array($conditions[$fieldName])) {
+                $conditions[$fieldName] = array_unique(array_merge(array($conditions[$fieldName]), array($fieldValues)));
+            } else {
+                $conditions[$fieldName] = $fieldValues;
+            }
+        }
+        return $conditions;
+    }
 
 /**
  * Add Conditions based query to search conditions.
@@ -412,16 +412,16 @@ 
  * @param array $field Info for field.
  * @return array of conditions modified by this method
  */
-	protected function _addCondQuery(Model $Model, &$conditions, $data, $field) {
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
-			$conditionsAdd = $Model->{$field['method']}($data, $field);
-			// if our conditions function returns something empty, nothing to merge in
-			if (!empty($conditionsAdd)) {
-				$conditions = Set::merge($conditions, (array)$conditionsAdd);
-			}
-		}
-		return $conditions;
-	}
+    protected function _addCondQuery(Model $Model, &$conditions, $data, $field) {
+        if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+            $conditionsAdd = $Model->{$field['method']}($data, $field);
+            // if our conditions function returns something empty, nothing to merge in
+            if (!empty($conditionsAdd)) {
+                $conditions = Set::merge($conditions, (array)$conditionsAdd);
+            }
+        }
+        return $conditions;
+    }
 
 /**
  * Add Conditions based subquery to search conditions.
@@ -432,17 +432,17 @@ 
  * @param array $field Info for field.
  * @return array of conditions modified by this method
  */
-	protected function _addCondSubquery(Model $Model, &$conditions, $data, $field) {
-		$fieldName = $field['field'];
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
-			$subquery = $Model->{$field['method']}($data, $field);
-			// if our subquery function returns something empty, nothing to merge in
-			if (!empty($subquery)) {
-				$conditions[] = $Model->getDataSource()->expression("$fieldName in ($subquery)");
-			}
-		}
-		return $conditions;
-	}
+    protected function _addCondSubquery(Model $Model, &$conditions, $data, $field) {
+        $fieldName = $field['field'];
+        if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+            $subquery = $Model->{$field['method']}($data, $field);
+            // if our subquery function returns something empty, nothing to merge in
+            if (!empty($subquery)) {
+                $conditions[] = $Model->getDataSource()->expression("$fieldName in ($subquery)");
+            }
+        }
+        return $conditions;
+    }
 
 /**
  * Helper method for getQuery.
@@ -452,58 +452,58 @@ 
  * @param array $queryData
  * @return string
  */
-	protected function _queryGet(Model $Model, $queryData = array()) {
-		/** @var DboSource $db  */
-		$db = $Model->getDataSource();
-		$queryData = $this->_scrubQueryData($queryData);
-		$recursive = null;
-		$byPass = false;
-		$null = null;
-		$linkedModels = array();
-
-		if (isset($queryData['recursive'])) {
-			$recursive = $queryData['recursive'];
-		}
-
-		if ($recursive !== null) {
-			$_recursive = $Model->recursive;
-			$Model->recursive = $recursive;
-		}
-
-		if (!empty($queryData['fields'])) {
-			$byPass = true;
-			$queryData['fields'] = $db->fields($Model, null, $queryData['fields']);
-		} else {
-			$queryData['fields'] = $db->fields($Model);
-		}
-
-		$_associations = $Model->associations();
-
-		if ($Model->recursive == -1) {
-			$_associations = array();
-		} elseif ($Model->recursive == 0) {
-			unset($_associations[2], $_associations[3]);
-		}
-
-		foreach ($_associations as $type) {
-			foreach ($Model->{$type} as $assoc => $assocData) {
-				$linkModel = $Model->{$assoc};
-				$external = isset($assocData['external']);
-
-				$linkModel->getDataSource();
-				if ($Model->useDbConfig === $linkModel->useDbConfig) {
-					if ($byPass) {
-						$assocData['fields'] = false;
-					}
-					if ($db->generateAssociationQuery($Model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
-						$linkedModels[$type . '/' . $assoc] = true;
-					}
-				}
-			}
-		}
-
-		return trim($db->generateAssociationQuery($Model, null, null, null, null, $queryData, false, $null));
-	}
+    protected function _queryGet(Model $Model, $queryData = array()) {
+        /** @var DboSource $db  */
+        $db = $Model->getDataSource();
+        $queryData = $this->_scrubQueryData($queryData);
+        $recursive = null;
+        $byPass = false;
+        $null = null;
+        $linkedModels = array();
+
+        if (isset($queryData['recursive'])) {
+            $recursive = $queryData['recursive'];
+        }
+
+        if ($recursive !== null) {
+            $_recursive = $Model->recursive;
+            $Model->recursive = $recursive;
+        }
+
+        if (!empty($queryData['fields'])) {
+            $byPass = true;
+            $queryData['fields'] = $db->fields($Model, null, $queryData['fields']);
+        } else {
+            $queryData['fields'] = $db->fields($Model);
+        }
+
+        $_associations = $Model->associations();
+
+        if ($Model->recursive == -1) {
+            $_associations = array();
+        } elseif ($Model->recursive == 0) {
+            unset($_associations[2], $_associations[3]);
+        }
+
+        foreach ($_associations as $type) {
+            foreach ($Model->{$type} as $assoc => $assocData) {
+                $linkModel = $Model->{$assoc};
+                $external = isset($assocData['external']);
+
+                $linkModel->getDataSource();
+                if ($Model->useDbConfig === $linkModel->useDbConfig) {
+                    if ($byPass) {
+                        $assocData['fields'] = false;
+                    }
+                    if ($db->generateAssociationQuery($Model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
+                        $linkedModels[$type . '/' . $assoc] = true;
+                    }
+                }
+            }
+        }
+
+        return trim($db->generateAssociationQuery($Model, null, null, null, null, $queryData, false, $null));
+    }
 
 /**
  * Private helper method to remove query metadata in given data array.
@@ -511,13 +511,13 @@ 
  * @param array $data
  * @return array
  */
-	protected function _scrubQueryData($data) {
-		static $base = null;
-		if ($base === null) {
-			$base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
-		}
-		return (array)$data + $base;
-	}
+    protected function _scrubQueryData($data) {
+        static $base = null;
+        if ($base === null) {
+            $base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
+        }
+        return (array)$data + $base;
+    }
 
 /**
  * Check if model have some method in attached behaviors
@@ -526,20 +526,20 @@ 
  * @param string $method
  * @return boolean, true if method exists in attached and enabled behaviors
  */
-	protected function _checkBehaviorMethods(Model $Model, $method) {
-		$behaviors = $Model->Behaviors->enabled();
-		$count = count($behaviors);
-		$found = false;
-		for ($i = 0; $i < $count; $i++) {
-			$name = $behaviors[$i];
-			$methods = get_class_methods($Model->Behaviors->{$name});
-			$check = array_flip($methods);
-			$found = isset($check[$method]);
-			if ($found) {
-				return true;
-			}
-		}
-		return $found;
-	}
+    protected function _checkBehaviorMethods(Model $Model, $method) {
+        $behaviors = $Model->Behaviors->enabled();
+        $count = count($behaviors);
+        $found = false;
+        for ($i = 0; $i < $count; $i++) {
+            $name = $behaviors[$i];
+            $methods = get_class_methods($Model->Behaviors->{$name});
+            $check = array_flip($methods);
+            $found = isset($check[$method]);
+            if ($found) {
+                return true;
+            }
+        }
+        return $found;
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,7 @@ 
  * @return void
  */
 	public function setup(Model $Model, $config = array()) {
-		$this->_defaults = array_merge($this->_defaults, (array)Configure::read('Search.Searchable'));
+		$this->_defaults = array_merge($this->_defaults, (array) Configure::read('Search.Searchable'));
 		$this->settings[$Model->alias] = array_merge($this->_defaults, $config);
 		if (empty($Model->filterArgs)) {
 			return;
@@ -246,12 +246,12 @@ 
 		if (empty($data[$field['name']])) {
 			return $conditions;
 		}
-		$fieldNames = (array)$field['field'];
+		$fieldNames = (array) $field['field'];
 
 		$cond = array();
 		foreach ($fieldNames as $fieldName) {
 			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
+				$fieldName = $Model->alias.'.'.$fieldName;
 			}
 
 			if ($field['before'] === true) {
@@ -290,7 +290,7 @@ 
 			if (!empty($field['connectorAnd']) || !empty($field['connectorOr'])) {
 				$cond[] = $this->_connectedLike($value, $field, $fieldName);
 			} else {
-				$cond[$fieldName . " LIKE"] = $field['before'] . $value . $field['after'];
+				$cond[$fieldName." LIKE"] = $field['before'].$value.$field['after'];
 			}
 		}
 		if (count($cond) > 1) {
@@ -321,7 +321,7 @@ 
 			$andValues = String::tokenize($orValue, $field['connectorAnd']);
 			$and = array();
 			foreach ($andValues as $andValue) {
-				$and[] = array($fieldName . " LIKE" => $field['before'] . $andValue . $field['after']);
+				$and[] = array($fieldName." LIKE" => $field['before'].$andValue.$field['after']);
 			}
 
 			$or[] = array('AND' => $and);
@@ -340,13 +340,13 @@ 
  * @return array of conditions
  */
 	protected function _addCondValue(Model $Model, &$conditions, $data, $field) {
-		$fieldNames = (array)$field['field'];
+		$fieldNames = (array) $field['field'];
 		$fieldValue = isset($data[$field['name']]) ? $data[$field['name']] : null;
 
 		$cond = array();
 		foreach ($fieldNames as $fieldName) {
 			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
+				$fieldName = $Model->alias.'.'.$fieldName;
 			}
 			if (is_array($fieldValue) && empty($fieldValue)) {
 				continue;
@@ -355,7 +355,7 @@ 
 				continue;
 			}
 
-			if (is_array($fieldValue) || !is_array($fieldValue) && (string)$fieldValue !== '') {
+			if (is_array($fieldValue) || !is_array($fieldValue) && (string) $fieldValue !== '') {
 				$cond[$fieldName] = $fieldValue;
 			} elseif (isset($data[$field['name']]) && !empty($field['allowEmpty'])) {
 				$schema = $Model->schema($field['name']);
@@ -392,7 +392,7 @@ 
 	protected function _addCondExpression(Model $Model, &$conditions, $data, $field) {
 		$fieldName = $field['field'];
 
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$fieldValues = $Model->{$field['method']}($data, $field);
 			if (!empty($conditions[$fieldName]) && is_array($conditions[$fieldName])) {
 				$conditions[$fieldName] = array_unique(array_merge(array($conditions[$fieldName]), array($fieldValues)));
@@ -413,11 +413,11 @@ 
  * @return array of conditions modified by this method
  */
 	protected function _addCondQuery(Model $Model, &$conditions, $data, $field) {
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$conditionsAdd = $Model->{$field['method']}($data, $field);
 			// if our conditions function returns something empty, nothing to merge in
 			if (!empty($conditionsAdd)) {
-				$conditions = Set::merge($conditions, (array)$conditionsAdd);
+				$conditions = Set::merge($conditions, (array) $conditionsAdd);
 			}
 		}
 		return $conditions;
@@ -434,7 +434,7 @@ 
  */
 	protected function _addCondSubquery(Model $Model, &$conditions, $data, $field) {
 		$fieldName = $field['field'];
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$subquery = $Model->{$field['method']}($data, $field);
 			// if our subquery function returns something empty, nothing to merge in
 			if (!empty($subquery)) {
@@ -496,7 +496,7 @@ 
 						$assocData['fields'] = false;
 					}
 					if ($db->generateAssociationQuery($Model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
-						$linkedModels[$type . '/' . $assoc] = true;
+						$linkedModels[$type.'/'.$assoc] = true;
 					}
 				}
 			}
@@ -516,7 +516,7 @@ 
 		if ($base === null) {
 			$base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
 		}
-		return (array)$data + $base;
+		return (array) $data + $base;
 	}
 
 /**

app/Plugin/Search/Test/Case/Controller/Component/PrgComponentTest.php

Doc Comments +1 added lines

@@ -762,6 +762,7 @@
 /**
  * replace the base64encoded values that could harm the url (/ and =) with harmless characters
  *
+ * @param string $str
  * @return string
  */
 	protected function _urlEncode($str) {

Indentation +692 added lines, -692 removed lines

@@ -24,7 +24,7 @@ 
  *
  * @var array
  */
-	public $actsAs = array('Search.Searchable');
+    public $actsAs = array('Search.Searchable');
 
 }
 
@@ -39,27 +39,27 @@ 
  *
  * @var array
  */
-	public $uses = array('Post');
+    public $uses = array('Post');
 
 /**
  * Components
  *
  * @var array
  */
-	public $components = array('Search.Prg', 'Session');
+    public $components = array('Search.Prg', 'Session');
 
 /**
  * beforeFilter
  *
  * @return void
  */
-	public function beforeFilter() {
-		parent::beforeFilter();
-		$this->Prg->actions = array(
-			'search' => array(
-				'controller' => 'Posts',
-				'action' => 'result'));
-	}
+    public function beforeFilter() {
+        parent::beforeFilter();
+        $this->Prg->actions = array(
+            'search' => array(
+                'controller' => 'Posts',
+                'action' => 'result'));
+    }
 
 /**
  * Overwrite redirect
@@ -69,9 +69,9 @@ 
  * @param string $exit
  * @return void
  */
-	public function redirect($url, $status = null, $exit = true) {
-		$this->redirectUrl = $url;
-	}
+    public function redirect($url, $status = null, $exit = true) {
+        $this->redirectUrl = $url;
+    }
 
 }
 
@@ -86,14 +86,14 @@ 
  *
  * @var array
  */
-	public $components = array(
-		'Search.Prg' => array(
-			'commonProcess' => array(
-				'form' => 'Post',
-				'modelMethod' => false,
-				'allowedParams' => array('lang'))),
-		'Session'
-	);
+    public $components = array(
+        'Search.Prg' => array(
+            'commonProcess' => array(
+                'form' => 'Post',
+                'modelMethod' => false,
+                'allowedParams' => array('lang'))),
+        'Session'
+    );
 }
 
 /**
@@ -107,169 +107,169 @@ 
  *
  * @var array
  */
-	public $fixtures = array('plugin.search.post');
+    public $fixtures = array('plugin.search.post');
 
 /**
  * startTest
  *
  * @return void
  */
-	public function setUp() {
-		parent::setUp();
+    public function setUp() {
+        parent::setUp();
 
-		Configure::delete('Search');
+        Configure::delete('Search');
 
-		$this->Controller = new PostsTestController(new CakeRequest(), new CakeResponse());
-		$this->Controller->constructClasses();
-		$this->Controller->startupProcess();
-		$this->Controller->request->params = array(
-			'named' => array(),
-			'pass' => array(),
-			'url' => array());
-		$this->Controller->request->query = array();
-	}
+        $this->Controller = new PostsTestController(new CakeRequest(), new CakeResponse());
+        $this->Controller->constructClasses();
+        $this->Controller->startupProcess();
+        $this->Controller->request->params = array(
+            'named' => array(),
+            'pass' => array(),
+            'url' => array());
+        $this->Controller->request->query = array();
+    }
 
 /**
  * endTest
  *
  * @return void
  */
-	public function tearDown() {
-		unset($this->Controller);
-		ClassRegistry::flush();
+    public function tearDown() {
+        unset($this->Controller);
+        ClassRegistry::flush();
 
-		parent::tearDown();
-	}
+        parent::tearDown();
+    }
 
 /**
  * testOptions
  *
  * @return void
  */
-	public function testOptions() {
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test'));
-
-		$this->Controller->Prg->commonProcess('Post');
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'lang' => 'en',
-			));
-		$this->Controller->Prg->commonProcess('Post', array('allowedParams' => array('lang')));
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$this->Controller->presetVars = array(
-			array('field' => 'title', 'type' => 'value'));
-		$this->Controller->Prg->commonProcess('Post', array('paramType' => 'querystring'));
-		$expected = array('action' => 'search', '?' => array('title' => 'test'));
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testOptions() {
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test'));
+
+        $this->Controller->Prg->commonProcess('Post');
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'lang' => 'en',
+            ));
+        $this->Controller->Prg->commonProcess('Post', array('allowedParams' => array('lang')));
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $this->Controller->presetVars = array(
+            array('field' => 'title', 'type' => 'value'));
+        $this->Controller->Prg->commonProcess('Post', array('paramType' => 'querystring'));
+        $expected = array('action' => 'search', '?' => array('title' => 'test'));
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testPresetForm
  *
  * @return void
  */
-	public function testPresetForm() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'title',
-				'type' => 'value'),
-			array(
-				'field' => 'checkbox',
-				'type' => 'checkbox'),
-			array(
-				'field' => 'lookup',
-				'type' => 'lookup',
-				'formField' => 'lookup_input',
-				'modelField' => 'title',
-				'model' => 'Post'));
-		$this->Controller->passedArgs = array(
-			'title' => 'test',
-			'checkbox' => 'test|test2|test3',
-			'lookup' => '1');
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->presetForm('Post');
-		$expected = array(
-			'Post' => array(
-				'title' => 'test',
-				'checkbox' => array(
-					0 => 'test',
-					1 => 'test2',
-					2 => 'test3'),
-				'lookup' => 1,
-				'lookup_input' => 'First Post'));
-		$this->assertEquals($expected, $this->Controller->request->data);
-
-		$this->Controller->data = array();
-		$this->Controller->passedArgs = array();
-		$this->Controller->request->query = array(
-			'title' => 'test',
-			'checkbox' => 'test|test2|test3',
-			'lookup' => '1');
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->presetForm(array('model' => 'Post', 'paramType' => 'querystring'));
-		$this->assertTrue($this->Controller->Prg->isSearch);
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-
-		// deprecated
-		$this->assertEquals($expected, $this->Controller->data);
-	}
+    public function testPresetForm() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'title',
+                'type' => 'value'),
+            array(
+                'field' => 'checkbox',
+                'type' => 'checkbox'),
+            array(
+                'field' => 'lookup',
+                'type' => 'lookup',
+                'formField' => 'lookup_input',
+                'modelField' => 'title',
+                'model' => 'Post'));
+        $this->Controller->passedArgs = array(
+            'title' => 'test',
+            'checkbox' => 'test|test2|test3',
+            'lookup' => '1');
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->presetForm('Post');
+        $expected = array(
+            'Post' => array(
+                'title' => 'test',
+                'checkbox' => array(
+                    0 => 'test',
+                    1 => 'test2',
+                    2 => 'test3'),
+                'lookup' => 1,
+                'lookup_input' => 'First Post'));
+        $this->assertEquals($expected, $this->Controller->request->data);
+
+        $this->Controller->data = array();
+        $this->Controller->passedArgs = array();
+        $this->Controller->request->query = array(
+            'title' => 'test',
+            'checkbox' => 'test|test2|test3',
+            'lookup' => '1');
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->presetForm(array('model' => 'Post', 'paramType' => 'querystring'));
+        $this->assertTrue($this->Controller->Prg->isSearch);
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+
+        // deprecated
+        $this->assertEquals($expected, $this->Controller->data);
+    }
 
 /**
  * testPresetFormEmpty
  *
  * @return void
  */
-	public function testPresetFormEmpty() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'title',
-				'type' => 'value'),
-			array(
-				'field' => 'checkbox',
-				'type' => 'checkbox'),
-			array(
-				'field' => 'lookup',
-				'type' => 'lookup',
-				'formField' => 'lookup_input',
-				'modelField' => 'title',
-				'model' => 'Post'));
-		$this->Controller->passedArgs = array(
-			'page' => '2');
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->presetForm('Post');
-		$expected = array(
-			'Post' => array());
-		$this->assertEquals($expected, $this->Controller->request->data);
-
-		$this->Controller->data = array();
-		$this->Controller->passedArgs = array();
-		$this->Controller->request->query = array(
-			'page' => '2');
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->presetForm(array('model' => 'Post', 'paramType' => 'querystring'));
-		$this->assertFalse($this->Controller->Prg->isSearch);
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-
-		// deprecated
-		$this->assertEquals($expected, $this->Controller->data);
-	}
+    public function testPresetFormEmpty() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'title',
+                'type' => 'value'),
+            array(
+                'field' => 'checkbox',
+                'type' => 'checkbox'),
+            array(
+                'field' => 'lookup',
+                'type' => 'lookup',
+                'formField' => 'lookup_input',
+                'modelField' => 'title',
+                'model' => 'Post'));
+        $this->Controller->passedArgs = array(
+            'page' => '2');
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->presetForm('Post');
+        $expected = array(
+            'Post' => array());
+        $this->assertEquals($expected, $this->Controller->request->data);
+
+        $this->Controller->data = array();
+        $this->Controller->passedArgs = array();
+        $this->Controller->request->query = array(
+            'page' => '2');
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->presetForm(array('model' => 'Post', 'paramType' => 'querystring'));
+        $this->assertFalse($this->Controller->Prg->isSearch);
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+
+        // deprecated
+        $this->assertEquals($expected, $this->Controller->data);
+    }
 
 /**
  * This test checks that the search on an integer type field in the database
@@ -278,118 +278,118 @@ 
  * @return void
  * @link http://github.com/CakeDC/Search/issues#issue/3
  */
-	public function testPresetFormWithIntegerField() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'views',
-				'type' => 'value'));
-		$this->Controller->passedArgs = array(
-			'views' => '0');
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->presetForm('Post');
-		$expected = array(
-			'Post' => array(
-				'views' => '0'));
-		$this->assertEquals($expected, $this->Controller->request->data);
-		$this->assertTrue($this->Controller->Prg->isSearch);
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-	}
+    public function testPresetFormWithIntegerField() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'views',
+                'type' => 'value'));
+        $this->Controller->passedArgs = array(
+            'views' => '0');
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->presetForm('Post');
+        $expected = array(
+            'Post' => array(
+                'views' => '0'));
+        $this->assertEquals($expected, $this->Controller->request->data);
+        $this->assertTrue($this->Controller->Prg->isSearch);
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+    }
 
 /**
  * testFixFormValues
  *
  * @return void
  */
-	public function testSerializeParams() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'options',
-				'type' => 'checkbox'));
+    public function testSerializeParams() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'options',
+                'type' => 'checkbox'));
 
-		$testData = array(
-			'options' => array(
-				0 => 'test1', 1 => 'test2', 2 => 'test3'));
+        $testData = array(
+            'options' => array(
+                0 => 'test1', 1 => 'test2', 2 => 'test3'));
 
-		$result = $this->Controller->Prg->serializeParams($testData);
-		$this->assertEquals(array('options' => 'test1|test2|test3'), $result);
+        $result = $this->Controller->Prg->serializeParams($testData);
+        $this->assertEquals(array('options' => 'test1|test2|test3'), $result);
 
-		$testData = array('options' => '');
+        $testData = array('options' => '');
 
-		$result = $this->Controller->Prg->serializeParams($testData);
-		$this->assertEquals(array('options' => ''), $result);
+        $result = $this->Controller->Prg->serializeParams($testData);
+        $this->assertEquals(array('options' => ''), $result);
 
-		$testData = array();
-		$result = $this->Controller->Prg->serializeParams($testData);
-		$this->assertEquals(array('options' => ''), $result);
-	}
+        $testData = array();
+        $result = $this->Controller->Prg->serializeParams($testData);
+        $this->assertEquals(array('options' => ''), $result);
+    }
 
 /**
  * testConnectNamed
  *
  * @return void
  */
-	public function testConnectNamed() {
-		$this->Controller->passedArgs = array(
-			'title' => 'test');
-		$this->assertNull($this->Controller->Prg->connectNamed());
-		$this->assertNull($this->Controller->Prg->connectNamed(1));
-	}
+    public function testConnectNamed() {
+        $this->Controller->passedArgs = array(
+            'title' => 'test');
+        $this->assertNull($this->Controller->Prg->connectNamed());
+        $this->assertNull($this->Controller->Prg->connectNamed(1));
+    }
 
 /**
  * testExclude
  *
  * @return void
  */
-	public function testExclude() {
-		$this->Controller->request->params['named'] = array();
+    public function testExclude() {
+        $this->Controller->request->params['named'] = array();
 
-		$array = array('foo' => 'test', 'bar' => 'test', 'test' => 'test');
-		$exclude = array('bar', 'test');
-		$result = $this->Controller->Prg->exclude($array, $exclude);
-		$this->assertEquals(array('foo' => 'test'), $result);
+        $array = array('foo' => 'test', 'bar' => 'test', 'test' => 'test');
+        $exclude = array('bar', 'test');
+        $result = $this->Controller->Prg->exclude($array, $exclude);
+        $this->assertEquals(array('foo' => 'test'), $result);
 
-		$array = array('foo' => 'test', 'bar' => 'test', 'test' => 'test', 0 => 'passed', 1 => 'passed_again');
-		$exclude = array('bar', 'test');
-		$result = $this->Controller->Prg->exclude($array, $exclude);
-		$this->assertEquals(array('foo' => 'test', 0 => 'passed', 1 => 'passed_again'), $result);
-	}
+        $array = array('foo' => 'test', 'bar' => 'test', 'test' => 'test', 0 => 'passed', 1 => 'passed_again');
+        $exclude = array('bar', 'test');
+        $result = $this->Controller->Prg->exclude($array, $exclude);
+        $this->assertEquals(array('foo' => 'test', 0 => 'passed', 1 => 'passed_again'), $result);
+    }
 
 /**
  * testCommonProcess
  *
  * @return void
  */
-	public function testCommonProcess() {
-		$this->Controller->request->params['named'] = array();
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test'));
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false));
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$this->Controller->Prg->commonProcess(null, array(
-			'modelMethod' => false));
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$this->Controller->Post->filterArgs = array(
-			array('name' => 'title', 'type' => 'value'));
-		$this->Controller->Prg->commonProcess('Post');
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcess() {
+        $this->Controller->request->params['named'] = array();
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test'));
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false));
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $this->Controller->Prg->commonProcess(null, array(
+            'modelMethod' => false));
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $this->Controller->Post->filterArgs = array(
+            array('name' => 'title', 'type' => 'value'));
+        $this->Controller->Prg->commonProcess('Post');
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessWithPresetVarsNotEmpty
@@ -397,567 +397,567 @@ 
  *
  * @return void
  */
-	public function testCommonProcessWithPresetVarsNotEmpty() {
-		$this->Controller->request->params['named'] = array();
-		$this->Controller->presetVars = array('title' => array('type' => 'value'));
+    public function testCommonProcessWithPresetVarsNotEmpty() {
+        $this->Controller->request->params['named'] = array();
+        $this->Controller->presetVars = array('title' => array('type' => 'value'));
 
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test'));
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test'));
 
-		$this->Controller->Prg->commonProcess('Post');
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+        $this->Controller->Prg->commonProcess('Post');
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessExtraParams
  *
  * @return void
  */
-	public function testCommonProcessAllowedParams() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test'));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessAllowedParams() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test'));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'allowedParams' => array('lang')));
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessFilterEmpty
  *
  * @return void
  */
-	public function testCommonProcessResetNamed() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array('page' => 2, 'sort' => 'name', 'direction' => 'asc'),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'sort' => 'name',
-			'direction' => 'asc',
-			'title' => 'test',
-			'foo' => '',
-			'bar' => '',
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessResetNamed() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array('page' => 2, 'sort' => 'name', 'direction' => 'asc'),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'allowedParams' => array('lang')));
+        $expected = array(
+            'sort' => 'name',
+            'direction' => 'asc',
+            'title' => 'test',
+            'foo' => '',
+            'bar' => '',
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessFilterEmpty
  *
  * @return void
  */
-	public function testCommonProcessFilterEmpty() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'filterEmpty' => true,
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'title' => 'test',
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessFilterEmpty() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'filterEmpty' => true,
+            'allowedParams' => array('lang')));
+        $expected = array(
+            'title' => 'test',
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessSpecialChars
  *
  * @return void
  */
-	public function testCommonProcessSpecialChars() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test/slashes?!',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'filterEmpty' => true,
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'title' => 'test/slashes?!',
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$url = Router::url($this->Controller->redirectUrl);
-		$expected = '/search/title:test%2Fslashes%3F%21/lang:en';
-		$this->assertEquals($expected, $url);
-	}
+    public function testCommonProcessSpecialChars() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test/slashes?!',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'filterEmpty' => true,
+            'allowedParams' => array('lang')));
+        $expected = array(
+            'title' => 'test/slashes?!',
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $url = Router::url($this->Controller->redirectUrl);
+        $expected = '/search/title:test%2Fslashes%3F%21/lang:en';
+        $this->assertEquals($expected, $url);
+    }
 
 /**
  * testCommonProcessQuerystring
  *
  * @return void
  */
-	public function testCommonProcessQuerystring() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'paramType' => 'querystring',
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'?' => array('title' => 'test', 'foo' => '', 'bar' => ''),
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessQuerystring() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'paramType' => 'querystring',
+            'allowedParams' => array('lang')));
+        $expected = array(
+            '?' => array('title' => 'test', 'foo' => '', 'bar' => ''),
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessQuerystringSpecialChars
  *
  * @return void
  */
-	public function testCommonProcessQuerystringSpecialChars() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test/slashes?!',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'filterEmpty' => true,
-			'paramType' => 'querystring',
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'?' => array('title' => 'test/slashes?!'),
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-
-		$url = Router::url($this->Controller->redirectUrl);
-		$expected = '/search/lang:en?title=test%2Fslashes%3F%21';
-		$this->assertEquals($expected, $url);
-	}
+    public function testCommonProcessQuerystringSpecialChars() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test/slashes?!',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'filterEmpty' => true,
+            'paramType' => 'querystring',
+            'allowedParams' => array('lang')));
+        $expected = array(
+            '?' => array('title' => 'test/slashes?!'),
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+
+        $url = Router::url($this->Controller->redirectUrl);
+        $expected = '/search/lang:en?title=test%2Fslashes%3F%21';
+        $this->assertEquals($expected, $url);
+    }
 
 /**
  * testCommonProcessQuerystringPagination
  *
  * @return void
  */
-	public function testCommonProcessQuerystringPagination() {
-		$this->Controller->request->query = array(
-			'sort' => 'created',
-			'direction' => 'asc',
-			'page' => 3,
-		);
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'paramType' => 'querystring',
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'?' => array('title' => 'test', 'foo' => '', 'bar' => '', 'sort' => 'created', 'direction' => 'asc'),
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessQuerystringPagination() {
+        $this->Controller->request->query = array(
+            'sort' => 'created',
+            'direction' => 'asc',
+            'page' => 3,
+        );
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'paramType' => 'querystring',
+            'allowedParams' => array('lang')));
+        $expected = array(
+            '?' => array('title' => 'test', 'foo' => '', 'bar' => '', 'sort' => 'created', 'direction' => 'asc'),
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessQuerystringFilterEmpty
  *
  * @return void
  */
-	public function testCommonProcessQuerystringFilterEmpty() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'lang' => 'en',
-			));
-
-		$this->Controller->presetVars = array();
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'title' => 'test',
-				'foo' => '',
-				'bar' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'filterEmpty' => true,
-			'paramType' => 'querystring',
-			'allowedParams' => array('lang')));
-		$expected = array(
-			'?' => array('title' => 'test'),
-			'action' => 'search',
-			'lang' => 'en');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessQuerystringFilterEmpty() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'lang' => 'en',
+            ));
+
+        $this->Controller->presetVars = array();
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'title' => 'test',
+                'foo' => '',
+                'bar' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'filterEmpty' => true,
+            'paramType' => 'querystring',
+            'allowedParams' => array('lang')));
+        $expected = array(
+            '?' => array('title' => 'test'),
+            'action' => 'search',
+            'lang' => 'en');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testCommonProcessGet
  *
  * @return void
  */
-	public function testCommonProcessGet() {
-		$this->Controller->action = 'search';
-		$this->Controller->presetVars = array(
-			array('field' => 'title', 'type' => 'value'));
-		$this->Controller->request->data = array();
-		$this->Controller->Post->filterArgs = array(
-			array('name' => 'title', 'type' => 'value'));
-		$this->Controller->request->params['named'] = array('title' => 'test');
-		$this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
-		$this->Controller->Prg->commonProcess('Post');
-
-		$this->assertTrue($this->Controller->Prg->isSearch);
-		$expected = array('Post' => array('title' => 'test'));
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-		$this->assertEquals($expected, $this->Controller->request->data);
-	}
-
-	public function testCommonProcessGetWithStringKeys() {
-		$this->Controller->action = 'search';
-		$this->Controller->presetVars = array(
-			'title' => array('type' => 'value'));
-		$this->Controller->Post->filterArgs = array(
-			'title' => array('type' => 'value'));
-
-		$this->Controller->Prg->__construct($this->Controller->Components, array());
-		$this->Controller->Prg->initialize($this->Controller);
-		$this->Controller->request->data = array();
-
-		$this->Controller->request->params['named'] = array('title' => 'test');
-		$this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
-		$this->Controller->Prg->commonProcess('Post');
-		$expected = array('Post' => array('title' => 'test'));
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-		$this->assertEquals($expected, $this->Controller->request->data);
-	}
-
-	public function testCommonProcessGetWithStringKeysShort() {
-		$this->Controller->action = 'search';
-		$this->Controller->presetVars = array(
-			'title' => true);
-		$this->Controller->Post->filterArgs = array(
-			'title' => array('type' => 'value'));
-
-		$this->Controller->Prg->__construct($this->Controller->Components, array());
-		$this->Controller->Prg->initialize($this->Controller);
-		$this->Controller->request->data = array();
-
-		$this->Controller->request->params['named'] = array('title' => 'test');
-		$this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
-		$this->Controller->Prg->commonProcess('Post');
-		$expected = array('Post' => array('title' => 'test'));
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-		$this->assertEquals($expected, $this->Controller->request->data);
-	}
+    public function testCommonProcessGet() {
+        $this->Controller->action = 'search';
+        $this->Controller->presetVars = array(
+            array('field' => 'title', 'type' => 'value'));
+        $this->Controller->request->data = array();
+        $this->Controller->Post->filterArgs = array(
+            array('name' => 'title', 'type' => 'value'));
+        $this->Controller->request->params['named'] = array('title' => 'test');
+        $this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
+        $this->Controller->Prg->commonProcess('Post');
+
+        $this->assertTrue($this->Controller->Prg->isSearch);
+        $expected = array('Post' => array('title' => 'test'));
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+        $this->assertEquals($expected, $this->Controller->request->data);
+    }
+
+    public function testCommonProcessGetWithStringKeys() {
+        $this->Controller->action = 'search';
+        $this->Controller->presetVars = array(
+            'title' => array('type' => 'value'));
+        $this->Controller->Post->filterArgs = array(
+            'title' => array('type' => 'value'));
+
+        $this->Controller->Prg->__construct($this->Controller->Components, array());
+        $this->Controller->Prg->initialize($this->Controller);
+        $this->Controller->request->data = array();
+
+        $this->Controller->request->params['named'] = array('title' => 'test');
+        $this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
+        $this->Controller->Prg->commonProcess('Post');
+        $expected = array('Post' => array('title' => 'test'));
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+        $this->assertEquals($expected, $this->Controller->request->data);
+    }
+
+    public function testCommonProcessGetWithStringKeysShort() {
+        $this->Controller->action = 'search';
+        $this->Controller->presetVars = array(
+            'title' => true);
+        $this->Controller->Post->filterArgs = array(
+            'title' => array('type' => 'value'));
+
+        $this->Controller->Prg->__construct($this->Controller->Components, array());
+        $this->Controller->Prg->initialize($this->Controller);
+        $this->Controller->request->data = array();
+
+        $this->Controller->request->params['named'] = array('title' => 'test');
+        $this->Controller->passedArgs = array_merge($this->Controller->request->params['named'], $this->Controller->request->params['pass']);
+        $this->Controller->Prg->commonProcess('Post');
+        $expected = array('Post' => array('title' => 'test'));
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+        $this->assertEquals($expected, $this->Controller->request->data);
+    }
 
 /**
  * testSerializeParamsWithEncoding
  *
  * @return void
  */
-	public function testSerializeParamsWithEncoding() {
-		$this->Controller->action = 'search';
-		$this->Controller->presetVars = array(
-			array('field' => 'title', 'type' => 'value', 'encode' => true));
-		$this->Controller->request->data = array();
-		$this->Controller->Post->filterArgs = array(
-			array('name' => 'title', 'type' => 'value'));
+    public function testSerializeParamsWithEncoding() {
+        $this->Controller->action = 'search';
+        $this->Controller->presetVars = array(
+            array('field' => 'title', 'type' => 'value', 'encode' => true));
+        $this->Controller->request->data = array();
+        $this->Controller->Post->filterArgs = array(
+            array('name' => 'title', 'type' => 'value'));
 
-		$this->Controller->Prg->encode = true;
-		$test = array('title' => 'Something new');
-		$result = $this->Controller->Prg->serializeParams($test);
-		$this->assertEquals($this->_urlEncode('Something new'), $result['title']);
+        $this->Controller->Prg->encode = true;
+        $test = array('title' => 'Something new');
+        $result = $this->Controller->Prg->serializeParams($test);
+        $this->assertEquals($this->_urlEncode('Something new'), $result['title']);
 
-		$test = array('title' => 'ef?');
-		$result = $this->Controller->Prg->serializeParams($test);
-		$this->assertEquals($this->_urlEncode('ef?'), $result['title']);
-	}
+        $test = array('title' => 'ef?');
+        $result = $this->Controller->Prg->serializeParams($test);
+        $this->assertEquals($this->_urlEncode('ef?'), $result['title']);
+    }
 
 /**
  * replace the base64encoded values that could harm the url (/ and =) with harmless characters
  *
  * @return string
  */
-	protected function _urlEncode($str) {
-		return str_replace(array('/', '='), array('-', '_'), base64_encode($str));
-	}
+    protected function _urlEncode($str) {
+        return str_replace(array('/', '='), array('-', '_'), base64_encode($str));
+    }
 
 /**
  * testSerializeParamsWithEncoding
  *
  * @return void
  */
-	public function testSerializeParamsWithEncodingAndSpace() {
-		$this->Controller->action = 'search';
-		$this->Controller->presetVars = array(
-			array('field' => 'title', 'type' => 'value', 'encode' => true));
-		$this->Controller->request->data = array();
-		$this->Controller->Post->filterArgs = array(
-			array('name' => 'title', 'type' => 'value'));
+    public function testSerializeParamsWithEncodingAndSpace() {
+        $this->Controller->action = 'search';
+        $this->Controller->presetVars = array(
+            array('field' => 'title', 'type' => 'value', 'encode' => true));
+        $this->Controller->request->data = array();
+        $this->Controller->Post->filterArgs = array(
+            array('name' => 'title', 'type' => 'value'));
 
-		$this->Controller->Prg->encode = true;
-		$testData = $test = array('title' => 'Something new');
-		$result = $this->Controller->Prg->serializeParams($test);
-		$this->assertEquals($this->_urlEncode('Something new'), $result['title']);
+        $this->Controller->Prg->encode = true;
+        $testData = $test = array('title' => 'Something new');
+        $result = $this->Controller->Prg->serializeParams($test);
+        $this->assertEquals($this->_urlEncode('Something new'), $result['title']);
 
-		$this->Controller->passedArgs = $result;
-		$this->Controller->Prg->presetForm('Post');
-		$expected = array('Post' => $testData);
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-		$this->assertEquals($expected, $this->Controller->request->data);
-	}
+        $this->Controller->passedArgs = $result;
+        $this->Controller->Prg->presetForm('Post');
+        $expected = array('Post' => $testData);
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+        $this->assertEquals($expected, $this->Controller->request->data);
+    }
 
 /**
  * testPresetFormWithEncodedParams
  *
  * @return void
  */
-	public function testPresetFormWithEncodedParams() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'title',
-				'type' => 'value'),
-			array(
-				'field' => 'checkbox',
-				'type' => 'checkbox'),
-			array(
-				'field' => 'lookup',
-				'type' => 'lookup',
-				'formField' => 'lookup_input',
-				'modelField' => 'title',
-				'model' => 'Post'));
-		$this->Controller->passedArgs = array(
-			'title' => $this->_urlEncode('test'),
-			'checkbox' => $this->_urlEncode('test|test2|test3'),
-			'lookup' => $this->_urlEncode('1'));
-
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->encode = true;
-		$this->Controller->Prg->presetForm('Post');
-		$expected = array(
-			'Post' => array(
-				'title' => 'test',
-				'checkbox' => array(
-					0 => 'test',
-					1 => 'test2',
-					2 => 'test3'),
-				'lookup' => 1,
-				'lookup_input' => 'First Post'));
-		$this->assertEquals($expected, $this->Controller->request->data);
-		$this->assertTrue($this->Controller->Prg->isSearch);
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-	}
+    public function testPresetFormWithEncodedParams() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'title',
+                'type' => 'value'),
+            array(
+                'field' => 'checkbox',
+                'type' => 'checkbox'),
+            array(
+                'field' => 'lookup',
+                'type' => 'lookup',
+                'formField' => 'lookup_input',
+                'modelField' => 'title',
+                'model' => 'Post'));
+        $this->Controller->passedArgs = array(
+            'title' => $this->_urlEncode('test'),
+            'checkbox' => $this->_urlEncode('test|test2|test3'),
+            'lookup' => $this->_urlEncode('1'));
+
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->encode = true;
+        $this->Controller->Prg->presetForm('Post');
+        $expected = array(
+            'Post' => array(
+                'title' => 'test',
+                'checkbox' => array(
+                    0 => 'test',
+                    1 => 'test2',
+                    2 => 'test3'),
+                'lookup' => 1,
+                'lookup_input' => 'First Post'));
+        $this->assertEquals($expected, $this->Controller->request->data);
+        $this->assertTrue($this->Controller->Prg->isSearch);
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+    }
 
 /**
  * testCommonProcessGetWithEmptyValue
  *
  * @return void
  */
-	public function testCommonProcessGetWithEmptyValue() {
-		$this->Controller->request->params = array_merge($this->Controller->request->params, array(
-			'named' => array(),
-			'category_id' => '0',
-			));
-
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'category_id',
-				'name' => 'category_id',
-				'type' => 'value',
-				'allowEmpty' => true,
-				'emptyValue' => '0',
-			),
-			array(
-				'field' => 'checkbox',
-				'name' => 'checkbox',
-				'type' => 'checkbox'
-			),
-		);
-		$this->Controller->action = 'search';
-		$this->Controller->request->data = array(
-			'Post' => array(
-				'category_id' => '0',
-				'foo' => ''));
-
-		$this->Controller->Prg->commonProcess('Post', array(
-			'form' => 'Post',
-			'modelMethod' => false,
-			'filterEmpty' => true));
-		$expected = array(
-			'action' => 'search',
-			'category_id' => '');
-		$this->assertEquals($expected, $this->Controller->redirectUrl);
-	}
+    public function testCommonProcessGetWithEmptyValue() {
+        $this->Controller->request->params = array_merge($this->Controller->request->params, array(
+            'named' => array(),
+            'category_id' => '0',
+            ));
+
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'category_id',
+                'name' => 'category_id',
+                'type' => 'value',
+                'allowEmpty' => true,
+                'emptyValue' => '0',
+            ),
+            array(
+                'field' => 'checkbox',
+                'name' => 'checkbox',
+                'type' => 'checkbox'
+            ),
+        );
+        $this->Controller->action = 'search';
+        $this->Controller->request->data = array(
+            'Post' => array(
+                'category_id' => '0',
+                'foo' => ''));
+
+        $this->Controller->Prg->commonProcess('Post', array(
+            'form' => 'Post',
+            'modelMethod' => false,
+            'filterEmpty' => true));
+        $expected = array(
+            'action' => 'search',
+            'category_id' => '');
+        $this->assertEquals($expected, $this->Controller->redirectUrl);
+    }
 
 /**
  * testPresetFormWithEmptyValue
  *
  * @return void
  */
-	public function testPresetFormWithEmptyValue() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'category_id',
-				'type' => 'value',
-				'allowEmpty' => true,
-				'emptyValue' => '0',
-			),
-			array(
-				'field' => 'checkbox',
-				'type' => 'checkbox',
-				'allowEmpty' => true,
-			),
-		);
-		$this->Controller->passedArgs = array(
-			'category_id' => '',
-		);
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->encode = true;
-		$this->Controller->Prg->presetForm(array('model' => 'Post'));
-		$expected = array(
-			'Post' => array(
-				'category_id' => '0'));
-		$this->assertEquals($expected, $this->Controller->request->data);
-		$this->assertFalse($this->Controller->Prg->isSearch);
-
-		$expected = array(
-			'Post' => array(
-				'category_id' => ''));
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-	}
+    public function testPresetFormWithEmptyValue() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'category_id',
+                'type' => 'value',
+                'allowEmpty' => true,
+                'emptyValue' => '0',
+            ),
+            array(
+                'field' => 'checkbox',
+                'type' => 'checkbox',
+                'allowEmpty' => true,
+            ),
+        );
+        $this->Controller->passedArgs = array(
+            'category_id' => '',
+        );
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->encode = true;
+        $this->Controller->Prg->presetForm(array('model' => 'Post'));
+        $expected = array(
+            'Post' => array(
+                'category_id' => '0'));
+        $this->assertEquals($expected, $this->Controller->request->data);
+        $this->assertFalse($this->Controller->Prg->isSearch);
+
+        $expected = array(
+            'Post' => array(
+                'category_id' => ''));
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+    }
 
 /**
  * testPresetFormWithEmptyValueAndIsSearch
  *
  * @return void
  */
-	public function testPresetFormWithEmptyValueAndIsSearch() {
-		$this->Controller->presetVars = array(
-			array(
-				'field' => 'category_id',
-				'type' => 'value',
-				'allowEmpty' => true,
-				'emptyValue' => '0',
-			),
-			array(
-				'field' => 'checkbox',
-				'type' => 'checkbox'
-			),
-		);
-		$this->Controller->passedArgs = array(
-			'category_id' => '',
-			'checkbox' => $this->_urlEncode('test|test2|test3'),
-		);
-		$this->Controller->beforeFilter();
-
-		$this->Controller->Prg->encode = true;
-		$this->Controller->Prg->presetForm(array('model' => 'Post'));
-		$expected = array(
-			'Post' => array(
-				'category_id' => '0',
-				'checkbox' => array(
-					0 => 'test',
-					1 => 'test2',
-					2 => 'test3')));
-		$this->assertEquals($expected, $this->Controller->request->data);
-		$this->assertTrue($this->Controller->Prg->isSearch);
-
-		$expected = array(
-			'Post' => array(
-				'category_id' => '',
-				'checkbox' => array(
-					0 => 'test',
-					1 => 'test2',
-					2 => 'test3')));
-		$this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
-	}
+    public function testPresetFormWithEmptyValueAndIsSearch() {
+        $this->Controller->presetVars = array(
+            array(
+                'field' => 'category_id',
+                'type' => 'value',
+                'allowEmpty' => true,
+                'emptyValue' => '0',
+            ),
+            array(
+                'field' => 'checkbox',
+                'type' => 'checkbox'
+            ),
+        );
+        $this->Controller->passedArgs = array(
+            'category_id' => '',
+            'checkbox' => $this->_urlEncode('test|test2|test3'),
+        );
+        $this->Controller->beforeFilter();
+
+        $this->Controller->Prg->encode = true;
+        $this->Controller->Prg->presetForm(array('model' => 'Post'));
+        $expected = array(
+            'Post' => array(
+                'category_id' => '0',
+                'checkbox' => array(
+                    0 => 'test',
+                    1 => 'test2',
+                    2 => 'test3')));
+        $this->assertEquals($expected, $this->Controller->request->data);
+        $this->assertTrue($this->Controller->Prg->isSearch);
+
+        $expected = array(
+            'Post' => array(
+                'category_id' => '',
+                'checkbox' => array(
+                    0 => 'test',
+                    1 => 'test2',
+                    2 => 'test3')));
+        $this->assertEquals($expected['Post'], $this->Controller->Prg->parsedParams());
+    }
 
 }