xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache.php

Indentation +80 added lines, -80 removed lines

@@ -11,97 +11,97 @@
 abstract class HTMLPurifier_DefinitionCache
 {
 
-    public $type;
+	public $type;
 
-    /**
-     * @param $name Type of definition objects this instance of the
-     *      cache will handle.
-     */
-    public function __construct($type) {
-        $this->type = $type;
-    }
+	/**
+	 * @param $name Type of definition objects this instance of the
+	 *      cache will handle.
+	 */
+	public function __construct($type) {
+		$this->type = $type;
+	}
 
-    /**
-     * Generates a unique identifier for a particular configuration
-     * @param Instance of HTMLPurifier_Config
-     */
-    public function generateKey($config) {
-        return $config->version . ',' . // possibly replace with function calls
-               $config->getBatchSerial($this->type) . ',' .
-               $config->get($this->type . '.DefinitionRev');
-    }
+	/**
+	 * Generates a unique identifier for a particular configuration
+	 * @param Instance of HTMLPurifier_Config
+	 */
+	public function generateKey($config) {
+		return $config->version . ',' . // possibly replace with function calls
+			   $config->getBatchSerial($this->type) . ',' .
+			   $config->get($this->type . '.DefinitionRev');
+	}
 
-    /**
-     * Tests whether or not a key is old with respect to the configuration's
-     * version and revision number.
-     * @param $key Key to test
-     * @param $config Instance of HTMLPurifier_Config to test against
-     */
-    public function isOld($key, $config) {
-        if (substr_count($key, ',') < 2) return true;
-        list($version, $hash, $revision) = explode(',', $key, 3);
-        $compare = version_compare($version, $config->version);
-        // version mismatch, is always old
-        if ($compare != 0) return true;
-        // versions match, ids match, check revision number
-        if (
-            $hash == $config->getBatchSerial($this->type) &&
-            $revision < $config->get($this->type . '.DefinitionRev')
-        ) return true;
-        return false;
-    }
+	/**
+	 * Tests whether or not a key is old with respect to the configuration's
+	 * version and revision number.
+	 * @param $key Key to test
+	 * @param $config Instance of HTMLPurifier_Config to test against
+	 */
+	public function isOld($key, $config) {
+		if (substr_count($key, ',') < 2) return true;
+		list($version, $hash, $revision) = explode(',', $key, 3);
+		$compare = version_compare($version, $config->version);
+		// version mismatch, is always old
+		if ($compare != 0) return true;
+		// versions match, ids match, check revision number
+		if (
+			$hash == $config->getBatchSerial($this->type) &&
+			$revision < $config->get($this->type . '.DefinitionRev')
+		) return true;
+		return false;
+	}
 
-    /**
-     * Checks if a definition's type jives with the cache's type
-     * @note Throws an error on failure
-     * @param $def Definition object to check
-     * @return Boolean true if good, false if not
-     */
-    public function checkDefType($def) {
-        if ($def->type !== $this->type) {
-            trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Checks if a definition's type jives with the cache's type
+	 * @note Throws an error on failure
+	 * @param $def Definition object to check
+	 * @return Boolean true if good, false if not
+	 */
+	public function checkDefType($def) {
+		if ($def->type !== $this->type) {
+			trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Adds a definition object to the cache
-     */
-    abstract public function add($def, $config);
+	/**
+	 * Adds a definition object to the cache
+	 */
+	abstract public function add($def, $config);
 
-    /**
-     * Unconditionally saves a definition object to the cache
-     */
-    abstract public function set($def, $config);
+	/**
+	 * Unconditionally saves a definition object to the cache
+	 */
+	abstract public function set($def, $config);
 
-    /**
-     * Replace an object in the cache
-     */
-    abstract public function replace($def, $config);
+	/**
+	 * Replace an object in the cache
+	 */
+	abstract public function replace($def, $config);
 
-    /**
-     * Retrieves a definition object from the cache
-     */
-    abstract public function get($config);
+	/**
+	 * Retrieves a definition object from the cache
+	 */
+	abstract public function get($config);
 
-    /**
-     * Removes a definition object to the cache
-     */
-    abstract public function remove($config);
+	/**
+	 * Removes a definition object to the cache
+	 */
+	abstract public function remove($config);
 
-    /**
-     * Clears all objects from cache
-     */
-    abstract public function flush($config);
+	/**
+	 * Clears all objects from cache
+	 */
+	abstract public function flush($config);
 
-    /**
-     * Clears all expired (older version or revision) objects from cache
-     * @note Be carefuly implementing this method as flush. Flush must
-     *       not interfere with other Definition types, and cleanup()
-     *       should not be repeatedly called by userland code.
-     */
-    abstract public function cleanup($config);
+	/**
+	 * Clears all expired (older version or revision) objects from cache
+	 * @note Be carefuly implementing this method as flush. Flush must
+	 *       not interfere with other Definition types, and cleanup()
+	 *       should not be repeatedly called by userland code.
+	 */
+	abstract public function cleanup($config);
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -38,16 +38,22 @@
      * @param $config Instance of HTMLPurifier_Config to test against
      */
     public function isOld($key, $config) {
-        if (substr_count($key, ',') < 2) return true;
+        if (substr_count($key, ',') < 2) {
+        	return true;
+        }
         list($version, $hash, $revision) = explode(',', $key, 3);
         $compare = version_compare($version, $config->version);
         // version mismatch, is always old
-        if ($compare != 0) return true;
+        if ($compare != 0) {
+        	return true;
+        }
         // versions match, ids match, check revision number
         if (
             $hash == $config->getBatchSerial($this->type) &&
             $revision < $config->get($this->type . '.DefinitionRev')
-        ) return true;
+        ) {
+        	return true;
+        }
         return false;
     }
 

Spacing +4 added lines, -4 removed lines

@@ -26,9 +26,9 @@ 
      * @param Instance of HTMLPurifier_Config
      */
     public function generateKey($config) {
-        return $config->version . ',' . // possibly replace with function calls
-               $config->getBatchSerial($this->type) . ',' .
-               $config->get($this->type . '.DefinitionRev');
+        return $config->version.','.// possibly replace with function calls
+               $config->getBatchSerial($this->type).','.
+               $config->get($this->type.'.DefinitionRev');
     }
 
     /**
@@ -46,7 +46,7 @@ 
         // versions match, ids match, check revision number
         if (
             $hash == $config->getBatchSerial($this->type) &&
-            $revision < $config->get($this->type . '.DefinitionRev')
+            $revision < $config->get($this->type.'.DefinitionRev')
         ) return true;
         return false;
     }

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php

Indentation +53 added lines, -53 removed lines

@@ -3,59 +3,59 @@
 class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
 {
 
-    /**
-     * Cache object we are decorating
-     */
-    public $cache;
-
-    public function __construct() {}
-
-    /**
-     * Lazy decorator function
-     * @param $cache Reference to cache object to decorate
-     */
-    public function decorate(&$cache) {
-        $decorator = $this->copy();
-        // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
-        $decorator->type  = $cache->type;
-        return $decorator;
-    }
-
-    /**
-     * Cross-compatible clone substitute
-     */
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator();
-    }
-
-    public function add($def, $config) {
-        return $this->cache->add($def, $config);
-    }
-
-    public function set($def, $config) {
-        return $this->cache->set($def, $config);
-    }
-
-    public function replace($def, $config) {
-        return $this->cache->replace($def, $config);
-    }
-
-    public function get($config) {
-        return $this->cache->get($config);
-    }
-
-    public function remove($config) {
-        return $this->cache->remove($config);
-    }
-
-    public function flush($config) {
-        return $this->cache->flush($config);
-    }
-
-    public function cleanup($config) {
-        return $this->cache->cleanup($config);
-    }
+	/**
+	 * Cache object we are decorating
+	 */
+	public $cache;
+
+	public function __construct() {}
+
+	/**
+	 * Lazy decorator function
+	 * @param $cache Reference to cache object to decorate
+	 */
+	public function decorate(&$cache) {
+		$decorator = $this->copy();
+		// reference is necessary for mocks in PHP 4
+		$decorator->cache =& $cache;
+		$decorator->type  = $cache->type;
+		return $decorator;
+	}
+
+	/**
+	 * Cross-compatible clone substitute
+	 */
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator();
+	}
+
+	public function add($def, $config) {
+		return $this->cache->add($def, $config);
+	}
+
+	public function set($def, $config) {
+		return $this->cache->set($def, $config);
+	}
+
+	public function replace($def, $config) {
+		return $this->cache->replace($def, $config);
+	}
+
+	public function get($config) {
+		return $this->cache->get($config);
+	}
+
+	public function remove($config) {
+		return $this->cache->remove($config);
+	}
+
+	public function flush($config) {
+		return $this->cache->flush($config);
+	}
+
+	public function cleanup($config) {
+		return $this->cache->cleanup($config);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function decorate(&$cache) {
         $decorator = $this->copy();
         // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
+        $decorator->cache = & $cache;
         $decorator->type  = $cache->type;
         return $decorator;
     }

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php

Indentation +30 added lines, -30 removed lines

@@ -5,38 +5,38 @@
  * whenever there is a cache miss.
  */
 class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
-      HTMLPurifier_DefinitionCache_Decorator
+	  HTMLPurifier_DefinitionCache_Decorator
 {
 
-    public $name = 'Cleanup';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function get($config) {
-        $ret = parent::get($config);
-        if (!$ret) parent::cleanup($config);
-        return $ret;
-    }
+	public $name = 'Cleanup';
+
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
+	}
+
+	public function add($def, $config) {
+		$status = parent::add($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function set($def, $config) {
+		$status = parent::set($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function replace($def, $config) {
+		$status = parent::replace($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function get($config) {
+		$ret = parent::get($config);
+		if (!$ret) parent::cleanup($config);
+		return $ret;
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -16,25 +16,33 @@
 
     public function add($def, $config) {
         $status = parent::add($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function set($def, $config) {
         $status = parent::set($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function replace($def, $config) {
         $status = parent::replace($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function get($config) {
         $ret = parent::get($config);
-        if (!$ret) parent::cleanup($config);
+        if (!$ret) {
+        	parent::cleanup($config);
+        }
         return $ret;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php

Indentation +32 added lines, -32 removed lines

@@ -6,40 +6,40 @@
  * there are lots of configuration objects floating around.
  */
 class HTMLPurifier_DefinitionCache_Decorator_Memory extends
-      HTMLPurifier_DefinitionCache_Decorator
+	  HTMLPurifier_DefinitionCache_Decorator
 {
 
-    protected $definitions;
-    public $name = 'Memory';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Memory();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function get($config) {
-        $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) return $this->definitions[$key];
-        $this->definitions[$key] = parent::get($config);
-        return $this->definitions[$key];
-    }
+	protected $definitions;
+	public $name = 'Memory';
+
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator_Memory();
+	}
+
+	public function add($def, $config) {
+		$status = parent::add($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function set($def, $config) {
+		$status = parent::set($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function replace($def, $config) {
+		$status = parent::replace($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function get($config) {
+		$key = $this->generateKey($config);
+		if (isset($this->definitions[$key])) return $this->definitions[$key];
+		$this->definitions[$key] = parent::get($config);
+		return $this->definitions[$key];
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -18,25 +18,33 @@
 
     public function add($def, $config) {
         $status = parent::add($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function set($def, $config) {
         $status = parent::set($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function replace($def, $config) {
         $status = parent::replace($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function get($config) {
         $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) return $this->definitions[$key];
+        if (isset($this->definitions[$key])) {
+        	return $this->definitions[$key];
+        }
         $this->definitions[$key] = parent::get($config);
         return $this->definitions[$key];
     }

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php

Indentation +21 added lines, -21 removed lines

@@ -6,33 +6,33 @@
 class HTMLPurifier_DefinitionCache_Null extends HTMLPurifier_DefinitionCache
 {
 
-    public function add($def, $config) {
-        return false;
-    }
+	public function add($def, $config) {
+		return false;
+	}
 
-    public function set($def, $config) {
-        return false;
-    }
+	public function set($def, $config) {
+		return false;
+	}
 
-    public function replace($def, $config) {
-        return false;
-    }
+	public function replace($def, $config) {
+		return false;
+	}
 
-    public function remove($config) {
-        return false;
-    }
+	public function remove($config) {
+		return false;
+	}
 
-    public function get($config) {
-        return false;
-    }
+	public function get($config) {
+		return false;
+	}
 
-    public function flush($config) {
-        return false;
-    }
+	public function flush($config) {
+		return false;
+	}
 
-    public function cleanup($config) {
-        return false;
-    }
+	public function cleanup($config) {
+		return false;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php

Indentation +181 added lines, -181 removed lines

@@ -1,190 +1,190 @@
 <?php
 
 class HTMLPurifier_DefinitionCache_Serializer extends
-      HTMLPurifier_DefinitionCache
+	  HTMLPurifier_DefinitionCache
 {
 
-    public function add($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    public function set($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    public function replace($def, $config) {
-        if (!$this->checkDefType($def)) return;
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
-        return $this->_write($file, serialize($def), $config);
-    }
-
-    public function get($config) {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        return unserialize(file_get_contents($file));
-    }
-
-    public function remove($config) {
-        $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        return unlink($file);
-    }
-
-    public function flush($config) {
-        if (!$this->_prepareDir($config)) return false;
-        $dir = $this->generateDirectoryPath($config);
-        $dh  = opendir($dir);
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
-            unlink($dir . '/' . $filename);
-        }
-    }
-
-    public function cleanup($config) {
-        if (!$this->_prepareDir($config)) return false;
-        $dir = $this->generateDirectoryPath($config);
-        $dh  = opendir($dir);
-        while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
-            $key = substr($filename, 0, strlen($filename) - 4);
-            if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
-        }
-    }
-
-    /**
-     * Generates the file path to the serial file corresponding to
-     * the configuration and definition name
-     * @todo Make protected
-     */
-    public function generateFilePath($config) {
-        $key = $this->generateKey($config);
-        return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
-    }
-
-    /**
-     * Generates the path to the directory contain this cache's serial files
-     * @note No trailing slash
-     * @todo Make protected
-     */
-    public function generateDirectoryPath($config) {
-        $base = $this->generateBaseDirectoryPath($config);
-        return $base . '/' . $this->type;
-    }
-
-    /**
-     * Generates path to base directory that contains all definition type
-     * serials
-     * @todo Make protected
-     */
-    public function generateBaseDirectoryPath($config) {
-        $base = $config->get('Cache.SerializerPath');
-        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
-        return $base;
-    }
-
-    /**
-     * Convenience wrapper function for file_put_contents
-     * @param $file File name to write to
-     * @param $data Data to write into file
-     * @param $config Config object
-     * @return Number of bytes written if success, or false if failure.
-     */
-    private function _write($file, $data, $config) {
-        $result = file_put_contents($file, $data, LOCK_EX);
-        if ($result !== false) {
-            // set permissions of the new file (no execute)
-            $chmod = $config->get('Cache.SerializerPermissions');
-            if (!$chmod) {
-                $chmod = 0644; // invalid config or simpletest
-            }
-            $chmod = $chmod & 0666;
-            chmod($file, $chmod);
-        }
-        return $result;
-    }
-
-    /**
-     * Prepares the directory that this type stores the serials in
-     * @param $config Config object
-     * @return True if successful
-     */
-    private function _prepareDir($config) {
-        $directory = $this->generateDirectoryPath($config);
-        $chmod = $config->get('Cache.SerializerPermissions');
-        if (!$chmod) {
-            $chmod = 0755; // invalid config or simpletest
-        }
-        if (!is_dir($directory)) {
-            $base = $this->generateBaseDirectoryPath($config);
-            if (!is_dir($base)) {
-                trigger_error('Base directory '.$base.' does not exist,
+	public function add($def, $config) {
+		if (!$this->checkDefType($def)) return;
+		$file = $this->generateFilePath($config);
+		if (file_exists($file)) return false;
+		if (!$this->_prepareDir($config)) return false;
+		return $this->_write($file, serialize($def), $config);
+	}
+
+	public function set($def, $config) {
+		if (!$this->checkDefType($def)) return;
+		$file = $this->generateFilePath($config);
+		if (!$this->_prepareDir($config)) return false;
+		return $this->_write($file, serialize($def), $config);
+	}
+
+	public function replace($def, $config) {
+		if (!$this->checkDefType($def)) return;
+		$file = $this->generateFilePath($config);
+		if (!file_exists($file)) return false;
+		if (!$this->_prepareDir($config)) return false;
+		return $this->_write($file, serialize($def), $config);
+	}
+
+	public function get($config) {
+		$file = $this->generateFilePath($config);
+		if (!file_exists($file)) return false;
+		return unserialize(file_get_contents($file));
+	}
+
+	public function remove($config) {
+		$file = $this->generateFilePath($config);
+		if (!file_exists($file)) return false;
+		return unlink($file);
+	}
+
+	public function flush($config) {
+		if (!$this->_prepareDir($config)) return false;
+		$dir = $this->generateDirectoryPath($config);
+		$dh  = opendir($dir);
+		while (false !== ($filename = readdir($dh))) {
+			if (empty($filename)) continue;
+			if ($filename[0] === '.') continue;
+			unlink($dir . '/' . $filename);
+		}
+	}
+
+	public function cleanup($config) {
+		if (!$this->_prepareDir($config)) return false;
+		$dir = $this->generateDirectoryPath($config);
+		$dh  = opendir($dir);
+		while (false !== ($filename = readdir($dh))) {
+			if (empty($filename)) continue;
+			if ($filename[0] === '.') continue;
+			$key = substr($filename, 0, strlen($filename) - 4);
+			if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
+		}
+	}
+
+	/**
+	 * Generates the file path to the serial file corresponding to
+	 * the configuration and definition name
+	 * @todo Make protected
+	 */
+	public function generateFilePath($config) {
+		$key = $this->generateKey($config);
+		return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
+	}
+
+	/**
+	 * Generates the path to the directory contain this cache's serial files
+	 * @note No trailing slash
+	 * @todo Make protected
+	 */
+	public function generateDirectoryPath($config) {
+		$base = $this->generateBaseDirectoryPath($config);
+		return $base . '/' . $this->type;
+	}
+
+	/**
+	 * Generates path to base directory that contains all definition type
+	 * serials
+	 * @todo Make protected
+	 */
+	public function generateBaseDirectoryPath($config) {
+		$base = $config->get('Cache.SerializerPath');
+		$base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
+		return $base;
+	}
+
+	/**
+	 * Convenience wrapper function for file_put_contents
+	 * @param $file File name to write to
+	 * @param $data Data to write into file
+	 * @param $config Config object
+	 * @return Number of bytes written if success, or false if failure.
+	 */
+	private function _write($file, $data, $config) {
+		$result = file_put_contents($file, $data, LOCK_EX);
+		if ($result !== false) {
+			// set permissions of the new file (no execute)
+			$chmod = $config->get('Cache.SerializerPermissions');
+			if (!$chmod) {
+				$chmod = 0644; // invalid config or simpletest
+			}
+			$chmod = $chmod & 0666;
+			chmod($file, $chmod);
+		}
+		return $result;
+	}
+
+	/**
+	 * Prepares the directory that this type stores the serials in
+	 * @param $config Config object
+	 * @return True if successful
+	 */
+	private function _prepareDir($config) {
+		$directory = $this->generateDirectoryPath($config);
+		$chmod = $config->get('Cache.SerializerPermissions');
+		if (!$chmod) {
+			$chmod = 0755; // invalid config or simpletest
+		}
+		if (!is_dir($directory)) {
+			$base = $this->generateBaseDirectoryPath($config);
+			if (!is_dir($base)) {
+				trigger_error('Base directory '.$base.' does not exist,
                     please create or change using %Cache.SerializerPath',
-                    E_USER_WARNING);
-                return false;
-            } elseif (!$this->_testPermissions($base, $chmod)) {
-                return false;
-            }
-            $old = umask(0000);
-            mkdir($directory, $chmod);
-            umask($old);
-        } elseif (!$this->_testPermissions($directory, $chmod)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Tests permissions on a directory and throws out friendly
-     * error messages and attempts to chmod it itself if possible
-     * @param $dir Directory path
-     * @param $chmod Permissions
-     * @return True if directory writable
-     */
-    private function _testPermissions($dir, $chmod) {
-        // early abort, if it is writable, everything is hunky-dory
-        if (is_writable($dir)) return true;
-        if (!is_dir($dir)) {
-            // generally, you'll want to handle this beforehand
-            // so a more specific error message can be given
-            trigger_error('Directory '.$dir.' does not exist',
-                E_USER_WARNING);
-            return false;
-        }
-        if (function_exists('posix_getuid')) {
-            // POSIX system, we can give more specific advice
-            if (fileowner($dir) === posix_getuid()) {
-                // we can chmod it ourselves
-                $chmod = $chmod | 0700;
-                if (chmod($dir, $chmod)) return true;
-            } elseif (filegroup($dir) === posix_getgid()) {
-                $chmod = $chmod | 0070;
-            } else {
-                // PHP's probably running as nobody, so we'll
-                // need to give global permissions
-                $chmod = $chmod | 0777;
-            }
-            trigger_error('Directory '.$dir.' not writable, '.
-                'please chmod to ' . decoct($chmod),
-                E_USER_WARNING);
-        } else {
-            // generic error message
-            trigger_error('Directory '.$dir.' not writable, '.
-                'please alter file permissions',
-                E_USER_WARNING);
-        }
-        return false;
-    }
+					E_USER_WARNING);
+				return false;
+			} elseif (!$this->_testPermissions($base, $chmod)) {
+				return false;
+			}
+			$old = umask(0000);
+			mkdir($directory, $chmod);
+			umask($old);
+		} elseif (!$this->_testPermissions($directory, $chmod)) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Tests permissions on a directory and throws out friendly
+	 * error messages and attempts to chmod it itself if possible
+	 * @param $dir Directory path
+	 * @param $chmod Permissions
+	 * @return True if directory writable
+	 */
+	private function _testPermissions($dir, $chmod) {
+		// early abort, if it is writable, everything is hunky-dory
+		if (is_writable($dir)) return true;
+		if (!is_dir($dir)) {
+			// generally, you'll want to handle this beforehand
+			// so a more specific error message can be given
+			trigger_error('Directory '.$dir.' does not exist',
+				E_USER_WARNING);
+			return false;
+		}
+		if (function_exists('posix_getuid')) {
+			// POSIX system, we can give more specific advice
+			if (fileowner($dir) === posix_getuid()) {
+				// we can chmod it ourselves
+				$chmod = $chmod | 0700;
+				if (chmod($dir, $chmod)) return true;
+			} elseif (filegroup($dir) === posix_getgid()) {
+				$chmod = $chmod | 0070;
+			} else {
+				// PHP's probably running as nobody, so we'll
+				// need to give global permissions
+				$chmod = $chmod | 0777;
+			}
+			trigger_error('Directory '.$dir.' not writable, '.
+				'please chmod to ' . decoct($chmod),
+				E_USER_WARNING);
+		} else {
+			// generic error message
+			trigger_error('Directory '.$dir.' not writable, '.
+				'please alter file permissions',
+				E_USER_WARNING);
+		}
+		return false;
+	}
 
 }
 

Braces +57 added lines, -19 removed lines

@@ -5,60 +5,94 @@ 
 {
 
     public function add($def, $config) {
-        if (!$this->checkDefType($def)) return;
+        if (!$this->checkDefType($def)) {
+        	return;
+        }
         $file = $this->generateFilePath($config);
-        if (file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
+        if (file_exists($file)) {
+        	return false;
+        }
+        if (!$this->_prepareDir($config)) {
+        	return false;
+        }
         return $this->_write($file, serialize($def), $config);
     }
 
     public function set($def, $config) {
-        if (!$this->checkDefType($def)) return;
+        if (!$this->checkDefType($def)) {
+        	return;
+        }
         $file = $this->generateFilePath($config);
-        if (!$this->_prepareDir($config)) return false;
+        if (!$this->_prepareDir($config)) {
+        	return false;
+        }
         return $this->_write($file, serialize($def), $config);
     }
 
     public function replace($def, $config) {
-        if (!$this->checkDefType($def)) return;
+        if (!$this->checkDefType($def)) {
+        	return;
+        }
         $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
-        if (!$this->_prepareDir($config)) return false;
+        if (!file_exists($file)) {
+        	return false;
+        }
+        if (!$this->_prepareDir($config)) {
+        	return false;
+        }
         return $this->_write($file, serialize($def), $config);
     }
 
     public function get($config) {
         $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
+        if (!file_exists($file)) {
+        	return false;
+        }
         return unserialize(file_get_contents($file));
     }
 
     public function remove($config) {
         $file = $this->generateFilePath($config);
-        if (!file_exists($file)) return false;
+        if (!file_exists($file)) {
+        	return false;
+        }
         return unlink($file);
     }
 
     public function flush($config) {
-        if (!$this->_prepareDir($config)) return false;
+        if (!$this->_prepareDir($config)) {
+        	return false;
+        }
         $dir = $this->generateDirectoryPath($config);
         $dh  = opendir($dir);
         while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
+            if (empty($filename)) {
+            	continue;
+            }
+            if ($filename[0] === '.') {
+            	continue;
+            }
             unlink($dir . '/' . $filename);
         }
     }
 
     public function cleanup($config) {
-        if (!$this->_prepareDir($config)) return false;
+        if (!$this->_prepareDir($config)) {
+        	return false;
+        }
         $dir = $this->generateDirectoryPath($config);
         $dh  = opendir($dir);
         while (false !== ($filename = readdir($dh))) {
-            if (empty($filename)) continue;
-            if ($filename[0] === '.') continue;
+            if (empty($filename)) {
+            	continue;
+            }
+            if ($filename[0] === '.') {
+            	continue;
+            }
             $key = substr($filename, 0, strlen($filename) - 4);
-            if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
+            if ($this->isOld($key, $config)) {
+            	unlink($dir . '/' . $filename);
+            }
         }
     }
 
@@ -153,7 +187,9 @@ 
      */
     private function _testPermissions($dir, $chmod) {
         // early abort, if it is writable, everything is hunky-dory
-        if (is_writable($dir)) return true;
+        if (is_writable($dir)) {
+        	return true;
+        }
         if (!is_dir($dir)) {
             // generally, you'll want to handle this beforehand
             // so a more specific error message can be given
@@ -166,7 +202,9 @@ 
             if (fileowner($dir) === posix_getuid()) {
                 // we can chmod it ourselves
                 $chmod = $chmod | 0700;
-                if (chmod($dir, $chmod)) return true;
+                if (chmod($dir, $chmod)) {
+                	return true;
+                }
             } elseif (filegroup($dir) === posix_getgid()) {
                 $chmod = $chmod | 0070;
             } else {

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
         while (false !== ($filename = readdir($dh))) {
             if (empty($filename)) continue;
             if ($filename[0] === '.') continue;
-            unlink($dir . '/' . $filename);
+            unlink($dir.'/'.$filename);
         }
     }
 
@@ -58,7 +58,7 @@ 
             if (empty($filename)) continue;
             if ($filename[0] === '.') continue;
             $key = substr($filename, 0, strlen($filename) - 4);
-            if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
+            if ($this->isOld($key, $config)) unlink($dir.'/'.$filename);
         }
     }
 
@@ -69,7 +69,7 @@ 
      */
     public function generateFilePath($config) {
         $key = $this->generateKey($config);
-        return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
+        return $this->generateDirectoryPath($config).'/'.$key.'.ser';
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public function generateDirectoryPath($config) {
         $base = $this->generateBaseDirectoryPath($config);
-        return $base . '/' . $this->type;
+        return $base.'/'.$this->type;
     }
 
     /**
@@ -175,7 +175,7 @@ 
                 $chmod = $chmod | 0777;
             }
             trigger_error('Directory '.$dir.' not writable, '.
-                'please chmod to ' . decoct($chmod),
+                'please chmod to '.decoct($chmod),
                 E_USER_WARNING);
         } else {
             // generic error message

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php

Indentation +74 added lines, -74 removed lines

@@ -6,85 +6,85 @@
 class HTMLPurifier_DefinitionCacheFactory
 {
 
-    protected $caches = array('Serializer' => array());
-    protected $implementations = array();
-    protected $decorators = array();
+	protected $caches = array('Serializer' => array());
+	protected $implementations = array();
+	protected $decorators = array();
 
-    /**
-     * Initialize default decorators
-     */
-    public function setup() {
-        $this->addDecorator('Cleanup');
-    }
+	/**
+	 * Initialize default decorators
+	 */
+	public function setup() {
+		$this->addDecorator('Cleanup');
+	}
 
-    /**
-     * Retrieves an instance of global definition cache factory.
-     */
-    public static function instance($prototype = null) {
-        static $instance;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype === true) {
-            $instance = new HTMLPurifier_DefinitionCacheFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
+	/**
+	 * Retrieves an instance of global definition cache factory.
+	 */
+	public static function instance($prototype = null) {
+		static $instance;
+		if ($prototype !== null) {
+			$instance = $prototype;
+		} elseif ($instance === null || $prototype === true) {
+			$instance = new HTMLPurifier_DefinitionCacheFactory();
+			$instance->setup();
+		}
+		return $instance;
+	}
 
-    /**
-     * Registers a new definition cache object
-     * @param $short Short name of cache object, for reference
-     * @param $long Full class name of cache object, for construction
-     */
-    public function register($short, $long) {
-        $this->implementations[$short] = $long;
-    }
+	/**
+	 * Registers a new definition cache object
+	 * @param $short Short name of cache object, for reference
+	 * @param $long Full class name of cache object, for construction
+	 */
+	public function register($short, $long) {
+		$this->implementations[$short] = $long;
+	}
 
-    /**
-     * Factory method that creates a cache object based on configuration
-     * @param $name Name of definitions handled by cache
-     * @param $config Instance of HTMLPurifier_Config
-     */
-    public function create($type, $config) {
-        $method = $config->get('Cache.DefinitionImpl');
-        if ($method === null) {
-            return new HTMLPurifier_DefinitionCache_Null($type);
-        }
-        if (!empty($this->caches[$method][$type])) {
-            return $this->caches[$method][$type];
-        }
-        if (
-          isset($this->implementations[$method]) &&
-          class_exists($class = $this->implementations[$method], false)
-        ) {
-            $cache = new $class($type);
-        } else {
-            if ($method != 'Serializer') {
-                trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
-            }
-            $cache = new HTMLPurifier_DefinitionCache_Serializer($type);
-        }
-        foreach ($this->decorators as $decorator) {
-            $new_cache = $decorator->decorate($cache);
-            // prevent infinite recursion in PHP 4
-            unset($cache);
-            $cache = $new_cache;
-        }
-        $this->caches[$method][$type] = $cache;
-        return $this->caches[$method][$type];
-    }
+	/**
+	 * Factory method that creates a cache object based on configuration
+	 * @param $name Name of definitions handled by cache
+	 * @param $config Instance of HTMLPurifier_Config
+	 */
+	public function create($type, $config) {
+		$method = $config->get('Cache.DefinitionImpl');
+		if ($method === null) {
+			return new HTMLPurifier_DefinitionCache_Null($type);
+		}
+		if (!empty($this->caches[$method][$type])) {
+			return $this->caches[$method][$type];
+		}
+		if (
+		  isset($this->implementations[$method]) &&
+		  class_exists($class = $this->implementations[$method], false)
+		) {
+			$cache = new $class($type);
+		} else {
+			if ($method != 'Serializer') {
+				trigger_error("Unrecognized DefinitionCache $method, using Serializer instead", E_USER_WARNING);
+			}
+			$cache = new HTMLPurifier_DefinitionCache_Serializer($type);
+		}
+		foreach ($this->decorators as $decorator) {
+			$new_cache = $decorator->decorate($cache);
+			// prevent infinite recursion in PHP 4
+			unset($cache);
+			$cache = $new_cache;
+		}
+		$this->caches[$method][$type] = $cache;
+		return $this->caches[$method][$type];
+	}
 
-    /**
-     * Registers a decorator to add to all new cache objects
-     * @param
-     */
-    public function addDecorator($decorator) {
-        if (is_string($decorator)) {
-            $class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
-            $decorator = new $class;
-        }
-        $this->decorators[$decorator->name] = $decorator;
-    }
+	/**
+	 * Registers a decorator to add to all new cache objects
+	 * @param
+	 */
+	public function addDecorator($decorator) {
+		if (is_string($decorator)) {
+			$class = "HTMLPurifier_DefinitionCache_Decorator_$decorator";
+			$decorator = new $class;
+		}
+		$this->decorators[$decorator->name] = $decorator;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Doctype.php

Indentation +47 added lines, -47 removed lines

@@ -8,53 +8,53 @@
  */
 class HTMLPurifier_Doctype
 {
-    /**
-     * Full name of doctype
-     */
-    public $name;
-
-    /**
-     * List of standard modules (string identifiers or literal objects)
-     * that this doctype uses
-     */
-    public $modules = array();
-
-    /**
-     * List of modules to use for tidying up code
-     */
-    public $tidyModules = array();
-
-    /**
-     * Is the language derived from XML (i.e. XHTML)?
-     */
-    public $xml = true;
-
-    /**
-     * List of aliases for this doctype
-     */
-    public $aliases = array();
-
-    /**
-     * Public DTD identifier
-     */
-    public $dtdPublic;
-
-    /**
-     * System DTD identifier
-     */
-    public $dtdSystem;
-
-    public function __construct($name = null, $xml = true, $modules = array(),
-        $tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
-    ) {
-        $this->name         = $name;
-        $this->xml          = $xml;
-        $this->modules      = $modules;
-        $this->tidyModules  = $tidyModules;
-        $this->aliases      = $aliases;
-        $this->dtdPublic    = $dtd_public;
-        $this->dtdSystem    = $dtd_system;
-    }
+	/**
+	 * Full name of doctype
+	 */
+	public $name;
+
+	/**
+	 * List of standard modules (string identifiers or literal objects)
+	 * that this doctype uses
+	 */
+	public $modules = array();
+
+	/**
+	 * List of modules to use for tidying up code
+	 */
+	public $tidyModules = array();
+
+	/**
+	 * Is the language derived from XML (i.e. XHTML)?
+	 */
+	public $xml = true;
+
+	/**
+	 * List of aliases for this doctype
+	 */
+	public $aliases = array();
+
+	/**
+	 * Public DTD identifier
+	 */
+	public $dtdPublic;
+
+	/**
+	 * System DTD identifier
+	 */
+	public $dtdSystem;
+
+	public function __construct($name = null, $xml = true, $modules = array(),
+		$tidyModules = array(), $aliases = array(), $dtd_public = null, $dtd_system = null
+	) {
+		$this->name         = $name;
+		$this->xml          = $xml;
+		$this->modules      = $modules;
+		$this->tidyModules  = $tidyModules;
+		$this->aliases      = $aliases;
+		$this->dtdPublic    = $dtd_public;
+		$this->dtdSystem    = $dtd_system;
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/ElementDef.php

Indentation +166 added lines, -166 removed lines

@@ -11,172 +11,172 @@
 class HTMLPurifier_ElementDef
 {
 
-    /**
-     * Does the definition work by itself, or is it created solely
-     * for the purpose of merging into another definition?
-     */
-    public $standalone = true;
-
-    /**
-     * Associative array of attribute name to HTMLPurifier_AttrDef
-     * @note Before being processed by HTMLPurifier_AttrCollections
-     *       when modules are finalized during
-     *       HTMLPurifier_HTMLDefinition->setup(), this array may also
-     *       contain an array at index 0 that indicates which attribute
-     *       collections to load into the full array. It may also
-     *       contain string indentifiers in lieu of HTMLPurifier_AttrDef,
-     *       see HTMLPurifier_AttrTypes on how they are expanded during
-     *       HTMLPurifier_HTMLDefinition->setup() processing.
-     */
-    public $attr = array();
-
-    /**
-     * Indexed list of tag's HTMLPurifier_AttrTransform to be done before validation
-     */
-    public $attr_transform_pre = array();
-
-    /**
-     * Indexed list of tag's HTMLPurifier_AttrTransform to be done after validation
-     */
-    public $attr_transform_post = array();
-
-    /**
-     * HTMLPurifier_ChildDef of this tag.
-     */
-    public $child;
-
-    /**
-     * Abstract string representation of internal ChildDef rules. See
-     * HTMLPurifier_ContentSets for how this is parsed and then transformed
-     * into an HTMLPurifier_ChildDef.
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     */
-    public $content_model;
-
-    /**
-     * Value of $child->type, used to determine which ChildDef to use,
-     * used in combination with $content_model.
-     * @warning This must be lowercase
-     * @warning This is a temporary variable that is not available after
-     *      being processed by HTMLDefinition
-     */
-    public $content_model_type;
-
-
-
-    /**
-     * Does the element have a content model (#PCDATA | Inline)*? This
-     * is important for chameleon ins and del processing in
-     * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
-     * have to worry about this one.
-     */
-    public $descendants_are_inline = false;
-
-    /**
-     * List of the names of required attributes this element has. Dynamically
-     * populated by HTMLPurifier_HTMLDefinition::getElement
-     */
-    public $required_attr = array();
-
-    /**
-     * Lookup table of tags excluded from all descendants of this tag.
-     * @note SGML permits exclusions for all descendants, but this is
-     *       not possible with DTDs or XML Schemas. W3C has elected to
-     *       use complicated compositions of content_models to simulate
-     *       exclusion for children, but we go the simpler, SGML-style
-     *       route of flat-out exclusions, which correctly apply to
-     *       all descendants and not just children. Note that the XHTML
-     *       Modularization Abstract Modules are blithely unaware of such
-     *       distinctions.
-     */
-    public $excludes = array();
-
-    /**
-     * This tag is explicitly auto-closed by the following tags.
-     */
-    public $autoclose = array();
-
-    /**
-     * If a foreign element is found in this element, test if it is
-     * allowed by this sub-element; if it is, instead of closing the
-     * current element, place it inside this element.
-     */
-    public $wrap;
-
-    /**
-     * Whether or not this is a formatting element affected by the
-     * "Active Formatting Elements" algorithm.
-     */
-    public $formatting;
-
-    /**
-     * Low-level factory constructor for creating new standalone element defs
-     */
-    public static function create($content_model, $content_model_type, $attr) {
-        $def = new HTMLPurifier_ElementDef();
-        $def->content_model = $content_model;
-        $def->content_model_type = $content_model_type;
-        $def->attr = $attr;
-        return $def;
-    }
-
-    /**
-     * Merges the values of another element definition into this one.
-     * Values from the new element def take precedence if a value is
-     * not mergeable.
-     */
-    public function mergeIn($def) {
-
-        // later keys takes precedence
-        foreach($def->attr as $k => $v) {
-            if ($k === 0) {
-                // merge in the includes
-                // sorry, no way to override an include
-                foreach ($v as $v2) {
-                    $this->attr[0][] = $v2;
-                }
-                continue;
-            }
-            if ($v === false) {
-                if (isset($this->attr[$k])) unset($this->attr[$k]);
-                continue;
-            }
-            $this->attr[$k] = $v;
-        }
-        $this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
-        $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
-        $this->_mergeAssocArray($this->excludes, $def->excludes);
-
-        if(!empty($def->content_model)) {
-            $this->content_model =
-                str_replace("#SUPER", $this->content_model, $def->content_model);
-            $this->child = false;
-        }
-        if(!empty($def->content_model_type)) {
-            $this->content_model_type = $def->content_model_type;
-            $this->child = false;
-        }
-        if(!is_null($def->child)) $this->child = $def->child;
-        if(!is_null($def->formatting)) $this->formatting = $def->formatting;
-        if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
-
-    }
-
-    /**
-     * Merges one array into another, removes values which equal false
-     * @param $a1 Array by reference that is merged into
-     * @param $a2 Array that merges into $a1
-     */
-    private function _mergeAssocArray(&$a1, $a2) {
-        foreach ($a2 as $k => $v) {
-            if ($v === false) {
-                if (isset($a1[$k])) unset($a1[$k]);
-                continue;
-            }
-            $a1[$k] = $v;
-        }
-    }
+	/**
+	 * Does the definition work by itself, or is it created solely
+	 * for the purpose of merging into another definition?
+	 */
+	public $standalone = true;
+
+	/**
+	 * Associative array of attribute name to HTMLPurifier_AttrDef
+	 * @note Before being processed by HTMLPurifier_AttrCollections
+	 *       when modules are finalized during
+	 *       HTMLPurifier_HTMLDefinition->setup(), this array may also
+	 *       contain an array at index 0 that indicates which attribute
+	 *       collections to load into the full array. It may also
+	 *       contain string indentifiers in lieu of HTMLPurifier_AttrDef,
+	 *       see HTMLPurifier_AttrTypes on how they are expanded during
+	 *       HTMLPurifier_HTMLDefinition->setup() processing.
+	 */
+	public $attr = array();
+
+	/**
+	 * Indexed list of tag's HTMLPurifier_AttrTransform to be done before validation
+	 */
+	public $attr_transform_pre = array();
+
+	/**
+	 * Indexed list of tag's HTMLPurifier_AttrTransform to be done after validation
+	 */
+	public $attr_transform_post = array();
+
+	/**
+	 * HTMLPurifier_ChildDef of this tag.
+	 */
+	public $child;
+
+	/**
+	 * Abstract string representation of internal ChildDef rules. See
+	 * HTMLPurifier_ContentSets for how this is parsed and then transformed
+	 * into an HTMLPurifier_ChildDef.
+	 * @warning This is a temporary variable that is not available after
+	 *      being processed by HTMLDefinition
+	 */
+	public $content_model;
+
+	/**
+	 * Value of $child->type, used to determine which ChildDef to use,
+	 * used in combination with $content_model.
+	 * @warning This must be lowercase
+	 * @warning This is a temporary variable that is not available after
+	 *      being processed by HTMLDefinition
+	 */
+	public $content_model_type;
+
+
+
+	/**
+	 * Does the element have a content model (#PCDATA | Inline)*? This
+	 * is important for chameleon ins and del processing in
+	 * HTMLPurifier_ChildDef_Chameleon. Dynamically set: modules don't
+	 * have to worry about this one.
+	 */
+	public $descendants_are_inline = false;
+
+	/**
+	 * List of the names of required attributes this element has. Dynamically
+	 * populated by HTMLPurifier_HTMLDefinition::getElement
+	 */
+	public $required_attr = array();
+
+	/**
+	 * Lookup table of tags excluded from all descendants of this tag.
+	 * @note SGML permits exclusions for all descendants, but this is
+	 *       not possible with DTDs or XML Schemas. W3C has elected to
+	 *       use complicated compositions of content_models to simulate
+	 *       exclusion for children, but we go the simpler, SGML-style
+	 *       route of flat-out exclusions, which correctly apply to
+	 *       all descendants and not just children. Note that the XHTML
+	 *       Modularization Abstract Modules are blithely unaware of such
+	 *       distinctions.
+	 */
+	public $excludes = array();
+
+	/**
+	 * This tag is explicitly auto-closed by the following tags.
+	 */
+	public $autoclose = array();
+
+	/**
+	 * If a foreign element is found in this element, test if it is
+	 * allowed by this sub-element; if it is, instead of closing the
+	 * current element, place it inside this element.
+	 */
+	public $wrap;
+
+	/**
+	 * Whether or not this is a formatting element affected by the
+	 * "Active Formatting Elements" algorithm.
+	 */
+	public $formatting;
+
+	/**
+	 * Low-level factory constructor for creating new standalone element defs
+	 */
+	public static function create($content_model, $content_model_type, $attr) {
+		$def = new HTMLPurifier_ElementDef();
+		$def->content_model = $content_model;
+		$def->content_model_type = $content_model_type;
+		$def->attr = $attr;
+		return $def;
+	}
+
+	/**
+	 * Merges the values of another element definition into this one.
+	 * Values from the new element def take precedence if a value is
+	 * not mergeable.
+	 */
+	public function mergeIn($def) {
+
+		// later keys takes precedence
+		foreach($def->attr as $k => $v) {
+			if ($k === 0) {
+				// merge in the includes
+				// sorry, no way to override an include
+				foreach ($v as $v2) {
+					$this->attr[0][] = $v2;
+				}
+				continue;
+			}
+			if ($v === false) {
+				if (isset($this->attr[$k])) unset($this->attr[$k]);
+				continue;
+			}
+			$this->attr[$k] = $v;
+		}
+		$this->_mergeAssocArray($this->attr_transform_pre, $def->attr_transform_pre);
+		$this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
+		$this->_mergeAssocArray($this->excludes, $def->excludes);
+
+		if(!empty($def->content_model)) {
+			$this->content_model =
+				str_replace("#SUPER", $this->content_model, $def->content_model);
+			$this->child = false;
+		}
+		if(!empty($def->content_model_type)) {
+			$this->content_model_type = $def->content_model_type;
+			$this->child = false;
+		}
+		if(!is_null($def->child)) $this->child = $def->child;
+		if(!is_null($def->formatting)) $this->formatting = $def->formatting;
+		if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
+
+	}
+
+	/**
+	 * Merges one array into another, removes values which equal false
+	 * @param $a1 Array by reference that is merged into
+	 * @param $a2 Array that merges into $a1
+	 */
+	private function _mergeAssocArray(&$a1, $a2) {
+		foreach ($a2 as $k => $v) {
+			if ($v === false) {
+				if (isset($a1[$k])) unset($a1[$k]);
+				continue;
+			}
+			$a1[$k] = $v;
+		}
+	}
 
 }
 

Spacing +6 added lines, -6 removed lines

@@ -129,7 +129,7 @@ 
     public function mergeIn($def) {
 
         // later keys takes precedence
-        foreach($def->attr as $k => $v) {
+        foreach ($def->attr as $k => $v) {
             if ($k === 0) {
                 // merge in the includes
                 // sorry, no way to override an include
@@ -148,18 +148,18 @@ 
         $this->_mergeAssocArray($this->attr_transform_post, $def->attr_transform_post);
         $this->_mergeAssocArray($this->excludes, $def->excludes);
 
-        if(!empty($def->content_model)) {
+        if (!empty($def->content_model)) {
             $this->content_model =
                 str_replace("#SUPER", $this->content_model, $def->content_model);
             $this->child = false;
         }
-        if(!empty($def->content_model_type)) {
+        if (!empty($def->content_model_type)) {
             $this->content_model_type = $def->content_model_type;
             $this->child = false;
         }
-        if(!is_null($def->child)) $this->child = $def->child;
-        if(!is_null($def->formatting)) $this->formatting = $def->formatting;
-        if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
+        if (!is_null($def->child)) $this->child = $def->child;
+        if (!is_null($def->formatting)) $this->formatting = $def->formatting;
+        if ($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
 
     }
 

Braces +15 added lines, -5 removed lines

@@ -139,7 +139,9 @@ 
                 continue;
             }
             if ($v === false) {
-                if (isset($this->attr[$k])) unset($this->attr[$k]);
+                if (isset($this->attr[$k])) {
+                	unset($this->attr[$k]);
+                }
                 continue;
             }
             $this->attr[$k] = $v;
@@ -157,9 +159,15 @@ 
             $this->content_model_type = $def->content_model_type;
             $this->child = false;
         }
-        if(!is_null($def->child)) $this->child = $def->child;
-        if(!is_null($def->formatting)) $this->formatting = $def->formatting;
-        if($def->descendants_are_inline) $this->descendants_are_inline = $def->descendants_are_inline;
+        if(!is_null($def->child)) {
+        	$this->child = $def->child;
+        }
+        if(!is_null($def->formatting)) {
+        	$this->formatting = $def->formatting;
+        }
+        if($def->descendants_are_inline) {
+        	$this->descendants_are_inline = $def->descendants_are_inline;
+        }
 
     }
 
@@ -171,7 +179,9 @@ 
     private function _mergeAssocArray(&$a1, $a2) {
         foreach ($a2 as $k => $v) {
             if ($v === false) {
-                if (isset($a1[$k])) unset($a1[$k]);
+                if (isset($a1[$k])) {
+                	unset($a1[$k]);
+                }
                 continue;
             }
             $a1[$k] = $v;