xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php

Indentation +12 added lines, -12 removed lines

@@ -8,19 +8,19 @@
 class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
 {
 
-    public function __construct() {
-        $this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
-    }
+	public function __construct() {
+		$this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
+	}
 
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['name'])) return $attr;
-        $name = $attr['name'];
-        if (isset($attr['id']) && $attr['id'] === $name) return $attr;
-        $result = $this->idDef->validate($name, $config, $context);
-        if ($result === false) unset($attr['name']);
-        else $attr['name'] = $result;
-        return $attr;
-    }
+	public function transform($attr, $config, $context) {
+		if (!isset($attr['name'])) return $attr;
+		$name = $attr['name'];
+		if (isset($attr['id']) && $attr['id'] === $name) return $attr;
+		$result = $this->idDef->validate($name, $config, $context);
+		if ($result === false) unset($attr['name']);
+		else $attr['name'] = $result;
+		return $attr;
+	}
 
 }
 

Braces +11 added lines, -4 removed lines

@@ -13,12 +13,19 @@
     }
 
     public function transform($attr, $config, $context) {
-        if (!isset($attr['name'])) return $attr;
+        if (!isset($attr['name'])) {
+        	return $attr;
+        }
         $name = $attr['name'];
-        if (isset($attr['id']) && $attr['id'] === $name) return $attr;
+        if (isset($attr['id']) && $attr['id'] === $name) {
+        	return $attr;
+        }
         $result = $this->idDef->validate($name, $config, $context);
-        if ($result === false) unset($attr['name']);
-        else $attr['name'] = $result;
+        if ($result === false) {
+        	unset($attr['name']);
+        } else {
+        	$attr['name'] = $result;
+        }
         return $attr;
     }
 

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

Indentation +24 added lines, -24 removed lines

@@ -8,37 +8,37 @@
  */
 class HTMLPurifier_AttrTransform_Nofollow extends HTMLPurifier_AttrTransform
 {
-    private $parser;
+	private $parser;
 
-    public function __construct() {
-        $this->parser = new HTMLPurifier_URIParser();
-    }
+	public function __construct() {
+		$this->parser = new HTMLPurifier_URIParser();
+	}
 
-    public function transform($attr, $config, $context) {
+	public function transform($attr, $config, $context) {
 
-        if (!isset($attr['href'])) {
-            return $attr;
-        }
+		if (!isset($attr['href'])) {
+			return $attr;
+		}
 
-        // XXX Kind of inefficient
-        $url = $this->parser->parse($attr['href']);
-        $scheme = $url->getSchemeObj($config, $context);
+		// XXX Kind of inefficient
+		$url = $this->parser->parse($attr['href']);
+		$scheme = $url->getSchemeObj($config, $context);
 
-        if ($scheme->browsable && !$url->isLocal($config, $context)) {
-            if (isset($attr['rel'])) {
-                $rels = explode(' ', $attr);
-                if (!in_array('nofollow', $rels)) {
-                    $rels[] = 'nofollow';
-                }
-                $attr['rel'] = implode(' ', $rels);
-            } else {
-                $attr['rel'] = 'nofollow';
-            }
-        }
+		if ($scheme->browsable && !$url->isLocal($config, $context)) {
+			if (isset($attr['rel'])) {
+				$rels = explode(' ', $attr);
+				if (!in_array('nofollow', $rels)) {
+					$rels[] = 'nofollow';
+				}
+				$attr['rel'] = implode(' ', $rels);
+			} else {
+				$attr['rel'] = 'nofollow';
+			}
+		}
 
-        return $attr;
+		return $attr;
 
-    }
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php

Indentation +7 added lines, -7 removed lines

@@ -2,14 +2,14 @@
 
 class HTMLPurifier_AttrTransform_SafeEmbed extends HTMLPurifier_AttrTransform
 {
-    public $name = "SafeEmbed";
+	public $name = "SafeEmbed";
 
-    public function transform($attr, $config, $context) {
-        $attr['allowscriptaccess'] = 'never';
-        $attr['allownetworking'] = 'internal';
-        $attr['type'] = 'application/x-shockwave-flash';
-        return $attr;
-    }
+	public function transform($attr, $config, $context) {
+		$attr['allowscriptaccess'] = 'never';
+		$attr['allownetworking'] = 'internal';
+		$attr['type'] = 'application/x-shockwave-flash';
+		return $attr;
+	}
 }
 
 // vim: et sw=4 sts=4

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

Indentation +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@
  */
 class HTMLPurifier_AttrTransform_SafeObject extends HTMLPurifier_AttrTransform
 {
-    public $name = "SafeObject";
+	public $name = "SafeObject";
 
-    function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
-        return $attr;
-    }
+	function transform($attr, $config, $context) {
+		if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
+		return $attr;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
     public $name = "SafeObject";
 
     function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) $attr['type'] = 'application/x-shockwave-flash';
+        if (!isset($attr['type'])) {
+        	$attr['type'] = 'application/x-shockwave-flash';
+        }
         return $attr;
     }
 }

classes/security/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php

Indentation +43 added lines, -43 removed lines

@@ -14,51 +14,51 @@
  */
 class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
 {
-    public $name = "SafeParam";
-    private $uri;
+	public $name = "SafeParam";
+	private $uri;
 
-    public function __construct() {
-        $this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
-        $this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
-    }
+	public function __construct() {
+		$this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
+		$this->wmode = new HTMLPurifier_AttrDef_Enum(array('window', 'opaque', 'transparent'));
+	}
 
-    public function transform($attr, $config, $context) {
-        // If we add support for other objects, we'll need to alter the
-        // transforms.
-        switch ($attr['name']) {
-            // application/x-shockwave-flash
-            // Keep this synchronized with Injector/SafeObject.php
-            case 'allowScriptAccess':
-                $attr['value'] = 'never';
-                break;
-            case 'allowNetworking':
-                $attr['value'] = 'internal';
-                break;
-            case 'allowFullScreen':
-                if ($config->get('HTML.FlashAllowFullScreen')) {
-                    $attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
-                } else {
-                    $attr['value'] = 'false';
-                }
-                break;
-            case 'wmode':
-                $attr['value'] = $this->wmode->validate($attr['value'], $config, $context);
-                break;
-            case 'movie':
-            case 'src':
-                $attr['name'] = "movie";
-                $attr['value'] = $this->uri->validate($attr['value'], $config, $context);
-                break;
-            case 'flashvars':
-                // we're going to allow arbitrary inputs to the SWF, on
-                // the reasoning that it could only hack the SWF, not us.
-                break;
-            // add other cases to support other param name/value pairs
-            default:
-                $attr['name'] = $attr['value'] = null;
-        }
-        return $attr;
-    }
+	public function transform($attr, $config, $context) {
+		// If we add support for other objects, we'll need to alter the
+		// transforms.
+		switch ($attr['name']) {
+			// application/x-shockwave-flash
+			// Keep this synchronized with Injector/SafeObject.php
+			case 'allowScriptAccess':
+				$attr['value'] = 'never';
+				break;
+			case 'allowNetworking':
+				$attr['value'] = 'internal';
+				break;
+			case 'allowFullScreen':
+				if ($config->get('HTML.FlashAllowFullScreen')) {
+					$attr['value'] = ($attr['value'] == 'true') ? 'true' : 'false';
+				} else {
+					$attr['value'] = 'false';
+				}
+				break;
+			case 'wmode':
+				$attr['value'] = $this->wmode->validate($attr['value'], $config, $context);
+				break;
+			case 'movie':
+			case 'src':
+				$attr['name'] = "movie";
+				$attr['value'] = $this->uri->validate($attr['value'], $config, $context);
+				break;
+			case 'flashvars':
+				// we're going to allow arbitrary inputs to the SWF, on
+				// the reasoning that it could only hack the SWF, not us.
+				break;
+			// add other cases to support other param name/value pairs
+			default:
+				$attr['name'] = $attr['value'] = null;
+		}
+		return $attr;
+	}
 }
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php

Indentation +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
  */
 class HTMLPurifier_AttrTransform_ScriptRequired extends HTMLPurifier_AttrTransform
 {
-    public function transform($attr, $config, $context) {
-        if (!isset($attr['type'])) {
-            $attr['type'] = 'text/javascript';
-        }
-        return $attr;
-    }
+	public function transform($attr, $config, $context) {
+		if (!isset($attr['type'])) {
+			$attr['type'] = 'text/javascript';
+		}
+		return $attr;
+	}
 }
 
 // vim: et sw=4 sts=4

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

Indentation +16 added lines, -16 removed lines

@@ -9,29 +9,29 @@
  */
 class HTMLPurifier_AttrTransform_TargetBlank extends HTMLPurifier_AttrTransform
 {
-    private $parser;
+	private $parser;
 
-    public function __construct() {
-        $this->parser = new HTMLPurifier_URIParser();
-    }
+	public function __construct() {
+		$this->parser = new HTMLPurifier_URIParser();
+	}
 
-    public function transform($attr, $config, $context) {
+	public function transform($attr, $config, $context) {
 
-        if (!isset($attr['href'])) {
-            return $attr;
-        }
+		if (!isset($attr['href'])) {
+			return $attr;
+		}
 
-        // XXX Kind of inefficient
-        $url = $this->parser->parse($attr['href']);
-        $scheme = $url->getSchemeObj($config, $context);
+		// XXX Kind of inefficient
+		$url = $this->parser->parse($attr['href']);
+		$scheme = $url->getSchemeObj($config, $context);
 
-        if ($scheme->browsable && !$url->isBenign($config, $context)) {
-            $attr['target'] = 'blank';
-        }
+		if ($scheme->browsable && !$url->isBenign($config, $context)) {
+			$attr['target'] = 'blank';
+		}
 
-        return $attr;
+		return $attr;
 
-    }
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 class HTMLPurifier_AttrTransform_Textarea extends HTMLPurifier_AttrTransform
 {
 
-    public function transform($attr, $config, $context) {
-        // Calculated from Firefox
-        if (!isset($attr['cols'])) $attr['cols'] = '22';
-        if (!isset($attr['rows'])) $attr['rows'] = '3';
-        return $attr;
-    }
+	public function transform($attr, $config, $context) {
+		// Calculated from Firefox
+		if (!isset($attr['cols'])) $attr['cols'] = '22';
+		if (!isset($attr['rows'])) $attr['rows'] = '3';
+		return $attr;
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -8,8 +8,12 @@
 
     public function transform($attr, $config, $context) {
         // Calculated from Firefox
-        if (!isset($attr['cols'])) $attr['cols'] = '22';
-        if (!isset($attr['rows'])) $attr['rows'] = '3';
+        if (!isset($attr['cols'])) {
+        	$attr['cols'] = '22';
+        }
+        if (!isset($attr['rows'])) {
+        	$attr['rows'] = '3';
+        }
         return $attr;
     }
 

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

Indentation +68 added lines, -68 removed lines

@@ -5,87 +5,87 @@
  */
 class HTMLPurifier_AttrTypes
 {
-    /**
-     * Lookup array of attribute string identifiers to concrete implementations
-     */
-    protected $info = array();
+	/**
+	 * Lookup array of attribute string identifiers to concrete implementations
+	 */
+	protected $info = array();
 
-    /**
-     * Constructs the info array, supplying default implementations for attribute
-     * types.
-     */
-    public function __construct() {
-        // XXX This is kind of poor, since we don't actually /clone/
-        // instances; instead, we use the supplied make() attribute. So,
-        // the underlying class must know how to deal with arguments.
-        // With the old implementation of Enum, that ignored its
-        // arguments when handling a make dispatch, the IAlign
-        // definition wouldn't work.
+	/**
+	 * Constructs the info array, supplying default implementations for attribute
+	 * types.
+	 */
+	public function __construct() {
+		// XXX This is kind of poor, since we don't actually /clone/
+		// instances; instead, we use the supplied make() attribute. So,
+		// the underlying class must know how to deal with arguments.
+		// With the old implementation of Enum, that ignored its
+		// arguments when handling a make dispatch, the IAlign
+		// definition wouldn't work.
 
-        // pseudo-types, must be instantiated via shorthand
-        $this->info['Enum']    = new HTMLPurifier_AttrDef_Enum();
-        $this->info['Bool']    = new HTMLPurifier_AttrDef_HTML_Bool();
+		// pseudo-types, must be instantiated via shorthand
+		$this->info['Enum']    = new HTMLPurifier_AttrDef_Enum();
+		$this->info['Bool']    = new HTMLPurifier_AttrDef_HTML_Bool();
 
-        $this->info['CDATA']    = new HTMLPurifier_AttrDef_Text();
-        $this->info['ID']       = new HTMLPurifier_AttrDef_HTML_ID();
-        $this->info['Length']   = new HTMLPurifier_AttrDef_HTML_Length();
-        $this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
-        $this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
-        $this->info['Pixels']   = new HTMLPurifier_AttrDef_HTML_Pixels();
-        $this->info['Text']     = new HTMLPurifier_AttrDef_Text();
-        $this->info['URI']      = new HTMLPurifier_AttrDef_URI();
-        $this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
-        $this->info['Color']    = new HTMLPurifier_AttrDef_HTML_Color();
-        $this->info['IAlign']   = self::makeEnum('top,middle,bottom,left,right');
-        $this->info['LAlign']   = self::makeEnum('top,bottom,left,right');
-        $this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
+		$this->info['CDATA']    = new HTMLPurifier_AttrDef_Text();
+		$this->info['ID']       = new HTMLPurifier_AttrDef_HTML_ID();
+		$this->info['Length']   = new HTMLPurifier_AttrDef_HTML_Length();
+		$this->info['MultiLength'] = new HTMLPurifier_AttrDef_HTML_MultiLength();
+		$this->info['NMTOKENS'] = new HTMLPurifier_AttrDef_HTML_Nmtokens();
+		$this->info['Pixels']   = new HTMLPurifier_AttrDef_HTML_Pixels();
+		$this->info['Text']     = new HTMLPurifier_AttrDef_Text();
+		$this->info['URI']      = new HTMLPurifier_AttrDef_URI();
+		$this->info['LanguageCode'] = new HTMLPurifier_AttrDef_Lang();
+		$this->info['Color']    = new HTMLPurifier_AttrDef_HTML_Color();
+		$this->info['IAlign']   = self::makeEnum('top,middle,bottom,left,right');
+		$this->info['LAlign']   = self::makeEnum('top,bottom,left,right');
+		$this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
 
-        // unimplemented aliases
-        $this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
-        $this->info['Character'] = new HTMLPurifier_AttrDef_Text();
+		// unimplemented aliases
+		$this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
+		$this->info['ContentTypes'] = new HTMLPurifier_AttrDef_Text();
+		$this->info['Charsets'] = new HTMLPurifier_AttrDef_Text();
+		$this->info['Character'] = new HTMLPurifier_AttrDef_Text();
 
-        // "proprietary" types
-        $this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
+		// "proprietary" types
+		$this->info['Class'] = new HTMLPurifier_AttrDef_HTML_Class();
 
-        // number is really a positive integer (one or more digits)
-        // FIXME: ^^ not always, see start and value of list items
-        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
-    }
+		// number is really a positive integer (one or more digits)
+		// FIXME: ^^ not always, see start and value of list items
+		$this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
+	}
 
-    private static function makeEnum($in) {
-        return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
-    }
+	private static function makeEnum($in) {
+		return new HTMLPurifier_AttrDef_Clone(new HTMLPurifier_AttrDef_Enum(explode(',', $in)));
+	}
 
-    /**
-     * Retrieves a type
-     * @param $type String type name
-     * @return Object AttrDef for type
-     */
-    public function get($type) {
+	/**
+	 * Retrieves a type
+	 * @param $type String type name
+	 * @return Object AttrDef for type
+	 */
+	public function get($type) {
 
-        // determine if there is any extra info tacked on
-        if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
-        else $string = '';
+		// determine if there is any extra info tacked on
+		if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
+		else $string = '';
 
-        if (!isset($this->info[$type])) {
-            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
-            return;
-        }
+		if (!isset($this->info[$type])) {
+			trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
+			return;
+		}
 
-        return $this->info[$type]->make($string);
+		return $this->info[$type]->make($string);
 
-    }
+	}
 
-    /**
-     * Sets a new implementation for a type
-     * @param $type String type name
-     * @param $impl Object AttrDef for type
-     */
-    public function set($type, $impl) {
-        $this->info[$type] = $impl;
-    }
+	/**
+	 * Sets a new implementation for a type
+	 * @param $type String type name
+	 * @param $impl Object AttrDef for type
+	 */
+	public function set($type, $impl) {
+		$this->info[$type] = $impl;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +5 added lines, -2 removed lines

@@ -66,8 +66,11 @@
     public function get($type) {
 
         // determine if there is any extra info tacked on
-        if (strpos($type, '#') !== false) list($type, $string) = explode('#', $type, 2);
-        else $string = '';
+        if (strpos($type, '#') !== false) {
+        	list($type, $string) = explode('#', $type, 2);
+        } else {
+        	$string = '';
+        }
 
         if (!isset($this->info[$type])) {
             trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
         // number is really a positive integer (one or more digits)
         // FIXME: ^^ not always, see start and value of list items
-        $this->info['Number']   = new HTMLPurifier_AttrDef_Integer(false, false, true);
+        $this->info['Number'] = new HTMLPurifier_AttrDef_Integer(false, false, true);
     }
 
     private static function makeEnum($in) {
@@ -70,7 +70,7 @@ 
         else $string = '';
 
         if (!isset($this->info[$type])) {
-            trigger_error('Cannot retrieve undefined attribute type ' . $type, E_USER_ERROR);
+            trigger_error('Cannot retrieve undefined attribute type '.$type, E_USER_ERROR);
             return;
         }