mewebstudio / Purifier

config/purifier.php

Indentation +13 added lines, -13 removed lines

@@ -49,30 +49,30 @@ 
                 ['header',  'Block', 'Flow', 'Common'],
                 ['footer',  'Block', 'Flow', 'Common'],
 				
-				// Content model actually excludes several tags, not modelled here
+                // Content model actually excludes several tags, not modelled here
                 ['address', 'Block', 'Flow', 'Common'],
                 ['hgroup', 'Block', 'Required: h1 | h2 | h3 | h4 | h5 | h6', 'Common'],
 				
-				// http://developers.whatwg.org/grouping-content.html
+                // http://developers.whatwg.org/grouping-content.html
                 ['figure', 'Block', 'Optional: (figcaption, Flow) | (Flow, figcaption) | Flow', 'Common'],
                 ['figcaption', 'Inline', 'Flow', 'Common'],
 				
-				// http://developers.whatwg.org/the-video-element.html#the-video-element
+                // http://developers.whatwg.org/the-video-element.html#the-video-element
                 ['video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
                     'src' => 'URI',
-					'type' => 'Text',
-					'width' => 'Length',
-					'height' => 'Length',
-					'poster' => 'URI',
-					'preload' => 'Enum#auto,metadata,none',
-					'controls' => 'Bool',
+                    'type' => 'Text',
+                    'width' => 'Length',
+                    'height' => 'Length',
+                    'poster' => 'URI',
+                    'preload' => 'Enum#auto,metadata,none',
+                    'controls' => 'Bool',
                 ],
                 ['source', 'Block', 'Flow', 'Common', [
-					'src' => 'URI',
-					'type' => 'Text',
+                    'src' => 'URI',
+                    'type' => 'Text',
                 ],
 
-				// http://developers.whatwg.org/text-level-semantics.html
+                // http://developers.whatwg.org/text-level-semantics.html
                 ['s',    'Inline', 'Inline', 'Common'],
                 ['var',  'Inline', 'Inline', 'Common'],
                 ['sub',  'Inline', 'Inline', 'Common'],
@@ -80,7 +80,7 @@ 
                 ['mark', 'Inline', 'Inline', 'Common'],
                 ['wbr',  'Inline', 'Empty', 'Core'],
 				
-				// http://developers.whatwg.org/edits.html
+                // http://developers.whatwg.org/edits.html
                 ['ins', 'Block', 'Flow', 'Common', array('cite' => 'URI', 'datetime' => 'CDATA')],
                 ['del', 'Block', 'Flow', 'Common', array('cite' => 'URI', 'datetime' => 'CDATA')],
             ],

src/Purifier.php

Indentation +85 added lines, -85 removed lines

@@ -78,21 +78,21 @@ 
         
         // Load custom definition if set
         if ($definitionConfig = $this->config->get('purifier.settings.custom_definition')) {
-	        $this->addCustomDefinition($definitionConfig, $config);
+            $this->addCustomDefinition($definitionConfig, $config);
         }
         
         // Load custom elements if set
         if ($elements = $this->config->get('purifier.settings.custom_elements')) {
-	        if ($def = $config->maybeGetRawHTMLDefinition()) {
-		        $this->addCustomElements($elements, $def);
-	        }
+            if ($def = $config->maybeGetRawHTMLDefinition()) {
+                $this->addCustomElements($elements, $def);
+            }
         }
         
         // Load custom attributes if set
         if ($attributes = $this->config->get('purifier.settings.custom_attributes')) {
-	        if ($def = $config->maybeGetRawHTMLDefinition()) {
-		        $this->addCustomAttributes($attributes, $def);
-	        }
+            if ($def = $config->maybeGetRawHTMLDefinition()) {
+                $this->addCustomAttributes($attributes, $def);
+            }
         }
 
         // Create HTMLPurifier object
@@ -100,94 +100,94 @@ 
     }
     
     /**
-	 * Add a custom definition
-	 *
-	 * @see http://htmlpurifier.org/docs/enduser-customize.html
-	 * @param array $definitionConfig
-	 * @param HTML_Purifier_Config $configObject Defaults to using default config
-	 * 
-	 * @return HTML_Purifier_Config $configObject
-	 */
-	private function addCustomDefinition(array $definitionConfig, $configObject = null)
-	{
-		if (!$configObject) {
-			$configObject = HTMLPurifier_Config::createDefault();
-			$configObject->loadArray($this->getConfig());
-		}
+     * Add a custom definition
+     *
+     * @see http://htmlpurifier.org/docs/enduser-customize.html
+     * @param array $definitionConfig
+     * @param HTML_Purifier_Config $configObject Defaults to using default config
+     * 
+     * @return HTML_Purifier_Config $configObject
+     */
+    private function addCustomDefinition(array $definitionConfig, $configObject = null)
+    {
+        if (!$configObject) {
+            $configObject = HTMLPurifier_Config::createDefault();
+            $configObject->loadArray($this->getConfig());
+        }
 		
-		// Setup the custom definition
-		$configObject->set('HTML.DefinitionID', $definitionConfig['id']);
-		$configObject->set('HTML.DefinitionRev', $definitionConfig['rev']);
+        // Setup the custom definition
+        $configObject->set('HTML.DefinitionID', $definitionConfig['id']);
+        $configObject->set('HTML.DefinitionRev', $definitionConfig['rev']);
 		
-		// Enable debug mode
-		if (!isset($definitionConfig['debug']) || $definitionConfig['debug']) {
-			$configObject->set('Cache.DefinitionImpl', null);
-		}
+        // Enable debug mode
+        if (!isset($definitionConfig['debug']) || $definitionConfig['debug']) {
+            $configObject->set('Cache.DefinitionImpl', null);
+        }
 		
-		// Start configuring the definition
-		if ($def = $configObject->maybeGetRawHTMLDefinition()) {
-			// Create the definition attributes
-			if (!empty($definitionConfig['attributes'])) {
-				$this->addCustomAttributes($definitionConfig['attributes'], $def);
-			}
+        // Start configuring the definition
+        if ($def = $configObject->maybeGetRawHTMLDefinition()) {
+            // Create the definition attributes
+            if (!empty($definitionConfig['attributes'])) {
+                $this->addCustomAttributes($definitionConfig['attributes'], $def);
+            }
 			
-			// Create the definition elements
-			if (!empty($definitionConfig['elements'])) {
-				$this->addCustomElements($definitionConfig['elements'], $def);
-			}
-		}
+            // Create the definition elements
+            if (!empty($definitionConfig['elements'])) {
+                $this->addCustomElements($definitionConfig['elements'], $def);
+            }
+        }
 		
-		return $configObject;
-	}
+        return $configObject;
+    }
 	
-	/**
-	 * Add provided attributes to the provided definition
-	 *
-	 * @param array $attributes
-	 * @param HTMLPurifier_HTMLDefinition $definition
-	 * 
-	 * @return HTMLPurifier_HTMLDefinition $definition
-	 */
-	private function addCustomAttributes(array $attributes, $definition)
-	{
-		foreach ($attributes as $attribute) {
-			// Get configuration of attribute
-			$required = !empty($attribute[3]) ? true : false;
-			$onElement = $attribute[0];
-			$attrName = $required ? $attribute[1] . '*' : $attribute[1];
-			$validValues = $attribute[2];
+    /**
+     * Add provided attributes to the provided definition
+     *
+     * @param array $attributes
+     * @param HTMLPurifier_HTMLDefinition $definition
+     * 
+     * @return HTMLPurifier_HTMLDefinition $definition
+     */
+    private function addCustomAttributes(array $attributes, $definition)
+    {
+        foreach ($attributes as $attribute) {
+            // Get configuration of attribute
+            $required = !empty($attribute[3]) ? true : false;
+            $onElement = $attribute[0];
+            $attrName = $required ? $attribute[1] . '*' : $attribute[1];
+            $validValues = $attribute[2];
 			
-			$definition->addAttribute($onElement, $attrName, $validValues);
-		}
+            $definition->addAttribute($onElement, $attrName, $validValues);
+        }
 		
-		return $definition;
-	}
+        return $definition;
+    }
 	
-	/**
-	 * Add provided elements to the provided definition
-	 *
-	 * @param array $elements
-	 * @param HTMLPurifier_HTMLDefinition $definition
-	 * 
-	 * @return HTMLPurifier_HTMLDefinition $definition
-	 */
-	private function addCustomElements(array $elements, $definition)
-	{
-		foreach ($elements as $element) {
-			// Get configuration of element
-			$name = $element[0];
-			$contentSet = $element[1];
-			$allowedChildren = $element[2];
-			$attributeCollection = $element[3];
-			$attributes = isset($element[4]) ? $element[4] : null;
+    /**
+     * Add provided elements to the provided definition
+     *
+     * @param array $elements
+     * @param HTMLPurifier_HTMLDefinition $definition
+     * 
+     * @return HTMLPurifier_HTMLDefinition $definition
+     */
+    private function addCustomElements(array $elements, $definition)
+    {
+        foreach ($elements as $element) {
+            // Get configuration of element
+            $name = $element[0];
+            $contentSet = $element[1];
+            $allowedChildren = $element[2];
+            $attributeCollection = $element[3];
+            $attributes = isset($element[4]) ? $element[4] : null;
 			
-			if (!empty($attributes)) {
-				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection, $attributes);
-			} else {
-				$definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection);
-			}
-		}
-	}
+            if (!empty($attributes)) {
+                $definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection, $attributes);
+            } else {
+                $definition->addElement($name, $contentSet, $allowedChildren, $attributeCollection);
+            }
+        }
+    }
 
     /**
      * Check/Create cache directory