xpressengine / xe-core

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

Indentation +152 added lines, -152 removed lines

@@ -3,158 +3,158 @@
 class HTMLPurifier_HTMLModule_Tidy_XHTMLAndHTML4 extends HTMLPurifier_HTMLModule_Tidy
 {
 
-    public function makeFixes() {
-
-        $r = array();
-
-        // == deprecated tag transforms ===================================
-
-        $r['font']   = new HTMLPurifier_TagTransform_Font();
-        $r['menu']   = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['dir']    = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['center'] = new HTMLPurifier_TagTransform_Simple('div',  'text-align:center;');
-        $r['u']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
-        $r['s']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-        $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
-
-        // == deprecated attribute transforms =============================
-
-        $r['caption@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                // we're following IE's behavior, not Firefox's, due
-                // to the fact that no one supports caption-side:right,
-                // W3C included (with CSS 2.1). This is a slightly
-                // unreasonable attribute!
-                'left'   => 'text-align:left;',
-                'right'  => 'text-align:right;',
-                'top'    => 'caption-side:top;',
-                'bottom' => 'caption-side:bottom;' // not supported by IE
-            ));
-
-        // @align for img -------------------------------------------------
-        $r['img@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                'left'   => 'float:left;',
-                'right'  => 'float:right;',
-                'top'    => 'vertical-align:top;',
-                'middle' => 'vertical-align:middle;',
-                'bottom' => 'vertical-align:baseline;',
-            ));
-
-        // @align for table -----------------------------------------------
-        $r['table@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                'left'   => 'float:left;',
-                'center' => 'margin-left:auto;margin-right:auto;',
-                'right'  => 'float:right;'
-            ));
-
-        // @align for hr -----------------------------------------------
-        $r['hr@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
-                // we use both text-align and margin because these work
-                // for different browsers (IE and Firefox, respectively)
-                // and the melange makes for a pretty cross-compatible
-                // solution
-                'left'   => 'margin-left:0;margin-right:auto;text-align:left;',
-                'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
-                'right'  => 'margin-left:auto;margin-right:0;text-align:right;'
-            ));
-
-        // @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
-        // {{{
-            $align_lookup = array();
-            $align_values = array('left', 'right', 'center', 'justify');
-            foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
-        // }}}
-        $r['h1@align'] =
-        $r['h2@align'] =
-        $r['h3@align'] =
-        $r['h4@align'] =
-        $r['h5@align'] =
-        $r['h6@align'] =
-        $r['p@align']  =
-        $r['div@align'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
-
-        // @bgcolor for table, tr, td, th ---------------------------------
-        $r['table@bgcolor'] =
-        $r['td@bgcolor'] =
-        $r['th@bgcolor'] =
-            new HTMLPurifier_AttrTransform_BgColor();
-
-        // @border for img ------------------------------------------------
-        $r['img@border'] = new HTMLPurifier_AttrTransform_Border();
-
-        // @clear for br --------------------------------------------------
-        $r['br@clear'] =
-            new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
-                'left'  => 'clear:left;',
-                'right' => 'clear:right;',
-                'all'   => 'clear:both;',
-                'none'  => 'clear:none;',
-            ));
-
-        // @height for td, th ---------------------------------------------
-        $r['td@height'] =
-        $r['th@height'] =
-            new HTMLPurifier_AttrTransform_Length('height');
-
-        // @hspace for img ------------------------------------------------
-        $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
-
-        // @noshade for hr ------------------------------------------------
-        // this transformation is not precise but often good enough.
-        // different browsers use different styles to designate noshade
-        $r['hr@noshade'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'noshade',
-                'color:#808080;background-color:#808080;border:0;'
-            );
-
-        // @nowrap for td, th ---------------------------------------------
-        $r['td@nowrap'] =
-        $r['th@nowrap'] =
-            new HTMLPurifier_AttrTransform_BoolToCSS(
-                'nowrap',
-                'white-space:nowrap;'
-            );
-
-        // @size for hr  --------------------------------------------------
-        $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
-
-        // @type for li, ol, ul -------------------------------------------
-        // {{{
-            $ul_types = array(
-                'disc'   => 'list-style-type:disc;',
-                'square' => 'list-style-type:square;',
-                'circle' => 'list-style-type:circle;'
-            );
-            $ol_types = array(
-                '1'   => 'list-style-type:decimal;',
-                'i'   => 'list-style-type:lower-roman;',
-                'I'   => 'list-style-type:upper-roman;',
-                'a'   => 'list-style-type:lower-alpha;',
-                'A'   => 'list-style-type:upper-alpha;'
-            );
-            $li_types = $ul_types + $ol_types;
-        // }}}
-
-        $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
-        $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
-        $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
-
-        // @vspace for img ------------------------------------------------
-        $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
-
-        // @width for hr, td, th ------------------------------------------
-        $r['td@width'] =
-        $r['th@width'] =
-        $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
-
-        return $r;
-
-    }
+	public function makeFixes() {
+
+		$r = array();
+
+		// == deprecated tag transforms ===================================
+
+		$r['font']   = new HTMLPurifier_TagTransform_Font();
+		$r['menu']   = new HTMLPurifier_TagTransform_Simple('ul');
+		$r['dir']    = new HTMLPurifier_TagTransform_Simple('ul');
+		$r['center'] = new HTMLPurifier_TagTransform_Simple('div',  'text-align:center;');
+		$r['u']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
+		$r['s']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+		$r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
+
+		// == deprecated attribute transforms =============================
+
+		$r['caption@align'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+				// we're following IE's behavior, not Firefox's, due
+				// to the fact that no one supports caption-side:right,
+				// W3C included (with CSS 2.1). This is a slightly
+				// unreasonable attribute!
+				'left'   => 'text-align:left;',
+				'right'  => 'text-align:right;',
+				'top'    => 'caption-side:top;',
+				'bottom' => 'caption-side:bottom;' // not supported by IE
+			));
+
+		// @align for img -------------------------------------------------
+		$r['img@align'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+				'left'   => 'float:left;',
+				'right'  => 'float:right;',
+				'top'    => 'vertical-align:top;',
+				'middle' => 'vertical-align:middle;',
+				'bottom' => 'vertical-align:baseline;',
+			));
+
+		// @align for table -----------------------------------------------
+		$r['table@align'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+				'left'   => 'float:left;',
+				'center' => 'margin-left:auto;margin-right:auto;',
+				'right'  => 'float:right;'
+			));
+
+		// @align for hr -----------------------------------------------
+		$r['hr@align'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
+				// we use both text-align and margin because these work
+				// for different browsers (IE and Firefox, respectively)
+				// and the melange makes for a pretty cross-compatible
+				// solution
+				'left'   => 'margin-left:0;margin-right:auto;text-align:left;',
+				'center' => 'margin-left:auto;margin-right:auto;text-align:center;',
+				'right'  => 'margin-left:auto;margin-right:0;text-align:right;'
+			));
+
+		// @align for h1, h2, h3, h4, h5, h6, p, div ----------------------
+		// {{{
+			$align_lookup = array();
+			$align_values = array('left', 'right', 'center', 'justify');
+			foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
+		// }}}
+		$r['h1@align'] =
+		$r['h2@align'] =
+		$r['h3@align'] =
+		$r['h4@align'] =
+		$r['h5@align'] =
+		$r['h6@align'] =
+		$r['p@align']  =
+		$r['div@align'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup);
+
+		// @bgcolor for table, tr, td, th ---------------------------------
+		$r['table@bgcolor'] =
+		$r['td@bgcolor'] =
+		$r['th@bgcolor'] =
+			new HTMLPurifier_AttrTransform_BgColor();
+
+		// @border for img ------------------------------------------------
+		$r['img@border'] = new HTMLPurifier_AttrTransform_Border();
+
+		// @clear for br --------------------------------------------------
+		$r['br@clear'] =
+			new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
+				'left'  => 'clear:left;',
+				'right' => 'clear:right;',
+				'all'   => 'clear:both;',
+				'none'  => 'clear:none;',
+			));
+
+		// @height for td, th ---------------------------------------------
+		$r['td@height'] =
+		$r['th@height'] =
+			new HTMLPurifier_AttrTransform_Length('height');
+
+		// @hspace for img ------------------------------------------------
+		$r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace');
+
+		// @noshade for hr ------------------------------------------------
+		// this transformation is not precise but often good enough.
+		// different browsers use different styles to designate noshade
+		$r['hr@noshade'] =
+			new HTMLPurifier_AttrTransform_BoolToCSS(
+				'noshade',
+				'color:#808080;background-color:#808080;border:0;'
+			);
+
+		// @nowrap for td, th ---------------------------------------------
+		$r['td@nowrap'] =
+		$r['th@nowrap'] =
+			new HTMLPurifier_AttrTransform_BoolToCSS(
+				'nowrap',
+				'white-space:nowrap;'
+			);
+
+		// @size for hr  --------------------------------------------------
+		$r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
+
+		// @type for li, ol, ul -------------------------------------------
+		// {{{
+			$ul_types = array(
+				'disc'   => 'list-style-type:disc;',
+				'square' => 'list-style-type:square;',
+				'circle' => 'list-style-type:circle;'
+			);
+			$ol_types = array(
+				'1'   => 'list-style-type:decimal;',
+				'i'   => 'list-style-type:lower-roman;',
+				'I'   => 'list-style-type:upper-roman;',
+				'a'   => 'list-style-type:lower-alpha;',
+				'A'   => 'list-style-type:upper-alpha;'
+			);
+			$li_types = $ul_types + $ol_types;
+		// }}}
+
+		$r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types);
+		$r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true);
+		$r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true);
+
+		// @vspace for img ------------------------------------------------
+		$r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
+
+		// @width for hr, td, th ------------------------------------------
+		$r['td@width'] =
+		$r['th@width'] =
+		$r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
+
+		return $r;
+
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
         $r['font']   = new HTMLPurifier_TagTransform_Font();
         $r['menu']   = new HTMLPurifier_TagTransform_Simple('ul');
         $r['dir']    = new HTMLPurifier_TagTransform_Simple('ul');
-        $r['center'] = new HTMLPurifier_TagTransform_Simple('div',  'text-align:center;');
+        $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;');
         $r['u']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;');
         $r['s']      = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');
         $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;');

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
         // {{{
             $align_lookup = array();
             $align_values = array('left', 'right', 'center', 'justify');
-            foreach ($align_values as $v) $align_lookup[$v] = "text-align:$v;";
+            foreach ($align_values as $v) {
+            	$align_lookup[$v] = "text-align:$v;";
+            }
         // }}}
         $r['h1@align'] =
         $r['h2@align'] =

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

Indentation +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@
 
 class HTMLPurifier_HTMLModule_XMLCommonAttributes extends HTMLPurifier_HTMLModule
 {
-    public $name = 'XMLCommonAttributes';
+	public $name = 'XMLCommonAttributes';
 
-    public $attr_collections = array(
-        'Lang' => array(
-            'xml:lang' => 'LanguageCode',
-        )
-    );
+	public $attr_collections = array(
+		'Lang' => array(
+			'xml:lang' => 'LanguageCode',
+		)
+	);
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php

Indentation +330 added lines, -330 removed lines

@@ -9,336 +9,336 @@
 class HTMLPurifier_Injector_AutoParagraph extends HTMLPurifier_Injector
 {
 
-    public $name = 'AutoParagraph';
-    public $needed = array('p');
-
-    private function _pStart() {
-        $par = new HTMLPurifier_Token_Start('p');
-        $par->armor['MakeWellFormed_TagClosedError'] = true;
-        return $par;
-    }
-
-    public function handleText(&$token) {
-        $text = $token->data;
-        // Does the current parent allow <p> tags?
-        if ($this->allowsElement('p')) {
-            if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
-                // Note that we have differing behavior when dealing with text
-                // in the anonymous root node, or a node inside the document.
-                // If the text as a double-newline, the treatment is the same;
-                // if it doesn't, see the next if-block if you're in the document.
-
-                $i = $nesting = null;
-                if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
-                    // State 1.1: ...    ^ (whitespace, then document end)
-                    //               ----
-                    // This is a degenerate case
-                } else {
-                    if (!$token->is_whitespace || $this->_isInline($current)) {
-                        // State 1.2: PAR1
-                        //            ----
-
-                        // State 1.3: PAR1\n\nPAR2
-                        //            ------------
-
-                        // State 1.4: <div>PAR1\n\nPAR2 (see State 2)
-                        //                 ------------
-                        $token = array($this->_pStart());
-                        $this->_splitText($text, $token);
-                    } else {
-                        // State 1.5: \n<hr />
-                        //            --
-                    }
-                }
-            } else {
-                // State 2:   <div>PAR1... (similar to 1.4)
-                //                 ----
-
-                // We're in an element that allows paragraph tags, but we're not
-                // sure if we're going to need them.
-                if ($this->_pLookAhead()) {
-                    // State 2.1: <div>PAR1<b>PAR1\n\nPAR2
-                    //                 ----
-                    // Note: This will always be the first child, since any
-                    // previous inline element would have triggered this very
-                    // same routine, and found the double newline. One possible
-                    // exception would be a comment.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 2.2.1: <div>PAR1<div>
-                    //                   ----
-
-                    // State 2.2.2: <div>PAR1<b>PAR1</b></div>
-                    //                   ----
-                }
-            }
-        // Is the current parent a <p> tag?
-        } elseif (
-            !empty($this->currentNesting) &&
-            $this->currentNesting[count($this->currentNesting)-1]->name == 'p'
-        ) {
-            // State 3.1: ...<p>PAR1
-            //                  ----
-
-            // State 3.2: ...<p>PAR1\n\nPAR2
-            //                  ------------
-            $token = array();
-            $this->_splitText($text, $token);
-        // Abort!
-        } else {
-            // State 4.1: ...<b>PAR1
-            //                  ----
-
-            // State 4.2: ...<b>PAR1\n\nPAR2
-            //                  ------------
-        }
-    }
-
-    public function handleElement(&$token) {
-        // We don't have to check if we're already in a <p> tag for block
-        // tokens, because the tag would have been autoclosed by MakeWellFormed.
-        if ($this->allowsElement('p')) {
-            if (!empty($this->currentNesting)) {
-                if ($this->_isInline($token)) {
-                    // State 1: <div>...<b>
-                    //                  ---
-
-                    // Check if this token is adjacent to the parent token
-                    // (seek backwards until token isn't whitespace)
-                    $i = null;
-                    $this->backward($i, $prev);
-
-                    if (!$prev instanceof HTMLPurifier_Token_Start) {
-                        // Token wasn't adjacent
-
-                        if (
-                            $prev instanceof HTMLPurifier_Token_Text &&
-                            substr($prev->data, -2) === "\n\n"
-                        ) {
-                            // State 1.1.4: <div><p>PAR1</p>\n\n<b>
-                            //                                  ---
-
-                            // Quite frankly, this should be handled by splitText
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.1.1: <div><p>PAR1</p><b>
-                            //                              ---
-
-                            // State 1.1.2: <div><br /><b>
-                            //                         ---
-
-                            // State 1.1.3: <div>PAR<b>
-                            //                      ---
-                        }
-
-                    } else {
-                        // State 1.2.1: <div><b>
-                        //                   ---
-
-                        // Lookahead to see if <p> is needed.
-                        if ($this->_pLookAhead()) {
-                            // State 1.3.1: <div><b>PAR1\n\nPAR2
-                            //                   ---
-                            $token = array($this->_pStart(), $token);
-                        } else {
-                            // State 1.3.2: <div><b>PAR1</b></div>
-                            //                   ---
-
-                            // State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
-                            //                   ---
-                        }
-                    }
-                } else {
-                    // State 2.3: ...<div>
-                    //               -----
-                }
-            } else {
-                if ($this->_isInline($token)) {
-                    // State 3.1: <b>
-                    //            ---
-                    // This is where the {p} tag is inserted, not reflected in
-                    // inputTokens yet, however.
-                    $token = array($this->_pStart(), $token);
-                } else {
-                    // State 3.2: <div>
-                    //            -----
-                }
-
-                $i = null;
-                if ($this->backward($i, $prev)) {
-                    if (
-                        !$prev instanceof HTMLPurifier_Token_Text
-                    ) {
-                        // State 3.1.1: ...</p>{p}<b>
-                        //                        ---
-
-                        // State 3.2.1: ...</p><div>
-                        //                     -----
-
-                        if (!is_array($token)) $token = array($token);
-                        array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
-                    } else {
-                        // State 3.1.2: ...</p>\n\n{p}<b>
-                        //                            ---
-
-                        // State 3.2.2: ...</p>\n\n<div>
-                        //                         -----
-
-                        // Note: PAR<ELEM> cannot occur because PAR would have been
-                        // wrapped in <p> tags.
-                    }
-                }
-            }
-        } else {
-            // State 2.2: <ul><li>
-            //                ----
-
-            // State 2.4: <p><b>
-            //               ---
-        }
-    }
-
-    /**
-     * Splits up a text in paragraph tokens and appends them
-     * to the result stream that will replace the original
-     * @param $data String text data that will be processed
-     *    into paragraphs
-     * @param $result Reference to array of tokens that the
-     *    tags will be appended onto
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     */
-    private function _splitText($data, &$result) {
-        $raw_paragraphs = explode("\n\n", $data);
-        $paragraphs  = array(); // without empty paragraphs
-        $needs_start = false;
-        $needs_end   = false;
-
-        $c = count($raw_paragraphs);
-        if ($c == 1) {
-            // There were no double-newlines, abort quickly. In theory this
-            // should never happen.
-            $result[] = new HTMLPurifier_Token_Text($data);
-            return;
-        }
-        for ($i = 0; $i < $c; $i++) {
-            $par = $raw_paragraphs[$i];
-            if (trim($par) !== '') {
-                $paragraphs[] = $par;
-            } else {
-                if ($i == 0) {
-                    // Double newline at the front
-                    if (empty($result)) {
-                        // The empty result indicates that the AutoParagraph
-                        // injector did not add any start paragraph tokens.
-                        // This means that we have been in a paragraph for
-                        // a while, and the newline means we should start a new one.
-                        $result[] = new HTMLPurifier_Token_End('p');
-                        $result[] = new HTMLPurifier_Token_Text("\n\n");
-                        // However, the start token should only be added if
-                        // there is more processing to be done (i.e. there are
-                        // real paragraphs in here). If there are none, the
-                        // next start paragraph tag will be handled by the
-                        // next call to the injector
-                        $needs_start = true;
-                    } else {
-                        // We just started a new paragraph!
-                        // Reinstate a double-newline for presentation's sake, since
-                        // it was in the source code.
-                        array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
-                    }
-                } elseif ($i + 1 == $c) {
-                    // Double newline at the end
-                    // There should be a trailing </p> when we're finally done.
-                    $needs_end = true;
-                }
-            }
-        }
-
-        // Check if this was just a giant blob of whitespace. Move this earlier,
-        // perhaps?
-        if (empty($paragraphs)) {
-            return;
-        }
-
-        // Add the start tag indicated by \n\n at the beginning of $data
-        if ($needs_start) {
-            $result[] = $this->_pStart();
-        }
-
-        // Append the paragraphs onto the result
-        foreach ($paragraphs as $par) {
-            $result[] = new HTMLPurifier_Token_Text($par);
-            $result[] = new HTMLPurifier_Token_End('p');
-            $result[] = new HTMLPurifier_Token_Text("\n\n");
-            $result[] = $this->_pStart();
-        }
-
-        // Remove trailing start token; Injector will handle this later if
-        // it was indeed needed. This prevents from needing to do a lookahead,
-        // at the cost of a lookbehind later.
-        array_pop($result);
-
-        // If there is no need for an end tag, remove all of it and let
-        // MakeWellFormed close it later.
-        if (!$needs_end) {
-            array_pop($result); // removes \n\n
-            array_pop($result); // removes </p>
-        }
-
-    }
-
-    /**
-     * Returns true if passed token is inline (and, ergo, allowed in
-     * paragraph tags)
-     */
-    private function _isInline($token) {
-        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
-    }
-
-    /**
-     * Looks ahead in the token list and determines whether or not we need
-     * to insert a <p> tag.
-     */
-    private function _pLookAhead() {
-        $this->current($i, $current);
-        if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
-        else $nesting = 0;
-        $ok = false;
-        while ($this->forwardUntilEndToken($i, $current, $nesting)) {
-            $result = $this->_checkNeedsP($current);
-            if ($result !== null) {
-                $ok = $result;
-                break;
-            }
-        }
-        return $ok;
-    }
-
-    /**
-     * Determines if a particular token requires an earlier inline token
-     * to get a paragraph. This should be used with _forwardUntilEndToken
-     */
-    private function _checkNeedsP($current) {
-        if ($current instanceof HTMLPurifier_Token_Start){
-            if (!$this->_isInline($current)) {
-                // <div>PAR1<div>
-                //      ----
-                // Terminate early, since we hit a block element
-                return false;
-            }
-        } elseif ($current instanceof HTMLPurifier_Token_Text) {
-            if (strpos($current->data, "\n\n") !== false) {
-                // <div>PAR1<b>PAR1\n\nPAR2
-                //      ----
-                return true;
-            } else {
-                // <div>PAR1<b>PAR1...
-                //      ----
-            }
-        }
-        return null;
-    }
+	public $name = 'AutoParagraph';
+	public $needed = array('p');
+
+	private function _pStart() {
+		$par = new HTMLPurifier_Token_Start('p');
+		$par->armor['MakeWellFormed_TagClosedError'] = true;
+		return $par;
+	}
+
+	public function handleText(&$token) {
+		$text = $token->data;
+		// Does the current parent allow <p> tags?
+		if ($this->allowsElement('p')) {
+			if (empty($this->currentNesting) || strpos($text, "\n\n") !== false) {
+				// Note that we have differing behavior when dealing with text
+				// in the anonymous root node, or a node inside the document.
+				// If the text as a double-newline, the treatment is the same;
+				// if it doesn't, see the next if-block if you're in the document.
+
+				$i = $nesting = null;
+				if (!$this->forwardUntilEndToken($i, $current, $nesting) && $token->is_whitespace) {
+					// State 1.1: ...    ^ (whitespace, then document end)
+					//               ----
+					// This is a degenerate case
+				} else {
+					if (!$token->is_whitespace || $this->_isInline($current)) {
+						// State 1.2: PAR1
+						//            ----
+
+						// State 1.3: PAR1\n\nPAR2
+						//            ------------
+
+						// State 1.4: <div>PAR1\n\nPAR2 (see State 2)
+						//                 ------------
+						$token = array($this->_pStart());
+						$this->_splitText($text, $token);
+					} else {
+						// State 1.5: \n<hr />
+						//            --
+					}
+				}
+			} else {
+				// State 2:   <div>PAR1... (similar to 1.4)
+				//                 ----
+
+				// We're in an element that allows paragraph tags, but we're not
+				// sure if we're going to need them.
+				if ($this->_pLookAhead()) {
+					// State 2.1: <div>PAR1<b>PAR1\n\nPAR2
+					//                 ----
+					// Note: This will always be the first child, since any
+					// previous inline element would have triggered this very
+					// same routine, and found the double newline. One possible
+					// exception would be a comment.
+					$token = array($this->_pStart(), $token);
+				} else {
+					// State 2.2.1: <div>PAR1<div>
+					//                   ----
+
+					// State 2.2.2: <div>PAR1<b>PAR1</b></div>
+					//                   ----
+				}
+			}
+		// Is the current parent a <p> tag?
+		} elseif (
+			!empty($this->currentNesting) &&
+			$this->currentNesting[count($this->currentNesting)-1]->name == 'p'
+		) {
+			// State 3.1: ...<p>PAR1
+			//                  ----
+
+			// State 3.2: ...<p>PAR1\n\nPAR2
+			//                  ------------
+			$token = array();
+			$this->_splitText($text, $token);
+		// Abort!
+		} else {
+			// State 4.1: ...<b>PAR1
+			//                  ----
+
+			// State 4.2: ...<b>PAR1\n\nPAR2
+			//                  ------------
+		}
+	}
+
+	public function handleElement(&$token) {
+		// We don't have to check if we're already in a <p> tag for block
+		// tokens, because the tag would have been autoclosed by MakeWellFormed.
+		if ($this->allowsElement('p')) {
+			if (!empty($this->currentNesting)) {
+				if ($this->_isInline($token)) {
+					// State 1: <div>...<b>
+					//                  ---
+
+					// Check if this token is adjacent to the parent token
+					// (seek backwards until token isn't whitespace)
+					$i = null;
+					$this->backward($i, $prev);
+
+					if (!$prev instanceof HTMLPurifier_Token_Start) {
+						// Token wasn't adjacent
+
+						if (
+							$prev instanceof HTMLPurifier_Token_Text &&
+							substr($prev->data, -2) === "\n\n"
+						) {
+							// State 1.1.4: <div><p>PAR1</p>\n\n<b>
+							//                                  ---
+
+							// Quite frankly, this should be handled by splitText
+							$token = array($this->_pStart(), $token);
+						} else {
+							// State 1.1.1: <div><p>PAR1</p><b>
+							//                              ---
+
+							// State 1.1.2: <div><br /><b>
+							//                         ---
+
+							// State 1.1.3: <div>PAR<b>
+							//                      ---
+						}
+
+					} else {
+						// State 1.2.1: <div><b>
+						//                   ---
+
+						// Lookahead to see if <p> is needed.
+						if ($this->_pLookAhead()) {
+							// State 1.3.1: <div><b>PAR1\n\nPAR2
+							//                   ---
+							$token = array($this->_pStart(), $token);
+						} else {
+							// State 1.3.2: <div><b>PAR1</b></div>
+							//                   ---
+
+							// State 1.3.3: <div><b>PAR1</b><div></div>\n\n</div>
+							//                   ---
+						}
+					}
+				} else {
+					// State 2.3: ...<div>
+					//               -----
+				}
+			} else {
+				if ($this->_isInline($token)) {
+					// State 3.1: <b>
+					//            ---
+					// This is where the {p} tag is inserted, not reflected in
+					// inputTokens yet, however.
+					$token = array($this->_pStart(), $token);
+				} else {
+					// State 3.2: <div>
+					//            -----
+				}
+
+				$i = null;
+				if ($this->backward($i, $prev)) {
+					if (
+						!$prev instanceof HTMLPurifier_Token_Text
+					) {
+						// State 3.1.1: ...</p>{p}<b>
+						//                        ---
+
+						// State 3.2.1: ...</p><div>
+						//                     -----
+
+						if (!is_array($token)) $token = array($token);
+						array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
+					} else {
+						// State 3.1.2: ...</p>\n\n{p}<b>
+						//                            ---
+
+						// State 3.2.2: ...</p>\n\n<div>
+						//                         -----
+
+						// Note: PAR<ELEM> cannot occur because PAR would have been
+						// wrapped in <p> tags.
+					}
+				}
+			}
+		} else {
+			// State 2.2: <ul><li>
+			//                ----
+
+			// State 2.4: <p><b>
+			//               ---
+		}
+	}
+
+	/**
+	 * Splits up a text in paragraph tokens and appends them
+	 * to the result stream that will replace the original
+	 * @param $data String text data that will be processed
+	 *    into paragraphs
+	 * @param $result Reference to array of tokens that the
+	 *    tags will be appended onto
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 */
+	private function _splitText($data, &$result) {
+		$raw_paragraphs = explode("\n\n", $data);
+		$paragraphs  = array(); // without empty paragraphs
+		$needs_start = false;
+		$needs_end   = false;
+
+		$c = count($raw_paragraphs);
+		if ($c == 1) {
+			// There were no double-newlines, abort quickly. In theory this
+			// should never happen.
+			$result[] = new HTMLPurifier_Token_Text($data);
+			return;
+		}
+		for ($i = 0; $i < $c; $i++) {
+			$par = $raw_paragraphs[$i];
+			if (trim($par) !== '') {
+				$paragraphs[] = $par;
+			} else {
+				if ($i == 0) {
+					// Double newline at the front
+					if (empty($result)) {
+						// The empty result indicates that the AutoParagraph
+						// injector did not add any start paragraph tokens.
+						// This means that we have been in a paragraph for
+						// a while, and the newline means we should start a new one.
+						$result[] = new HTMLPurifier_Token_End('p');
+						$result[] = new HTMLPurifier_Token_Text("\n\n");
+						// However, the start token should only be added if
+						// there is more processing to be done (i.e. there are
+						// real paragraphs in here). If there are none, the
+						// next start paragraph tag will be handled by the
+						// next call to the injector
+						$needs_start = true;
+					} else {
+						// We just started a new paragraph!
+						// Reinstate a double-newline for presentation's sake, since
+						// it was in the source code.
+						array_unshift($result, new HTMLPurifier_Token_Text("\n\n"));
+					}
+				} elseif ($i + 1 == $c) {
+					// Double newline at the end
+					// There should be a trailing </p> when we're finally done.
+					$needs_end = true;
+				}
+			}
+		}
+
+		// Check if this was just a giant blob of whitespace. Move this earlier,
+		// perhaps?
+		if (empty($paragraphs)) {
+			return;
+		}
+
+		// Add the start tag indicated by \n\n at the beginning of $data
+		if ($needs_start) {
+			$result[] = $this->_pStart();
+		}
+
+		// Append the paragraphs onto the result
+		foreach ($paragraphs as $par) {
+			$result[] = new HTMLPurifier_Token_Text($par);
+			$result[] = new HTMLPurifier_Token_End('p');
+			$result[] = new HTMLPurifier_Token_Text("\n\n");
+			$result[] = $this->_pStart();
+		}
+
+		// Remove trailing start token; Injector will handle this later if
+		// it was indeed needed. This prevents from needing to do a lookahead,
+		// at the cost of a lookbehind later.
+		array_pop($result);
+
+		// If there is no need for an end tag, remove all of it and let
+		// MakeWellFormed close it later.
+		if (!$needs_end) {
+			array_pop($result); // removes \n\n
+			array_pop($result); // removes </p>
+		}
+
+	}
+
+	/**
+	 * Returns true if passed token is inline (and, ergo, allowed in
+	 * paragraph tags)
+	 */
+	private function _isInline($token) {
+		return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
+	}
+
+	/**
+	 * Looks ahead in the token list and determines whether or not we need
+	 * to insert a <p> tag.
+	 */
+	private function _pLookAhead() {
+		$this->current($i, $current);
+		if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
+		else $nesting = 0;
+		$ok = false;
+		while ($this->forwardUntilEndToken($i, $current, $nesting)) {
+			$result = $this->_checkNeedsP($current);
+			if ($result !== null) {
+				$ok = $result;
+				break;
+			}
+		}
+		return $ok;
+	}
+
+	/**
+	 * Determines if a particular token requires an earlier inline token
+	 * to get a paragraph. This should be used with _forwardUntilEndToken
+	 */
+	private function _checkNeedsP($current) {
+		if ($current instanceof HTMLPurifier_Token_Start){
+			if (!$this->_isInline($current)) {
+				// <div>PAR1<div>
+				//      ----
+				// Terminate early, since we hit a block element
+				return false;
+			}
+		} elseif ($current instanceof HTMLPurifier_Token_Text) {
+			if (strpos($current->data, "\n\n") !== false) {
+				// <div>PAR1<b>PAR1\n\nPAR2
+				//      ----
+				return true;
+			} else {
+				// <div>PAR1<b>PAR1...
+				//      ----
+			}
+		}
+		return null;
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
         // Is the current parent a <p> tag?
         } elseif (
             !empty($this->currentNesting) &&
-            $this->currentNesting[count($this->currentNesting)-1]->name == 'p'
+            $this->currentNesting[count($this->currentNesting) - 1]->name == 'p'
         ) {
             // State 3.1: ...<p>PAR1
             //                  ----
@@ -320,7 +320,7 @@ 
      * to get a paragraph. This should be used with _forwardUntilEndToken
      */
     private function _checkNeedsP($current) {
-        if ($current instanceof HTMLPurifier_Token_Start){
+        if ($current instanceof HTMLPurifier_Token_Start) {
             if (!$this->_isInline($current)) {
                 // <div>PAR1<div>
                 //      ----

Braces +8 added lines, -3 removed lines

@@ -175,7 +175,9 @@ 
                         // State 3.2.1: ...</p><div>
                         //                     -----
 
-                        if (!is_array($token)) $token = array($token);
+                        if (!is_array($token)) {
+                        	$token = array($token);
+                        }
                         array_unshift($token, new HTMLPurifier_Token_Text("\n\n"));
                     } else {
                         // State 3.1.2: ...</p>\n\n{p}<b>
@@ -302,8 +304,11 @@ 
      */
     private function _pLookAhead() {
         $this->current($i, $current);
-        if ($current instanceof HTMLPurifier_Token_Start) $nesting = 1;
-        else $nesting = 0;
+        if ($current instanceof HTMLPurifier_Token_Start) {
+        	$nesting = 1;
+        } else {
+        	$nesting = 0;
+        }
         $ok = false;
         while ($this->forwardUntilEndToken($i, $current, $nesting)) {
             $result = $this->_checkNeedsP($current);

classes/security/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php

Indentation +13 added lines, -13 removed lines

@@ -6,21 +6,21 @@
 class HTMLPurifier_Injector_DisplayLinkURI extends HTMLPurifier_Injector
 {
 
-    public $name = 'DisplayLinkURI';
-    public $needed = array('a');
+	public $name = 'DisplayLinkURI';
+	public $needed = array('a');
 
-    public function handleElement(&$token) {
-    }
+	public function handleElement(&$token) {
+	}
 
-    public function handleEnd(&$token) {
-        if (isset($token->start->attr['href'])){
-            $url = $token->start->attr['href'];
-            unset($token->start->attr['href']);
-            $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
-        } else {
-            // nothing to display
-        }
-    }
+	public function handleEnd(&$token) {
+		if (isset($token->start->attr['href'])){
+			$url = $token->start->attr['href'];
+			unset($token->start->attr['href']);
+			$token = array($token, new HTMLPurifier_Token_Text(" ($url)"));
+		} else {
+			// nothing to display
+		}
+	}
 }
 
 // vim: et sw=4 sts=4

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     }
 
     public function handleEnd(&$token) {
-        if (isset($token->start->attr['href'])){
+        if (isset($token->start->attr['href'])) {
             $url = $token->start->attr['href'];
             unset($token->start->attr['href']);
             $token = array($token, new HTMLPurifier_Token_Text(" ($url)"));

classes/security/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php

Indentation +34 added lines, -34 removed lines

@@ -6,40 +6,40 @@
 class HTMLPurifier_Injector_Linkify extends HTMLPurifier_Injector
 {
 
-    public $name = 'Linkify';
-    public $needed = array('a' => array('href'));
-
-    public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
-
-        if (strpos($token->data, '://') === false) {
-            // our really quick heuristic failed, abort
-            // this may not work so well if we want to match things like
-            // "google.com", but then again, most people don't
-            return;
-        }
-
-        // there is/are URL(s). Let's split the string:
-        // Note: this regex is extremely permissive
-        $bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') continue;
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-
-    }
+	public $name = 'Linkify';
+	public $needed = array('a' => array('href'));
+
+	public function handleText(&$token) {
+		if (!$this->allowsElement('a')) return;
+
+		if (strpos($token->data, '://') === false) {
+			// our really quick heuristic failed, abort
+			// this may not work so well if we want to match things like
+			// "google.com", but then again, most people don't
+			return;
+		}
+
+		// there is/are URL(s). Let's split the string:
+		// Note: this regex is extremely permissive
+		$bits = preg_split('#((?:https?|ftp)://[^\s\'"<>()]+)#S', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+		$token = array();
+
+		// $i = index
+		// $c = count
+		// $l = is link
+		for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+			if (!$l) {
+				if ($bits[$i] === '') continue;
+				$token[] = new HTMLPurifier_Token_Text($bits[$i]);
+			} else {
+				$token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));
+				$token[] = new HTMLPurifier_Token_Text($bits[$i]);
+				$token[] = new HTMLPurifier_Token_End('a');
+			}
+		}
+
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -10,7 +10,9 @@ 
     public $needed = array('a' => array('href'));
 
     public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
+        if (!$this->allowsElement('a')) {
+        	return;
+        }
 
         if (strpos($token->data, '://') === false) {
             // our really quick heuristic failed, abort
@@ -30,7 +32,9 @@ 
         // $l = is link
         for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
             if (!$l) {
-                if ($bits[$i] === '') continue;
+                if ($bits[$i] === '') {
+                	continue;
+                }
                 $token[] = new HTMLPurifier_Token_Text($bits[$i]);
             } else {
                 $token[] = new HTMLPurifier_Token_Start('a', array('href' => $bits[$i]));

classes/security/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php

Indentation +32 added lines, -32 removed lines

@@ -7,38 +7,38 @@
 class HTMLPurifier_Injector_PurifierLinkify extends HTMLPurifier_Injector
 {
 
-    public $name = 'PurifierLinkify';
-    public $docURL;
-    public $needed = array('a' => array('href'));
-
-    public function prepare($config, $context) {
-        $this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
-        return parent::prepare($config, $context);
-    }
-
-    public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
-        if (strpos($token->data, '%') === false) return;
-
-        $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $token = array();
-
-        // $i = index
-        // $c = count
-        // $l = is link
-        for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
-            if (!$l) {
-                if ($bits[$i] === '') continue;
-                $token[] = new HTMLPurifier_Token_Text($bits[$i]);
-            } else {
-                $token[] = new HTMLPurifier_Token_Start('a',
-                    array('href' => str_replace('%s', $bits[$i], $this->docURL)));
-                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
-                $token[] = new HTMLPurifier_Token_End('a');
-            }
-        }
-
-    }
+	public $name = 'PurifierLinkify';
+	public $docURL;
+	public $needed = array('a' => array('href'));
+
+	public function prepare($config, $context) {
+		$this->docURL = $config->get('AutoFormat.PurifierLinkify.DocURL');
+		return parent::prepare($config, $context);
+	}
+
+	public function handleText(&$token) {
+		if (!$this->allowsElement('a')) return;
+		if (strpos($token->data, '%') === false) return;
+
+		$bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$token = array();
+
+		// $i = index
+		// $c = count
+		// $l = is link
+		for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
+			if (!$l) {
+				if ($bits[$i] === '') continue;
+				$token[] = new HTMLPurifier_Token_Text($bits[$i]);
+			} else {
+				$token[] = new HTMLPurifier_Token_Start('a',
+					array('href' => str_replace('%s', $bits[$i], $this->docURL)));
+				$token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
+				$token[] = new HTMLPurifier_Token_End('a');
+			}
+		}
+
+	}
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -17,8 +17,12 @@ 
     }
 
     public function handleText(&$token) {
-        if (!$this->allowsElement('a')) return;
-        if (strpos($token->data, '%') === false) return;
+        if (!$this->allowsElement('a')) {
+        	return;
+        }
+        if (strpos($token->data, '%') === false) {
+        	return;
+        }
 
         $bits = preg_split('#%([a-z0-9]+\.[a-z0-9]+)#Si', $token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
         $token = array();
@@ -28,7 +32,9 @@ 
         // $l = is link
         for ($i = 0, $c = count($bits), $l = false; $i < $c; $i++, $l = !$l) {
             if (!$l) {
-                if ($bits[$i] === '') continue;
+                if ($bits[$i] === '') {
+                	continue;
+                }
                 $token[] = new HTMLPurifier_Token_Text($bits[$i]);
             } else {
                 $token[] = new HTMLPurifier_Token_Start('a',

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             } else {
                 $token[] = new HTMLPurifier_Token_Start('a',
                     array('href' => str_replace('%s', $bits[$i], $this->docURL)));
-                $token[] = new HTMLPurifier_Token_Text('%' . $bits[$i]);
+                $token[] = new HTMLPurifier_Token_Text('%'.$bits[$i]);
                 $token[] = new HTMLPurifier_Token_End('a');
             }
         }

classes/security/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php

Indentation +40 added lines, -40 removed lines

@@ -3,48 +3,48 @@
 class HTMLPurifier_Injector_RemoveEmpty extends HTMLPurifier_Injector
 {
 
-    private $context, $config, $attrValidator, $removeNbsp, $removeNbspExceptions;
+	private $context, $config, $attrValidator, $removeNbsp, $removeNbspExceptions;
 
-    public function prepare($config, $context) {
-        parent::prepare($config, $context);
-        $this->config = $config;
-        $this->context = $context;
-        $this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
-        $this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
-        $this->attrValidator = new HTMLPurifier_AttrValidator();
-    }
+	public function prepare($config, $context) {
+		parent::prepare($config, $context);
+		$this->config = $config;
+		$this->context = $context;
+		$this->removeNbsp = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp');
+		$this->removeNbspExceptions = $config->get('AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions');
+		$this->attrValidator = new HTMLPurifier_AttrValidator();
+	}
 
-    public function handleElement(&$token) {
-        if (!$token instanceof HTMLPurifier_Token_Start) return;
-        $next = false;
-        for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
-            $next = $this->inputTokens[$i];
-            if ($next instanceof HTMLPurifier_Token_Text) {
-                if ($next->is_whitespace) continue;
-                if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
-                    $plain = str_replace("\xC2\xA0", "", $next->data);
-                    $isWsOrNbsp = $plain === '' || ctype_space($plain);
-                    if ($isWsOrNbsp) continue;
-                }
-            }
-            break;
-        }
-        if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
-            if ($token->name == 'colgroup') return;
-            $this->attrValidator->validateToken($token, $this->config, $this->context);
-            $token->armor['ValidateAttributes'] = true;
-            if (isset($token->attr['id']) || isset($token->attr['name'])) return;
-            $token = $i - $this->inputIndex + 1;
-            for ($b = $this->inputIndex - 1; $b > 0; $b--) {
-                $prev = $this->inputTokens[$b];
-                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
-                break;
-            }
-            // This is safe because we removed the token that triggered this.
-            $this->rewind($b - 1);
-            return;
-        }
-    }
+	public function handleElement(&$token) {
+		if (!$token instanceof HTMLPurifier_Token_Start) return;
+		$next = false;
+		for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
+			$next = $this->inputTokens[$i];
+			if ($next instanceof HTMLPurifier_Token_Text) {
+				if ($next->is_whitespace) continue;
+				if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
+					$plain = str_replace("\xC2\xA0", "", $next->data);
+					$isWsOrNbsp = $plain === '' || ctype_space($plain);
+					if ($isWsOrNbsp) continue;
+				}
+			}
+			break;
+		}
+		if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
+			if ($token->name == 'colgroup') return;
+			$this->attrValidator->validateToken($token, $this->config, $this->context);
+			$token->armor['ValidateAttributes'] = true;
+			if (isset($token->attr['id']) || isset($token->attr['name'])) return;
+			$token = $i - $this->inputIndex + 1;
+			for ($b = $this->inputIndex - 1; $b > 0; $b--) {
+				$prev = $this->inputTokens[$b];
+				if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
+				break;
+			}
+			// This is safe because we removed the token that triggered this.
+			$this->rewind($b - 1);
+			return;
+		}
+	}
 
 }
 

Braces +18 added lines, -6 removed lines

@@ -15,29 +15,41 @@
     }
 
     public function handleElement(&$token) {
-        if (!$token instanceof HTMLPurifier_Token_Start) return;
+        if (!$token instanceof HTMLPurifier_Token_Start) {
+        	return;
+        }
         $next = false;
         for ($i = $this->inputIndex + 1, $c = count($this->inputTokens); $i < $c; $i++) {
             $next = $this->inputTokens[$i];
             if ($next instanceof HTMLPurifier_Token_Text) {
-                if ($next->is_whitespace) continue;
+                if ($next->is_whitespace) {
+                	continue;
+                }
                 if ($this->removeNbsp && !isset($this->removeNbspExceptions[$token->name])) {
                     $plain = str_replace("\xC2\xA0", "", $next->data);
                     $isWsOrNbsp = $plain === '' || ctype_space($plain);
-                    if ($isWsOrNbsp) continue;
+                    if ($isWsOrNbsp) {
+                    	continue;
+                    }
                 }
             }
             break;
         }
         if (!$next || ($next instanceof HTMLPurifier_Token_End && $next->name == $token->name)) {
-            if ($token->name == 'colgroup') return;
+            if ($token->name == 'colgroup') {
+            	return;
+            }
             $this->attrValidator->validateToken($token, $this->config, $this->context);
             $token->armor['ValidateAttributes'] = true;
-            if (isset($token->attr['id']) || isset($token->attr['name'])) return;
+            if (isset($token->attr['id']) || isset($token->attr['name'])) {
+            	return;
+            }
             $token = $i - $this->inputIndex + 1;
             for ($b = $this->inputIndex - 1; $b > 0; $b--) {
                 $prev = $this->inputTokens[$b];
-                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) continue;
+                if ($prev instanceof HTMLPurifier_Token_Text && $prev->is_whitespace) {
+                	continue;
+                }
                 break;
             }
             // This is safe because we removed the token that triggered this.

classes/security/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php

Indentation +50 added lines, -50 removed lines

@@ -5,56 +5,56 @@
  */
 class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_Injector
 {
-    public $name = 'RemoveSpansWithoutAttributes';
-    public $needed = array('span');
-
-    private $attrValidator;
-
-    /**
-     * Used by AttrValidator
-     */
-    private $config;
-    private $context;
-
-    public function prepare($config, $context) {
-        $this->attrValidator = new HTMLPurifier_AttrValidator();
-        $this->config = $config;
-        $this->context = $context;
-        return parent::prepare($config, $context);
-    }
-
-    public function handleElement(&$token) {
-        if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
-            return;
-        }
-
-        // We need to validate the attributes now since this doesn't normally
-        // happen until after MakeWellFormed. If all the attributes are removed
-        // the span needs to be removed too.
-        $this->attrValidator->validateToken($token, $this->config, $this->context);
-        $token->armor['ValidateAttributes'] = true;
-
-        if (!empty($token->attr)) {
-            return;
-        }
-
-        $nesting = 0;
-        $spanContentTokens = array();
-        while ($this->forwardUntilEndToken($i, $current, $nesting)) {}
-
-        if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
-            // Mark closing span tag for deletion
-            $current->markForDeletion = true;
-            // Delete open span tag
-            $token = false;
-        }
-    }
-
-    public function handleEnd(&$token) {
-        if ($token->markForDeletion) {
-            $token = false;
-        }
-    }
+	public $name = 'RemoveSpansWithoutAttributes';
+	public $needed = array('span');
+
+	private $attrValidator;
+
+	/**
+	 * Used by AttrValidator
+	 */
+	private $config;
+	private $context;
+
+	public function prepare($config, $context) {
+		$this->attrValidator = new HTMLPurifier_AttrValidator();
+		$this->config = $config;
+		$this->context = $context;
+		return parent::prepare($config, $context);
+	}
+
+	public function handleElement(&$token) {
+		if ($token->name !== 'span' || !$token instanceof HTMLPurifier_Token_Start) {
+			return;
+		}
+
+		// We need to validate the attributes now since this doesn't normally
+		// happen until after MakeWellFormed. If all the attributes are removed
+		// the span needs to be removed too.
+		$this->attrValidator->validateToken($token, $this->config, $this->context);
+		$token->armor['ValidateAttributes'] = true;
+
+		if (!empty($token->attr)) {
+			return;
+		}
+
+		$nesting = 0;
+		$spanContentTokens = array();
+		while ($this->forwardUntilEndToken($i, $current, $nesting)) {}
+
+		if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
+			// Mark closing span tag for deletion
+			$current->markForDeletion = true;
+			// Delete open span tag
+			$token = false;
+		}
+	}
+
+	public function handleEnd(&$token) {
+		if ($token->markForDeletion) {
+			$token = false;
+		}
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php

Indentation +74 added lines, -74 removed lines

@@ -6,85 +6,85 @@
  */
 class HTMLPurifier_Injector_SafeObject extends HTMLPurifier_Injector
 {
-    public $name = 'SafeObject';
-    public $needed = array('object', 'param');
+	public $name = 'SafeObject';
+	public $needed = array('object', 'param');
 
-    protected $objectStack = array();
-    protected $paramStack  = array();
+	protected $objectStack = array();
+	protected $paramStack  = array();
 
-    // Keep this synchronized with AttrTransform/SafeParam.php
-    protected $addParam = array(
-        'allowScriptAccess' => 'never',
-        'allowNetworking' => 'internal',
-    );
-    protected $allowedParam = array(
-        'wmode' => true,
-        'movie' => true,
-        'flashvars' => true,
-        'src' => true,
-        'allowFullScreen' => true, // if omitted, assume to be 'false'
-    );
+	// Keep this synchronized with AttrTransform/SafeParam.php
+	protected $addParam = array(
+		'allowScriptAccess' => 'never',
+		'allowNetworking' => 'internal',
+	);
+	protected $allowedParam = array(
+		'wmode' => true,
+		'movie' => true,
+		'flashvars' => true,
+		'src' => true,
+		'allowFullScreen' => true, // if omitted, assume to be 'false'
+	);
 
-    public function prepare($config, $context) {
-        parent::prepare($config, $context);
-    }
+	public function prepare($config, $context) {
+		parent::prepare($config, $context);
+	}
 
-    public function handleElement(&$token) {
-        if ($token->name == 'object') {
-            $this->objectStack[] = $token;
-            $this->paramStack[] = array();
-            $new = array($token);
-            foreach ($this->addParam as $name => $value) {
-                $new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
-            }
-            $token = $new;
-        } elseif ($token->name == 'param') {
-            $nest = count($this->currentNesting) - 1;
-            if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
-                $i = count($this->objectStack) - 1;
-                if (!isset($token->attr['name'])) {
-                    $token = false;
-                    return;
-                }
-                $n = $token->attr['name'];
-                // We need this fix because YouTube doesn't supply a data
-                // attribute, which we need if a type is specified. This is
-                // *very* Flash specific.
-                if (!isset($this->objectStack[$i]->attr['data']) &&
-                    ($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')) {
-                    $this->objectStack[$i]->attr['data'] = $token->attr['value'];
-                }
-                // Check if the parameter is the correct value but has not
-                // already been added
-                if (
-                    !isset($this->paramStack[$i][$n]) &&
-                    isset($this->addParam[$n]) &&
-                    $token->attr['name'] === $this->addParam[$n]
-                ) {
-                    // keep token, and add to param stack
-                    $this->paramStack[$i][$n] = true;
-                } elseif (isset($this->allowedParam[$n])) {
-                    // keep token, don't do anything to it
-                    // (could possibly check for duplicates here)
-                } else {
-                    $token = false;
-                }
-            } else {
-                // not directly inside an object, DENY!
-                $token = false;
-            }
-        }
-    }
+	public function handleElement(&$token) {
+		if ($token->name == 'object') {
+			$this->objectStack[] = $token;
+			$this->paramStack[] = array();
+			$new = array($token);
+			foreach ($this->addParam as $name => $value) {
+				$new[] = new HTMLPurifier_Token_Empty('param', array('name' => $name, 'value' => $value));
+			}
+			$token = $new;
+		} elseif ($token->name == 'param') {
+			$nest = count($this->currentNesting) - 1;
+			if ($nest >= 0 && $this->currentNesting[$nest]->name === 'object') {
+				$i = count($this->objectStack) - 1;
+				if (!isset($token->attr['name'])) {
+					$token = false;
+					return;
+				}
+				$n = $token->attr['name'];
+				// We need this fix because YouTube doesn't supply a data
+				// attribute, which we need if a type is specified. This is
+				// *very* Flash specific.
+				if (!isset($this->objectStack[$i]->attr['data']) &&
+					($token->attr['name'] == 'movie' || $token->attr['name'] == 'src')) {
+					$this->objectStack[$i]->attr['data'] = $token->attr['value'];
+				}
+				// Check if the parameter is the correct value but has not
+				// already been added
+				if (
+					!isset($this->paramStack[$i][$n]) &&
+					isset($this->addParam[$n]) &&
+					$token->attr['name'] === $this->addParam[$n]
+				) {
+					// keep token, and add to param stack
+					$this->paramStack[$i][$n] = true;
+				} elseif (isset($this->allowedParam[$n])) {
+					// keep token, don't do anything to it
+					// (could possibly check for duplicates here)
+				} else {
+					$token = false;
+				}
+			} else {
+				// not directly inside an object, DENY!
+				$token = false;
+			}
+		}
+	}
 
-    public function handleEnd(&$token) {
-        // This is the WRONG way of handling the object and param stacks;
-        // we should be inserting them directly on the relevant object tokens
-        // so that the global stack handling handles it.
-        if ($token->name == 'object') {
-            array_pop($this->objectStack);
-            array_pop($this->paramStack);
-        }
-    }
+	public function handleEnd(&$token) {
+		// This is the WRONG way of handling the object and param stacks;
+		// we should be inserting them directly on the relevant object tokens
+		// so that the global stack handling handles it.
+		if ($token->name == 'object') {
+			array_pop($this->objectStack);
+			array_pop($this->paramStack);
+		}
+	}
 
 }