xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php

Indentation +10 added lines, -10 removed lines

@@ -7,17 +7,17 @@
 class HTMLPurifier_HTMLModule_StyleAttribute extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'StyleAttribute';
-    public $attr_collections = array(
-        // The inclusion routine differs from the Abstract Modules but
-        // is in line with the DTD and XML Schemas.
-        'Style' => array('style' => false), // see constructor
-        'Core' => array(0 => array('Style'))
-    );
+	public $name = 'StyleAttribute';
+	public $attr_collections = array(
+		// The inclusion routine differs from the Abstract Modules but
+		// is in line with the DTD and XML Schemas.
+		'Style' => array('style' => false), // see constructor
+		'Core' => array(0 => array('Style'))
+	);
 
-    public function setup($config) {
-        $this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
-    }
+	public function setup($config) {
+		$this->attr_collections['Style']['style'] = new HTMLPurifier_AttrDef_CSS();
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php

Indentation +48 added lines, -48 removed lines

@@ -6,63 +6,63 @@
 class HTMLPurifier_HTMLModule_Tables extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Tables';
+	public $name = 'Tables';
 
-    public function setup($config) {
+	public function setup($config) {
 
-        $this->addElement('caption', false, 'Inline', 'Common');
+		$this->addElement('caption', false, 'Inline', 'Common');
 
-        $this->addElement('table', 'Block',
-            new HTMLPurifier_ChildDef_Table(),  'Common',
-            array(
-                'border' => 'Pixels',
-                'cellpadding' => 'Length',
-                'cellspacing' => 'Length',
-                'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
-                'rules' => 'Enum#none,groups,rows,cols,all',
-                'summary' => 'Text',
-                'width' => 'Length'
-            )
-        );
+		$this->addElement('table', 'Block',
+			new HTMLPurifier_ChildDef_Table(),  'Common',
+			array(
+				'border' => 'Pixels',
+				'cellpadding' => 'Length',
+				'cellspacing' => 'Length',
+				'frame' => 'Enum#void,above,below,hsides,lhs,rhs,vsides,box,border',
+				'rules' => 'Enum#none,groups,rows,cols,all',
+				'summary' => 'Text',
+				'width' => 'Length'
+			)
+		);
 
-        // common attributes
-        $cell_align = array(
-            'align' => 'Enum#left,center,right,justify,char',
-            'charoff' => 'Length',
-            'valign' => 'Enum#top,middle,bottom,baseline',
-        );
+		// common attributes
+		$cell_align = array(
+			'align' => 'Enum#left,center,right,justify,char',
+			'charoff' => 'Length',
+			'valign' => 'Enum#top,middle,bottom,baseline',
+		);
 
-        $cell_t = array_merge(
-            array(
-                'abbr'    => 'Text',
-                'colspan' => 'Number',
-                'rowspan' => 'Number',
-                // Apparently, as of HTML5 this attribute only applies
-                // to 'th' elements.
-                'scope'   => 'Enum#row,col,rowgroup,colgroup',
-            ),
-            $cell_align
-        );
-        $this->addElement('td', false, 'Flow', 'Common', $cell_t);
-        $this->addElement('th', false, 'Flow', 'Common', $cell_t);
+		$cell_t = array_merge(
+			array(
+				'abbr'    => 'Text',
+				'colspan' => 'Number',
+				'rowspan' => 'Number',
+				// Apparently, as of HTML5 this attribute only applies
+				// to 'th' elements.
+				'scope'   => 'Enum#row,col,rowgroup,colgroup',
+			),
+			$cell_align
+		);
+		$this->addElement('td', false, 'Flow', 'Common', $cell_t);
+		$this->addElement('th', false, 'Flow', 'Common', $cell_t);
 
-        $this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
+		$this->addElement('tr', false, 'Required: td | th', 'Common', $cell_align);
 
-        $cell_col = array_merge(
-            array(
-                'span'  => 'Number',
-                'width' => 'MultiLength',
-            ),
-            $cell_align
-        );
-        $this->addElement('col',      false, 'Empty',         'Common', $cell_col);
-        $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
+		$cell_col = array_merge(
+			array(
+				'span'  => 'Number',
+				'width' => 'MultiLength',
+			),
+			$cell_align
+		);
+		$this->addElement('col',      false, 'Empty',         'Common', $cell_col);
+		$this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
 
-        $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
-        $this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
+		$this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);
+		$this->addElement('thead', false, 'Required: tr', 'Common', $cell_align);
+		$this->addElement('tfoot', false, 'Required: tr', 'Common', $cell_align);
 
-    }
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
         $this->addElement('caption', false, 'Inline', 'Common');
 
         $this->addElement('table', 'Block',
-            new HTMLPurifier_ChildDef_Table(),  'Common',
+            new HTMLPurifier_ChildDef_Table(), 'Common',
             array(
                 'border' => 'Pixels',
                 'cellpadding' => 'Length',
@@ -55,7 +55,7 @@ 
             ),
             $cell_align
         );
-        $this->addElement('col',      false, 'Empty',         'Common', $cell_col);
+        $this->addElement('col', false, 'Empty', 'Common', $cell_col);
         $this->addElement('colgroup', false, 'Optional: col', 'Common', $cell_col);
 
         $this->addElement('tbody', false, 'Required: tr', 'Common', $cell_align);

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php

Indentation +10 added lines, -10 removed lines

@@ -6,17 +6,17 @@
 class HTMLPurifier_HTMLModule_Target extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Target';
+	public $name = 'Target';
 
-    public function setup($config) {
-        $elements = array('a');
-        foreach ($elements as $name) {
-            $e = $this->addBlankElement($name);
-            $e->attr = array(
-                'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
-            );
-        }
-    }
+	public function setup($config) {
+		$elements = array('a');
+		foreach ($elements as $name) {
+			$e = $this->addBlankElement($name);
+			$e->attr = array(
+				'target' => new HTMLPurifier_AttrDef_HTML_FrameTarget()
+			);
+		}
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php

Indentation +5 added lines, -5 removed lines

@@ -7,12 +7,12 @@
 class HTMLPurifier_HTMLModule_TargetBlank extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'TargetBlank';
+	public $name = 'TargetBlank';
 
-    public function setup($config) {
-        $a = $this->addBlankElement('a');
-        $a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetBlank();
-    }
+	public function setup($config) {
+		$a = $this->addBlankElement('a');
+		$a->attr_transform_post[] = new HTMLPurifier_AttrTransform_TargetBlank();
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php

Indentation +40 added lines, -40 removed lines

@@ -15,56 +15,56 @@
 class HTMLPurifier_HTMLModule_Text extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Text';
-    public $content_sets = array(
-        'Flow' => 'Heading | Block | Inline'
-    );
+	public $name = 'Text';
+	public $content_sets = array(
+		'Flow' => 'Heading | Block | Inline'
+	);
 
-    public function setup($config) {
+	public function setup($config) {
 
-        // Inline Phrasal -------------------------------------------------
-        $this->addElement('abbr',    'Inline', 'Inline', 'Common');
-        $this->addElement('acronym', 'Inline', 'Inline', 'Common');
-        $this->addElement('cite',    'Inline', 'Inline', 'Common');
-        $this->addElement('dfn',     'Inline', 'Inline', 'Common');
-        $this->addElement('kbd',     'Inline', 'Inline', 'Common');
-        $this->addElement('q',       'Inline', 'Inline', 'Common', array('cite' => 'URI'));
-        $this->addElement('samp',    'Inline', 'Inline', 'Common');
-        $this->addElement('var',     'Inline', 'Inline', 'Common');
+		// Inline Phrasal -------------------------------------------------
+		$this->addElement('abbr',    'Inline', 'Inline', 'Common');
+		$this->addElement('acronym', 'Inline', 'Inline', 'Common');
+		$this->addElement('cite',    'Inline', 'Inline', 'Common');
+		$this->addElement('dfn',     'Inline', 'Inline', 'Common');
+		$this->addElement('kbd',     'Inline', 'Inline', 'Common');
+		$this->addElement('q',       'Inline', 'Inline', 'Common', array('cite' => 'URI'));
+		$this->addElement('samp',    'Inline', 'Inline', 'Common');
+		$this->addElement('var',     'Inline', 'Inline', 'Common');
 
-        $em = $this->addElement('em',      'Inline', 'Inline', 'Common');
-        $em->formatting = true;
+		$em = $this->addElement('em',      'Inline', 'Inline', 'Common');
+		$em->formatting = true;
 
-        $strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');
-        $strong->formatting = true;
+		$strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');
+		$strong->formatting = true;
 
-        $code = $this->addElement('code',    'Inline', 'Inline', 'Common');
-        $code->formatting = true;
+		$code = $this->addElement('code',    'Inline', 'Inline', 'Common');
+		$code->formatting = true;
 
-        // Inline Structural ----------------------------------------------
-        $this->addElement('span', 'Inline', 'Inline', 'Common');
-        $this->addElement('br',   'Inline', 'Empty',  'Core');
+		// Inline Structural ----------------------------------------------
+		$this->addElement('span', 'Inline', 'Inline', 'Common');
+		$this->addElement('br',   'Inline', 'Empty',  'Core');
 
-        // Block Phrasal --------------------------------------------------
-        $this->addElement('address',     'Block', 'Inline', 'Common');
-        $this->addElement('blockquote',  'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
-        $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
-        $pre->excludes = $this->makeLookup(
-            'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );
-        $this->addElement('h1', 'Heading', 'Inline', 'Common');
-        $this->addElement('h2', 'Heading', 'Inline', 'Common');
-        $this->addElement('h3', 'Heading', 'Inline', 'Common');
-        $this->addElement('h4', 'Heading', 'Inline', 'Common');
-        $this->addElement('h5', 'Heading', 'Inline', 'Common');
-        $this->addElement('h6', 'Heading', 'Inline', 'Common');
+		// Block Phrasal --------------------------------------------------
+		$this->addElement('address',     'Block', 'Inline', 'Common');
+		$this->addElement('blockquote',  'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
+		$pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
+		$pre->excludes = $this->makeLookup(
+			'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );
+		$this->addElement('h1', 'Heading', 'Inline', 'Common');
+		$this->addElement('h2', 'Heading', 'Inline', 'Common');
+		$this->addElement('h3', 'Heading', 'Inline', 'Common');
+		$this->addElement('h4', 'Heading', 'Inline', 'Common');
+		$this->addElement('h5', 'Heading', 'Inline', 'Common');
+		$this->addElement('h6', 'Heading', 'Inline', 'Common');
 
-        // Block Structural -----------------------------------------------
-        $p = $this->addElement('p', 'Block', 'Inline', 'Common');
-        $p->autoclose = array_flip(array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul"));
+		// Block Structural -----------------------------------------------
+		$p = $this->addElement('p', 'Block', 'Inline', 'Common');
+		$p->autoclose = array_flip(array("address", "blockquote", "center", "dir", "div", "dl", "fieldset", "ol", "p", "ul"));
 
-        $this->addElement('div', 'Block', 'Flow', 'Common');
+		$this->addElement('div', 'Block', 'Flow', 'Common');
 
-    }
+	}
 
 }
 

Spacing +13 added lines, -13 removed lines

@@ -23,31 +23,31 @@
     public function setup($config) {
 
         // Inline Phrasal -------------------------------------------------
-        $this->addElement('abbr',    'Inline', 'Inline', 'Common');
+        $this->addElement('abbr', 'Inline', 'Inline', 'Common');
         $this->addElement('acronym', 'Inline', 'Inline', 'Common');
-        $this->addElement('cite',    'Inline', 'Inline', 'Common');
-        $this->addElement('dfn',     'Inline', 'Inline', 'Common');
-        $this->addElement('kbd',     'Inline', 'Inline', 'Common');
-        $this->addElement('q',       'Inline', 'Inline', 'Common', array('cite' => 'URI'));
-        $this->addElement('samp',    'Inline', 'Inline', 'Common');
-        $this->addElement('var',     'Inline', 'Inline', 'Common');
+        $this->addElement('cite', 'Inline', 'Inline', 'Common');
+        $this->addElement('dfn', 'Inline', 'Inline', 'Common');
+        $this->addElement('kbd', 'Inline', 'Inline', 'Common');
+        $this->addElement('q', 'Inline', 'Inline', 'Common', array('cite' => 'URI'));
+        $this->addElement('samp', 'Inline', 'Inline', 'Common');
+        $this->addElement('var', 'Inline', 'Inline', 'Common');
 
-        $em = $this->addElement('em',      'Inline', 'Inline', 'Common');
+        $em = $this->addElement('em', 'Inline', 'Inline', 'Common');
         $em->formatting = true;
 
-        $strong = $this->addElement('strong',  'Inline', 'Inline', 'Common');
+        $strong = $this->addElement('strong', 'Inline', 'Inline', 'Common');
         $strong->formatting = true;
 
-        $code = $this->addElement('code',    'Inline', 'Inline', 'Common');
+        $code = $this->addElement('code', 'Inline', 'Inline', 'Common');
         $code->formatting = true;
 
         // Inline Structural ----------------------------------------------
         $this->addElement('span', 'Inline', 'Inline', 'Common');
-        $this->addElement('br',   'Inline', 'Empty',  'Core');
+        $this->addElement('br', 'Inline', 'Empty', 'Core');
 
         // Block Phrasal --------------------------------------------------
-        $this->addElement('address',     'Block', 'Inline', 'Common');
-        $this->addElement('blockquote',  'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI') );
+        $this->addElement('address', 'Block', 'Inline', 'Common');
+        $this->addElement('blockquote', 'Block', 'Optional: Heading | Block | List', 'Common', array('cite' => 'URI'));
         $pre = $this->addElement('pre', 'Block', 'Inline', 'Common');
         $pre->excludes = $this->makeLookup(
             'img', 'big', 'small', 'object', 'applet', 'font', 'basefont' );

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php

Indentation +193 added lines, -193 removed lines

@@ -8,199 +8,199 @@
 class HTMLPurifier_HTMLModule_Tidy extends HTMLPurifier_HTMLModule
 {
 
-    /**
-     * List of supported levels. Index zero is a special case "no fixes"
-     * level.
-     */
-    public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
-
-    /**
-     * Default level to place all fixes in. Disabled by default
-     */
-    public $defaultLevel = null;
-
-    /**
-     * Lists of fixes used by getFixesForLevel(). Format is:
-     *      HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
-     */
-    public $fixesForLevel = array(
-        'light'  => array(),
-        'medium' => array(),
-        'heavy'  => array()
-    );
-
-    /**
-     * Lazy load constructs the module by determining the necessary
-     * fixes to create and then delegating to the populate() function.
-     * @todo Wildcard matching and error reporting when an added or
-     *       subtracted fix has no effect.
-     */
-    public function setup($config) {
-
-        // create fixes, initialize fixesForLevel
-        $fixes = $this->makeFixes();
-        $this->makeFixesForLevel($fixes);
-
-        // figure out which fixes to use
-        $level = $config->get('HTML.TidyLevel');
-        $fixes_lookup = $this->getFixesForLevel($level);
-
-        // get custom fix declarations: these need namespace processing
-        $add_fixes    = $config->get('HTML.TidyAdd');
-        $remove_fixes = $config->get('HTML.TidyRemove');
-
-        foreach ($fixes as $name => $fix) {
-            // needs to be refactored a little to implement globbing
-            if (
-                isset($remove_fixes[$name]) ||
-                (!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))
-            ) {
-                unset($fixes[$name]);
-            }
-        }
-
-        // populate this module with necessary fixes
-        $this->populate($fixes);
-
-    }
-
-    /**
-     * Retrieves all fixes per a level, returning fixes for that specific
-     * level as well as all levels below it.
-     * @param $level String level identifier, see $levels for valid values
-     * @return Lookup up table of fixes
-     */
-    public function getFixesForLevel($level) {
-        if ($level == $this->levels[0]) {
-            return array();
-        }
-        $activated_levels = array();
-        for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
-            $activated_levels[] = $this->levels[$i];
-            if ($this->levels[$i] == $level) break;
-        }
-        if ($i == $c) {
-            trigger_error(
-                'Tidy level ' . htmlspecialchars($level) . ' not recognized',
-                E_USER_WARNING
-            );
-            return array();
-        }
-        $ret = array();
-        foreach ($activated_levels as $level) {
-            foreach ($this->fixesForLevel[$level] as $fix) {
-                $ret[$fix] = true;
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Dynamically populates the $fixesForLevel member variable using
-     * the fixes array. It may be custom overloaded, used in conjunction
-     * with $defaultLevel, or not used at all.
-     */
-    public function makeFixesForLevel($fixes) {
-        if (!isset($this->defaultLevel)) return;
-        if (!isset($this->fixesForLevel[$this->defaultLevel])) {
-            trigger_error(
-                'Default level ' . $this->defaultLevel . ' does not exist',
-                E_USER_ERROR
-            );
-            return;
-        }
-        $this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
-    }
-
-    /**
-     * Populates the module with transforms and other special-case code
-     * based on a list of fixes passed to it
-     * @param $lookup Lookup table of fixes to activate
-     */
-    public function populate($fixes) {
-        foreach ($fixes as $name => $fix) {
-            // determine what the fix is for
-            list($type, $params) = $this->getFixType($name);
-            switch ($type) {
-                case 'attr_transform_pre':
-                case 'attr_transform_post':
-                    $attr = $params['attr'];
-                    if (isset($params['element'])) {
-                        $element = $params['element'];
-                        if (empty($this->info[$element])) {
-                            $e = $this->addBlankElement($element);
-                        } else {
-                            $e = $this->info[$element];
-                        }
-                    } else {
-                        $type = "info_$type";
-                        $e = $this;
-                    }
-                    // PHP does some weird parsing when I do
-                    // $e->$type[$attr], so I have to assign a ref.
-                    $f =& $e->$type;
-                    $f[$attr] = $fix;
-                    break;
-                case 'tag_transform':
-                    $this->info_tag_transform[$params['element']] = $fix;
-                    break;
-                case 'child':
-                case 'content_model_type':
-                    $element = $params['element'];
-                    if (empty($this->info[$element])) {
-                        $e = $this->addBlankElement($element);
-                    } else {
-                        $e = $this->info[$element];
-                    }
-                    $e->$type = $fix;
-                    break;
-                default:
-                    trigger_error("Fix type $type not supported", E_USER_ERROR);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parses a fix name and determines what kind of fix it is, as well
-     * as other information defined by the fix
-     * @param $name String name of fix
-     * @return array(string $fix_type, array $fix_parameters)
-     * @note $fix_parameters is type dependant, see populate() for usage
-     *       of these parameters
-     */
-    public function getFixType($name) {
-        // parse it
-        $property = $attr = null;
-        if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
-        if (strpos($name, '@') !== false) list($name, $attr)     = explode('@', $name);
-
-        // figure out the parameters
-        $params = array();
-        if ($name !== '')    $params['element'] = $name;
-        if (!is_null($attr)) $params['attr'] = $attr;
-
-        // special case: attribute transform
-        if (!is_null($attr)) {
-            if (is_null($property)) $property = 'pre';
-            $type = 'attr_transform_' . $property;
-            return array($type, $params);
-        }
-
-        // special case: tag transform
-        if (is_null($property)) {
-            return array('tag_transform', $params);
-        }
-
-        return array($property, $params);
-
-    }
-
-    /**
-     * Defines all fixes the module will perform in a compact
-     * associative array of fix name to fix implementation.
-     */
-    public function makeFixes() {}
+	/**
+	 * List of supported levels. Index zero is a special case "no fixes"
+	 * level.
+	 */
+	public $levels = array(0 => 'none', 'light', 'medium', 'heavy');
+
+	/**
+	 * Default level to place all fixes in. Disabled by default
+	 */
+	public $defaultLevel = null;
+
+	/**
+	 * Lists of fixes used by getFixesForLevel(). Format is:
+	 *      HTMLModule_Tidy->fixesForLevel[$level] = array('fix-1', 'fix-2');
+	 */
+	public $fixesForLevel = array(
+		'light'  => array(),
+		'medium' => array(),
+		'heavy'  => array()
+	);
+
+	/**
+	 * Lazy load constructs the module by determining the necessary
+	 * fixes to create and then delegating to the populate() function.
+	 * @todo Wildcard matching and error reporting when an added or
+	 *       subtracted fix has no effect.
+	 */
+	public function setup($config) {
+
+		// create fixes, initialize fixesForLevel
+		$fixes = $this->makeFixes();
+		$this->makeFixesForLevel($fixes);
+
+		// figure out which fixes to use
+		$level = $config->get('HTML.TidyLevel');
+		$fixes_lookup = $this->getFixesForLevel($level);
+
+		// get custom fix declarations: these need namespace processing
+		$add_fixes    = $config->get('HTML.TidyAdd');
+		$remove_fixes = $config->get('HTML.TidyRemove');
+
+		foreach ($fixes as $name => $fix) {
+			// needs to be refactored a little to implement globbing
+			if (
+				isset($remove_fixes[$name]) ||
+				(!isset($add_fixes[$name]) && !isset($fixes_lookup[$name]))
+			) {
+				unset($fixes[$name]);
+			}
+		}
+
+		// populate this module with necessary fixes
+		$this->populate($fixes);
+
+	}
+
+	/**
+	 * Retrieves all fixes per a level, returning fixes for that specific
+	 * level as well as all levels below it.
+	 * @param $level String level identifier, see $levels for valid values
+	 * @return Lookup up table of fixes
+	 */
+	public function getFixesForLevel($level) {
+		if ($level == $this->levels[0]) {
+			return array();
+		}
+		$activated_levels = array();
+		for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
+			$activated_levels[] = $this->levels[$i];
+			if ($this->levels[$i] == $level) break;
+		}
+		if ($i == $c) {
+			trigger_error(
+				'Tidy level ' . htmlspecialchars($level) . ' not recognized',
+				E_USER_WARNING
+			);
+			return array();
+		}
+		$ret = array();
+		foreach ($activated_levels as $level) {
+			foreach ($this->fixesForLevel[$level] as $fix) {
+				$ret[$fix] = true;
+			}
+		}
+		return $ret;
+	}
+
+	/**
+	 * Dynamically populates the $fixesForLevel member variable using
+	 * the fixes array. It may be custom overloaded, used in conjunction
+	 * with $defaultLevel, or not used at all.
+	 */
+	public function makeFixesForLevel($fixes) {
+		if (!isset($this->defaultLevel)) return;
+		if (!isset($this->fixesForLevel[$this->defaultLevel])) {
+			trigger_error(
+				'Default level ' . $this->defaultLevel . ' does not exist',
+				E_USER_ERROR
+			);
+			return;
+		}
+		$this->fixesForLevel[$this->defaultLevel] = array_keys($fixes);
+	}
+
+	/**
+	 * Populates the module with transforms and other special-case code
+	 * based on a list of fixes passed to it
+	 * @param $lookup Lookup table of fixes to activate
+	 */
+	public function populate($fixes) {
+		foreach ($fixes as $name => $fix) {
+			// determine what the fix is for
+			list($type, $params) = $this->getFixType($name);
+			switch ($type) {
+				case 'attr_transform_pre':
+				case 'attr_transform_post':
+					$attr = $params['attr'];
+					if (isset($params['element'])) {
+						$element = $params['element'];
+						if (empty($this->info[$element])) {
+							$e = $this->addBlankElement($element);
+						} else {
+							$e = $this->info[$element];
+						}
+					} else {
+						$type = "info_$type";
+						$e = $this;
+					}
+					// PHP does some weird parsing when I do
+					// $e->$type[$attr], so I have to assign a ref.
+					$f =& $e->$type;
+					$f[$attr] = $fix;
+					break;
+				case 'tag_transform':
+					$this->info_tag_transform[$params['element']] = $fix;
+					break;
+				case 'child':
+				case 'content_model_type':
+					$element = $params['element'];
+					if (empty($this->info[$element])) {
+						$e = $this->addBlankElement($element);
+					} else {
+						$e = $this->info[$element];
+					}
+					$e->$type = $fix;
+					break;
+				default:
+					trigger_error("Fix type $type not supported", E_USER_ERROR);
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parses a fix name and determines what kind of fix it is, as well
+	 * as other information defined by the fix
+	 * @param $name String name of fix
+	 * @return array(string $fix_type, array $fix_parameters)
+	 * @note $fix_parameters is type dependant, see populate() for usage
+	 *       of these parameters
+	 */
+	public function getFixType($name) {
+		// parse it
+		$property = $attr = null;
+		if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
+		if (strpos($name, '@') !== false) list($name, $attr)     = explode('@', $name);
+
+		// figure out the parameters
+		$params = array();
+		if ($name !== '')    $params['element'] = $name;
+		if (!is_null($attr)) $params['attr'] = $attr;
+
+		// special case: attribute transform
+		if (!is_null($attr)) {
+			if (is_null($property)) $property = 'pre';
+			$type = 'attr_transform_' . $property;
+			return array($type, $params);
+		}
+
+		// special case: tag transform
+		if (is_null($property)) {
+			return array('tag_transform', $params);
+		}
+
+		return array($property, $params);
+
+	}
+
+	/**
+	 * Defines all fixes the module will perform in a compact
+	 * associative array of fix name to fix implementation.
+	 */
+	public function makeFixes() {}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
                     }
                     // PHP does some weird parsing when I do
                     // $e->$type[$attr], so I have to assign a ref.
-                    $f =& $e->$type;
+                    $f = & $e->$type;
                     $f[$attr] = $fix;
                     break;
                 case 'tag_transform':

Braces +21 added lines, -7 removed lines

@@ -77,7 +77,9 @@ 
         $activated_levels = array();
         for ($i = 1, $c = count($this->levels); $i < $c; $i++) {
             $activated_levels[] = $this->levels[$i];
-            if ($this->levels[$i] == $level) break;
+            if ($this->levels[$i] == $level) {
+            	break;
+            }
         }
         if ($i == $c) {
             trigger_error(
@@ -101,7 +103,9 @@ 
      * with $defaultLevel, or not used at all.
      */
     public function makeFixesForLevel($fixes) {
-        if (!isset($this->defaultLevel)) return;
+        if (!isset($this->defaultLevel)) {
+        	return;
+        }
         if (!isset($this->fixesForLevel[$this->defaultLevel])) {
             trigger_error(
                 'Default level ' . $this->defaultLevel . ' does not exist',
@@ -172,17 +176,27 @@ 
     public function getFixType($name) {
         // parse it
         $property = $attr = null;
-        if (strpos($name, '#') !== false) list($name, $property) = explode('#', $name);
-        if (strpos($name, '@') !== false) list($name, $attr)     = explode('@', $name);
+        if (strpos($name, '#') !== false) {
+        	list($name, $property) = explode('#', $name);
+        }
+        if (strpos($name, '@') !== false) {
+        	list($name, $attr)     = explode('@', $name);
+        }
 
         // figure out the parameters
         $params = array();
-        if ($name !== '')    $params['element'] = $name;
-        if (!is_null($attr)) $params['attr'] = $attr;
+        if ($name !== '') {
+        	$params['element'] = $name;
+        }
+        if (!is_null($attr)) {
+        	$params['attr'] = $attr;
+        }
 
         // special case: attribute transform
         if (!is_null($attr)) {
-            if (is_null($property)) $property = 'pre';
+            if (is_null($property)) {
+            	$property = 'pre';
+            }
             $type = 'attr_transform_' . $property;
             return array($type, $params);
         }

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php

Indentation +11 added lines, -11 removed lines

@@ -5,20 +5,20 @@
  */
 class HTMLPurifier_HTMLModule_Tidy_Name extends HTMLPurifier_HTMLModule_Tidy
 {
-    public $name = 'Tidy_Name';
-    public $defaultLevel = 'heavy';
-    public function makeFixes() {
+	public $name = 'Tidy_Name';
+	public $defaultLevel = 'heavy';
+	public function makeFixes() {
 
-        $r = array();
+		$r = array();
 
-        // @name for img, a -----------------------------------------------
-        // Technically, it's allowed even on strict, so we allow authors to use
-        // it. However, it's deprecated in future versions of XHTML.
-        $r['img@name'] =
-        $r['a@name'] = new HTMLPurifier_AttrTransform_Name();
+		// @name for img, a -----------------------------------------------
+		// Technically, it's allowed even on strict, so we allow authors to use
+		// it. However, it's deprecated in future versions of XHTML.
+		$r['img@name'] =
+		$r['a@name'] = new HTMLPurifier_AttrTransform_Name();
 
-        return $r;
-    }
+		return $r;
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php

Indentation +14 added lines, -14 removed lines

@@ -3,21 +3,21 @@
 class HTMLPurifier_HTMLModule_Tidy_Proprietary extends HTMLPurifier_HTMLModule_Tidy
 {
 
-    public $name = 'Tidy_Proprietary';
-    public $defaultLevel = 'light';
+	public $name = 'Tidy_Proprietary';
+	public $defaultLevel = 'light';
 
-    public function makeFixes() {
-        $r = array();
-        $r['table@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['td@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['th@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['tr@background']    = new HTMLPurifier_AttrTransform_Background();
-        $r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
-        $r['table@height']     = new HTMLPurifier_AttrTransform_Length('height');
-        return $r;
-    }
+	public function makeFixes() {
+		$r = array();
+		$r['table@background'] = new HTMLPurifier_AttrTransform_Background();
+		$r['td@background']    = new HTMLPurifier_AttrTransform_Background();
+		$r['th@background']    = new HTMLPurifier_AttrTransform_Background();
+		$r['tr@background']    = new HTMLPurifier_AttrTransform_Background();
+		$r['thead@background'] = new HTMLPurifier_AttrTransform_Background();
+		$r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background();
+		$r['tbody@background'] = new HTMLPurifier_AttrTransform_Background();
+		$r['table@height']     = new HTMLPurifier_AttrTransform_Length('height');
+		return $r;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php

Indentation +12 added lines, -12 removed lines

@@ -2,20 +2,20 @@
 
 class HTMLPurifier_HTMLModule_Tidy_Strict extends HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4
 {
-    public $name = 'Tidy_Strict';
-    public $defaultLevel = 'light';
+	public $name = 'Tidy_Strict';
+	public $defaultLevel = 'light';
 
-    public function makeFixes() {
-        $r = parent::makeFixes();
-        $r['blockquote#content_model_type'] = 'strictblockquote';
-        return $r;
-    }
+	public function makeFixes() {
+		$r = parent::makeFixes();
+		$r['blockquote#content_model_type'] = 'strictblockquote';
+		return $r;
+	}
 
-    public $defines_child_def = true;
-    public function getChildDef($def) {
-        if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
-        return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
-    }
+	public $defines_child_def = true;
+	public function getChildDef($def) {
+		if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
+		return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +3 added lines, -1 removed lines

@@ -13,7 +13,9 @@
 
     public $defines_child_def = true;
     public function getChildDef($def) {
-        if ($def->content_model_type != 'strictblockquote') return parent::getChildDef($def);
+        if ($def->content_model_type != 'strictblockquote') {
+        	return parent::getChildDef($def);
+        }
         return new HTMLPurifier_ChildDef_StrictBlockquote($def->content_model);
     }
 }