xpressengine / xe-core

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

Indentation +18 added lines, -18 removed lines

@@ -6,25 +6,25 @@
 class HTMLPurifier_HTMLModule_Hypertext extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Hypertext';
+	public $name = 'Hypertext';
 
-    public function setup($config) {
-        $a = $this->addElement(
-            'a', 'Inline', 'Inline', 'Common',
-            array(
-                // 'accesskey' => 'Character',
-                // 'charset' => 'Charset',
-                'href' => 'URI',
-                // 'hreflang' => 'LanguageCode',
-                'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
-                'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
-                // 'tabindex' => 'Number',
-                // 'type' => 'ContentType',
-            )
-        );
-        $a->formatting = true;
-        $a->excludes = array('a' => true);
-    }
+	public function setup($config) {
+		$a = $this->addElement(
+			'a', 'Inline', 'Inline', 'Common',
+			array(
+				// 'accesskey' => 'Character',
+				// 'charset' => 'Charset',
+				'href' => 'URI',
+				// 'hreflang' => 'LanguageCode',
+				'rel' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rel'),
+				'rev' => new HTMLPurifier_AttrDef_HTML_LinkTypes('rev'),
+				// 'tabindex' => 'Number',
+				// 'type' => 'ContentType',
+			)
+		);
+		$a->formatting = true;
+		$a->excludes = array('a' => true);
+	}
 
 }
 

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

Indentation +21 added lines, -21 removed lines

@@ -10,28 +10,28 @@
 class HTMLPurifier_HTMLModule_Iframe extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Iframe';
-    public $safe = false;
+	public $name = 'Iframe';
+	public $safe = false;
 
-    public function setup($config) {
-        if ($config->get('HTML.SafeIframe')) {
-            $this->safe = true;
-        }
-        $this->addElement(
-            'iframe', 'Inline', 'Flow', 'Common',
-            array(
-                'src' => 'URI#embedded',
-                'width' => 'Length',
-                'height' => 'Length',
-                'name' => 'ID',
-                'scrolling' => 'Enum#yes,no,auto',
-                'frameborder' => 'Enum#0,1',
-                'longdesc' => 'URI',
-                'marginheight' => 'Pixels',
-                'marginwidth' => 'Pixels',
-            )
-        );
-    }
+	public function setup($config) {
+		if ($config->get('HTML.SafeIframe')) {
+			$this->safe = true;
+		}
+		$this->addElement(
+			'iframe', 'Inline', 'Flow', 'Common',
+			array(
+				'src' => 'URI#embedded',
+				'width' => 'Length',
+				'height' => 'Length',
+				'name' => 'ID',
+				'scrolling' => 'Enum#yes,no,auto',
+				'frameborder' => 'Enum#0,1',
+				'longdesc' => 'URI',
+				'marginheight' => 'Pixels',
+				'marginwidth' => 'Pixels',
+			)
+		);
+	}
 
 }
 

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

Indentation +24 added lines, -24 removed lines

@@ -8,32 +8,32 @@
 class HTMLPurifier_HTMLModule_Image extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Image';
+	public $name = 'Image';
 
-    public function setup($config) {
-        $max = $config->get('HTML.MaxImgLength');
-        $img = $this->addElement(
-            'img', 'Inline', 'Empty', 'Common',
-            array(
-                'alt*' => 'Text',
-                // According to the spec, it's Length, but percents can
-                // be abused, so we allow only Pixels.
-                'height' => 'Pixels#' . $max,
-                'width'  => 'Pixels#' . $max,
-                'longdesc' => 'URI',
-                'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
-            )
-        );
-        if ($max === null || $config->get('HTML.Trusted')) {
-            $img->attr['height'] =
-            $img->attr['width'] = 'Length';
-        }
+	public function setup($config) {
+		$max = $config->get('HTML.MaxImgLength');
+		$img = $this->addElement(
+			'img', 'Inline', 'Empty', 'Common',
+			array(
+				'alt*' => 'Text',
+				// According to the spec, it's Length, but percents can
+				// be abused, so we allow only Pixels.
+				'height' => 'Pixels#' . $max,
+				'width'  => 'Pixels#' . $max,
+				'longdesc' => 'URI',
+				'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
+			)
+		);
+		if ($max === null || $config->get('HTML.Trusted')) {
+			$img->attr['height'] =
+			$img->attr['width'] = 'Length';
+		}
 
-        // kind of strange, but splitting things up would be inefficient
-        $img->attr_transform_pre[] =
-        $img->attr_transform_post[] =
-            new HTMLPurifier_AttrTransform_ImgRequired();
-    }
+		// kind of strange, but splitting things up would be inefficient
+		$img->attr_transform_pre[] =
+		$img->attr_transform_post[] =
+			new HTMLPurifier_AttrTransform_ImgRequired();
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
                 'alt*' => 'Text',
                 // According to the spec, it's Length, but percents can
                 // be abused, so we allow only Pixels.
-                'height' => 'Pixels#' . $max,
-                'width'  => 'Pixels#' . $max,
+                'height' => 'Pixels#'.$max,
+                'width'  => 'Pixels#'.$max,
                 'longdesc' => 'URI',
                 'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded
             )

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

Indentation +127 added lines, -127 removed lines

@@ -19,140 +19,140 @@
 class HTMLPurifier_HTMLModule_Legacy extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Legacy';
+	public $name = 'Legacy';
 
-    public function setup($config) {
-
-        $this->addElement('basefont', 'Inline', 'Empty', false, array(
-            'color' => 'Color',
-            'face' => 'Text', // extremely broad, we should
-            'size' => 'Text', // tighten it
-            'id' => 'ID'
-        ));
-        $this->addElement('center', 'Block', 'Flow', 'Common');
-        $this->addElement('dir', 'Block', 'Required: li', 'Common', array(
-            'compact' => 'Bool#compact'
-        ));
-        $this->addElement('font', 'Inline', 'Inline', array('Core', 'I18N'), array(
-            'color' => 'Color',
-            'face' => 'Text', // extremely broad, we should
-            'size' => 'Text', // tighten it
-        ));
-        $this->addElement('menu', 'Block', 'Required: li', 'Common', array(
-            'compact' => 'Bool#compact'
-        ));
-
-        $s = $this->addElement('s', 'Inline', 'Inline', 'Common');
-        $s->formatting = true;
-
-        $strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
-        $strike->formatting = true;
-
-        $u = $this->addElement('u', 'Inline', 'Inline', 'Common');
-        $u->formatting = true;
-
-        // setup modifications to old elements
-
-        $align = 'Enum#left,right,center,justify';
-
-        $address = $this->addBlankElement('address');
-        $address->content_model = 'Inline | #PCDATA | p';
-        $address->content_model_type = 'optional';
-        $address->child = false;
-
-        $blockquote = $this->addBlankElement('blockquote');
-        $blockquote->content_model = 'Flow | #PCDATA';
-        $blockquote->content_model_type = 'optional';
-        $blockquote->child = false;
-
-        $br = $this->addBlankElement('br');
-        $br->attr['clear'] = 'Enum#left,all,right,none';
-
-        $caption = $this->addBlankElement('caption');
-        $caption->attr['align'] = 'Enum#top,bottom,left,right';
-
-        $div = $this->addBlankElement('div');
-        $div->attr['align'] = $align;
-
-        $dl = $this->addBlankElement('dl');
-        $dl->attr['compact'] = 'Bool#compact';
-
-        for ($i = 1; $i <= 6; $i++) {
-            $h = $this->addBlankElement("h$i");
-            $h->attr['align'] = $align;
-        }
-
-        $hr = $this->addBlankElement('hr');
-        $hr->attr['align'] = $align;
-        $hr->attr['noshade'] = 'Bool#noshade';
-        $hr->attr['size'] = 'Pixels';
-        $hr->attr['width'] = 'Length';
-
-        $img = $this->addBlankElement('img');
-        $img->attr['align'] = 'IAlign';
-        $img->attr['border'] = 'Pixels';
-        $img->attr['hspace'] = 'Pixels';
-        $img->attr['vspace'] = 'Pixels';
-
-        // figure out this integer business
-
-        $li = $this->addBlankElement('li');
-        $li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
-        $li->attr['type']  = 'Enum#s:1,i,I,a,A,disc,square,circle';
-
-        $ol = $this->addBlankElement('ol');
-        $ol->attr['compact'] = 'Bool#compact';
-        $ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
-        $ol->attr['type'] = 'Enum#s:1,i,I,a,A';
-
-        $p = $this->addBlankElement('p');
-        $p->attr['align'] = $align;
-
-        $pre = $this->addBlankElement('pre');
-        $pre->attr['width'] = 'Number';
-
-        // script omitted
-
-        $table = $this->addBlankElement('table');
-        $table->attr['align'] = 'Enum#left,center,right';
-        $table->attr['bgcolor'] = 'Color';
-
-        $tr = $this->addBlankElement('tr');
-        $tr->attr['bgcolor'] = 'Color';
-
-        $th = $this->addBlankElement('th');
-        $th->attr['bgcolor'] = 'Color';
-        $th->attr['height'] = 'Length';
-        $th->attr['nowrap'] = 'Bool#nowrap';
-        $th->attr['width'] = 'Length';
-
-        $td = $this->addBlankElement('td');
-        $td->attr['bgcolor'] = 'Color';
-        $td->attr['height'] = 'Length';
-        $td->attr['nowrap'] = 'Bool#nowrap';
-        $td->attr['width'] = 'Length';
+	public function setup($config) {
+
+		$this->addElement('basefont', 'Inline', 'Empty', false, array(
+			'color' => 'Color',
+			'face' => 'Text', // extremely broad, we should
+			'size' => 'Text', // tighten it
+			'id' => 'ID'
+		));
+		$this->addElement('center', 'Block', 'Flow', 'Common');
+		$this->addElement('dir', 'Block', 'Required: li', 'Common', array(
+			'compact' => 'Bool#compact'
+		));
+		$this->addElement('font', 'Inline', 'Inline', array('Core', 'I18N'), array(
+			'color' => 'Color',
+			'face' => 'Text', // extremely broad, we should
+			'size' => 'Text', // tighten it
+		));
+		$this->addElement('menu', 'Block', 'Required: li', 'Common', array(
+			'compact' => 'Bool#compact'
+		));
+
+		$s = $this->addElement('s', 'Inline', 'Inline', 'Common');
+		$s->formatting = true;
+
+		$strike = $this->addElement('strike', 'Inline', 'Inline', 'Common');
+		$strike->formatting = true;
+
+		$u = $this->addElement('u', 'Inline', 'Inline', 'Common');
+		$u->formatting = true;
+
+		// setup modifications to old elements
+
+		$align = 'Enum#left,right,center,justify';
+
+		$address = $this->addBlankElement('address');
+		$address->content_model = 'Inline | #PCDATA | p';
+		$address->content_model_type = 'optional';
+		$address->child = false;
+
+		$blockquote = $this->addBlankElement('blockquote');
+		$blockquote->content_model = 'Flow | #PCDATA';
+		$blockquote->content_model_type = 'optional';
+		$blockquote->child = false;
+
+		$br = $this->addBlankElement('br');
+		$br->attr['clear'] = 'Enum#left,all,right,none';
+
+		$caption = $this->addBlankElement('caption');
+		$caption->attr['align'] = 'Enum#top,bottom,left,right';
+
+		$div = $this->addBlankElement('div');
+		$div->attr['align'] = $align;
+
+		$dl = $this->addBlankElement('dl');
+		$dl->attr['compact'] = 'Bool#compact';
+
+		for ($i = 1; $i <= 6; $i++) {
+			$h = $this->addBlankElement("h$i");
+			$h->attr['align'] = $align;
+		}
+
+		$hr = $this->addBlankElement('hr');
+		$hr->attr['align'] = $align;
+		$hr->attr['noshade'] = 'Bool#noshade';
+		$hr->attr['size'] = 'Pixels';
+		$hr->attr['width'] = 'Length';
+
+		$img = $this->addBlankElement('img');
+		$img->attr['align'] = 'IAlign';
+		$img->attr['border'] = 'Pixels';
+		$img->attr['hspace'] = 'Pixels';
+		$img->attr['vspace'] = 'Pixels';
+
+		// figure out this integer business
+
+		$li = $this->addBlankElement('li');
+		$li->attr['value'] = new HTMLPurifier_AttrDef_Integer();
+		$li->attr['type']  = 'Enum#s:1,i,I,a,A,disc,square,circle';
+
+		$ol = $this->addBlankElement('ol');
+		$ol->attr['compact'] = 'Bool#compact';
+		$ol->attr['start'] = new HTMLPurifier_AttrDef_Integer();
+		$ol->attr['type'] = 'Enum#s:1,i,I,a,A';
+
+		$p = $this->addBlankElement('p');
+		$p->attr['align'] = $align;
+
+		$pre = $this->addBlankElement('pre');
+		$pre->attr['width'] = 'Number';
+
+		// script omitted
+
+		$table = $this->addBlankElement('table');
+		$table->attr['align'] = 'Enum#left,center,right';
+		$table->attr['bgcolor'] = 'Color';
+
+		$tr = $this->addBlankElement('tr');
+		$tr->attr['bgcolor'] = 'Color';
+
+		$th = $this->addBlankElement('th');
+		$th->attr['bgcolor'] = 'Color';
+		$th->attr['height'] = 'Length';
+		$th->attr['nowrap'] = 'Bool#nowrap';
+		$th->attr['width'] = 'Length';
+
+		$td = $this->addBlankElement('td');
+		$td->attr['bgcolor'] = 'Color';
+		$td->attr['height'] = 'Length';
+		$td->attr['nowrap'] = 'Bool#nowrap';
+		$td->attr['width'] = 'Length';
 
-        $ul = $this->addBlankElement('ul');
-        $ul->attr['compact'] = 'Bool#compact';
-        $ul->attr['type'] = 'Enum#square,disc,circle';
+		$ul = $this->addBlankElement('ul');
+		$ul->attr['compact'] = 'Bool#compact';
+		$ul->attr['type'] = 'Enum#square,disc,circle';
 
-        // "safe" modifications to "unsafe" elements
-        // WARNING: If you want to add support for an unsafe, legacy
-        // attribute, make a new TrustedLegacy module with the trusted
-        // bit set appropriately
+		// "safe" modifications to "unsafe" elements
+		// WARNING: If you want to add support for an unsafe, legacy
+		// attribute, make a new TrustedLegacy module with the trusted
+		// bit set appropriately
 
-        $form = $this->addBlankElement('form');
-        $form->content_model = 'Flow | #PCDATA';
-        $form->content_model_type = 'optional';
-        $form->attr['target'] = 'FrameTarget';
+		$form = $this->addBlankElement('form');
+		$form->content_model = 'Flow | #PCDATA';
+		$form->content_model_type = 'optional';
+		$form->attr['target'] = 'FrameTarget';
 
-        $input = $this->addBlankElement('input');
-        $input->attr['align'] = 'IAlign';
+		$input = $this->addBlankElement('input');
+		$input->attr['align'] = 'IAlign';
 
-        $legend = $this->addBlankElement('legend');
-        $legend->attr['align'] = 'LAlign';
+		$legend = $this->addBlankElement('legend');
+		$legend->attr['align'] = 'LAlign';
 
-    }
+	}
 
 }
 

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

Indentation +31 added lines, -31 removed lines

@@ -6,37 +6,37 @@
 class HTMLPurifier_HTMLModule_List extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'List';
-
-    // According to the abstract schema, the List content set is a fully formed
-    // one or more expr, but it invariably occurs in an optional declaration
-    // so we're not going to do that subtlety. It might cause trouble
-    // if a user defines "List" and expects that multiple lists are
-    // allowed to be specified, but then again, that's not very intuitive.
-    // Furthermore, the actual XML Schema may disagree. Regardless,
-    // we don't have support for such nested expressions without using
-    // the incredibly inefficient and draconic Custom ChildDef.
-
-    public $content_sets = array('Flow' => 'List');
-
-    public function setup($config) {
-        $ol = $this->addElement('ol', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
-        $ul = $this->addElement('ul', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
-        // XXX The wrap attribute is handled by MakeWellFormed.  This is all
-        // quite unsatisfactory, because we generated this
-        // *specifically* for lists, and now a big chunk of the handling
-        // is done properly by the List ChildDef.  So actually, we just
-        // want enough information to make autoclosing work properly,
-        // and then hand off the tricky stuff to the ChildDef.
-        $ol->wrap = 'li';
-        $ul->wrap = 'li';
-        $this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
-
-        $this->addElement('li', false, 'Flow', 'Common');
-
-        $this->addElement('dd', false, 'Flow', 'Common');
-        $this->addElement('dt', false, 'Inline', 'Common');
-    }
+	public $name = 'List';
+
+	// According to the abstract schema, the List content set is a fully formed
+	// one or more expr, but it invariably occurs in an optional declaration
+	// so we're not going to do that subtlety. It might cause trouble
+	// if a user defines "List" and expects that multiple lists are
+	// allowed to be specified, but then again, that's not very intuitive.
+	// Furthermore, the actual XML Schema may disagree. Regardless,
+	// we don't have support for such nested expressions without using
+	// the incredibly inefficient and draconic Custom ChildDef.
+
+	public $content_sets = array('Flow' => 'List');
+
+	public function setup($config) {
+		$ol = $this->addElement('ol', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
+		$ul = $this->addElement('ul', 'List', new HTMLPurifier_ChildDef_List(), 'Common');
+		// XXX The wrap attribute is handled by MakeWellFormed.  This is all
+		// quite unsatisfactory, because we generated this
+		// *specifically* for lists, and now a big chunk of the handling
+		// is done properly by the List ChildDef.  So actually, we just
+		// want enough information to make autoclosing work properly,
+		// and then hand off the tricky stuff to the ChildDef.
+		$ol->wrap = 'li';
+		$ul->wrap = 'li';
+		$this->addElement('dl', 'List', 'Required: dt | dd', 'Common');
+
+		$this->addElement('li', false, 'Flow', 'Common');
+
+		$this->addElement('dd', false, 'Flow', 'Common');
+		$this->addElement('dt', false, 'Inline', 'Common');
+	}
 
 }
 

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

Indentation +11 added lines, -11 removed lines

@@ -3,18 +3,18 @@
 class HTMLPurifier_HTMLModule_Name extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Name';
+	public $name = 'Name';
 
-    public function setup($config) {
-        $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
-        foreach ($elements as $name) {
-            $element = $this->addBlankElement($name);
-            $element->attr['name'] = 'CDATA';
-            if (!$config->get('HTML.Attr.Name.UseCDATA')) {
-                $element->attr_transform_post['NameSync'] = new HTMLPurifier_AttrTransform_NameSync();
-            }
-        }
-    }
+	public function setup($config) {
+		$elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map');
+		foreach ($elements as $name) {
+			$element = $this->addBlankElement($name);
+			$element->attr['name'] = 'CDATA';
+			if (!$config->get('HTML.Attr.Name.UseCDATA')) {
+				$element->attr_transform_post['NameSync'] = new HTMLPurifier_AttrTransform_NameSync();
+			}
+		}
+	}
 
 }
 

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

Indentation +5 added lines, -5 removed lines

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

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

Indentation +6 added lines, -6 removed lines

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

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

Indentation +33 added lines, -33 removed lines

@@ -8,39 +8,39 @@
 class HTMLPurifier_HTMLModule_Object extends HTMLPurifier_HTMLModule
 {
 
-    public $name = 'Object';
-    public $safe = false;
-
-    public function setup($config) {
-
-        $this->addElement('object', 'Inline', 'Optional: #PCDATA | Flow | param', 'Common',
-            array(
-                'archive' => 'URI',
-                'classid' => 'URI',
-                'codebase' => 'URI',
-                'codetype' => 'Text',
-                'data' => 'URI',
-                'declare' => 'Bool#declare',
-                'height' => 'Length',
-                'name' => 'CDATA',
-                'standby' => 'Text',
-                'tabindex' => 'Number',
-                'type' => 'ContentType',
-                'width' => 'Length'
-            )
-        );
-
-        $this->addElement('param', false, 'Empty', false,
-            array(
-                'id' => 'ID',
-                'name*' => 'Text',
-                'type' => 'Text',
-                'value' => 'Text',
-                'valuetype' => 'Enum#data,ref,object'
-           )
-        );
-
-    }
+	public $name = 'Object';
+	public $safe = false;
+
+	public function setup($config) {
+
+		$this->addElement('object', 'Inline', 'Optional: #PCDATA | Flow | param', 'Common',
+			array(
+				'archive' => 'URI',
+				'classid' => 'URI',
+				'codebase' => 'URI',
+				'codetype' => 'Text',
+				'data' => 'URI',
+				'declare' => 'Bool#declare',
+				'height' => 'Length',
+				'name' => 'CDATA',
+				'standby' => 'Text',
+				'tabindex' => 'Number',
+				'type' => 'ContentType',
+				'width' => 'Length'
+			)
+		);
+
+		$this->addElement('param', false, 'Empty', false,
+			array(
+				'id' => 'ID',
+				'name*' => 'Text',
+				'type' => 'Text',
+				'value' => 'Text',
+				'valuetype' => 'Enum#data,ref,object'
+		   )
+		);
+
+	}
 
 }