xpressengine / xe-core

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);
+		}
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 $fallback = 'en';
 
 $messages = array(
-    'HTMLPurifier' => 'HTML Purifier X'
+	'HTMLPurifier' => 'HTML Purifier X'
 );
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 $fallback = 'en';
 
 $messages = array(
-    'HTMLPurifier' => 'HTML Purifier XNone'
+	'HTMLPurifier' => 'HTML Purifier XNone'
 );
 
 // vim: et sw=4 sts=4

classes/security/htmlpurifier/library/HTMLPurifier/Language/messages/en.php

Indentation +3 added lines, -3 removed lines

@@ -55,9 +55,9 @@
 );
 
 $errorNames = array(
-    E_ERROR   => 'Error',
-    E_WARNING => 'Warning',
-    E_NOTICE  => 'Notice'
+	E_ERROR   => 'Error',
+	E_WARNING => 'Warning',
+	E_NOTICE  => 'Notice'
 );
 
 // vim: et sw=4 sts=4

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

Indentation +182 added lines, -182 removed lines

@@ -10,188 +10,188 @@
 class HTMLPurifier_LanguageFactory
 {
 
-    /**
-     * Cache of language code information used to load HTMLPurifier_Language objects
-     * Structure is: $factory->cache[$language_code][$key] = $value
-     * @value array map
-     */
-    public $cache;
-
-    /**
-     * Valid keys in the HTMLPurifier_Language object. Designates which
-     * variables to slurp out of a message file.
-     * @value array list
-     */
-    public $keys = array('fallback', 'messages', 'errorNames');
-
-    /**
-     * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
-     * @value object HTMLPurifier_AttrDef_Lang
-     */
-    protected $validator;
-
-    /**
-     * Cached copy of dirname(__FILE__), directory of current file without
-     * trailing slash
-     * @value string filename
-     */
-    protected $dir;
-
-    /**
-     * Keys whose contents are a hash map and can be merged
-     * @value array lookup
-     */
-    protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
-
-    /**
-     * Keys whose contents are a list and can be merged
-     * @value array lookup
-     */
-    protected $mergeable_keys_list = array();
-
-    /**
-     * Retrieve sole instance of the factory.
-     * @param $prototype Optional prototype to overload sole instance with,
-     *                   or bool true to reset to default factory.
-     */
-    public static function instance($prototype = null) {
-        static $instance = null;
-        if ($prototype !== null) {
-            $instance = $prototype;
-        } elseif ($instance === null || $prototype == true) {
-            $instance = new HTMLPurifier_LanguageFactory();
-            $instance->setup();
-        }
-        return $instance;
-    }
-
-    /**
-     * Sets up the singleton, much like a constructor
-     * @note Prevents people from getting this outside of the singleton
-     */
-    public function setup() {
-        $this->validator = new HTMLPurifier_AttrDef_Lang();
-        $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
-    }
-
-    /**
-     * Creates a language object, handles class fallbacks
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @param $code Code to override configuration with. Private parameter.
-     */
-    public function create($config, $context, $code = false) {
-
-        // validate language code
-        if ($code === false) {
-            $code = $this->validator->validate(
-              $config->get('Core.Language'), $config, $context
-            );
-        } else {
-            $code = $this->validator->validate($code, $config, $context);
-        }
-        if ($code === false) $code = 'en'; // malformed code becomes English
-
-        $pcode = str_replace('-', '_', $code); // make valid PHP classname
-        static $depth = 0; // recursion protection
-
-        if ($code == 'en') {
-            $lang = new HTMLPurifier_Language($config, $context);
-        } else {
-            $class = 'HTMLPurifier_Language_' . $pcode;
-            $file  = $this->dir . '/Language/classes/' . $code . '.php';
-            if (file_exists($file) || class_exists($class, false)) {
-                $lang = new $class($config, $context);
-            } else {
-                // Go fallback
-                $raw_fallback = $this->getFallbackFor($code);
-                $fallback = $raw_fallback ? $raw_fallback : 'en';
-                $depth++;
-                $lang = $this->create($config, $context, $fallback);
-                if (!$raw_fallback) {
-                    $lang->error = true;
-                }
-                $depth--;
-            }
-        }
-
-        $lang->code = $code;
-
-        return $lang;
-
-    }
-
-    /**
-     * Returns the fallback language for language
-     * @note Loads the original language into cache
-     * @param $code string language code
-     */
-    public function getFallbackFor($code) {
-        $this->loadLanguage($code);
-        return $this->cache[$code]['fallback'];
-    }
-
-    /**
-     * Loads language into the cache, handles message file and fallbacks
-     * @param $code string language code
-     */
-    public function loadLanguage($code) {
-        static $languages_seen = array(); // recursion guard
-
-        // abort if we've already loaded it
-        if (isset($this->cache[$code])) return;
-
-        // generate filename
-        $filename = $this->dir . '/Language/messages/' . $code . '.php';
-
-        // default fallback : may be overwritten by the ensuing include
-        $fallback = ($code != 'en') ? 'en' : false;
-
-        // load primary localisation
-        if (!file_exists($filename)) {
-            // skip the include: will rely solely on fallback
-            $filename = $this->dir . '/Language/messages/en.php';
-            $cache = array();
-        } else {
-            include $filename;
-            $cache = compact($this->keys);
-        }
-
-        // load fallback localisation
-        if (!empty($fallback)) {
-
-            // infinite recursion guard
-            if (isset($languages_seen[$code])) {
-                trigger_error('Circular fallback reference in language ' .
-                    $code, E_USER_ERROR);
-                $fallback = 'en';
-            }
-            $language_seen[$code] = true;
-
-            // load the fallback recursively
-            $this->loadLanguage($fallback);
-            $fallback_cache = $this->cache[$fallback];
-
-            // merge fallback with current language
-            foreach ( $this->keys as $key ) {
-                if (isset($cache[$key]) && isset($fallback_cache[$key])) {
-                    if (isset($this->mergeable_keys_map[$key])) {
-                        $cache[$key] = $cache[$key] + $fallback_cache[$key];
-                    } elseif (isset($this->mergeable_keys_list[$key])) {
-                        $cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
-                    }
-                } else {
-                    $cache[$key] = $fallback_cache[$key];
-                }
-            }
-
-        }
-
-        // save to cache for later retrieval
-        $this->cache[$code] = $cache;
-
-        return;
-    }
+	/**
+	 * Cache of language code information used to load HTMLPurifier_Language objects
+	 * Structure is: $factory->cache[$language_code][$key] = $value
+	 * @value array map
+	 */
+	public $cache;
+
+	/**
+	 * Valid keys in the HTMLPurifier_Language object. Designates which
+	 * variables to slurp out of a message file.
+	 * @value array list
+	 */
+	public $keys = array('fallback', 'messages', 'errorNames');
+
+	/**
+	 * Instance of HTMLPurifier_AttrDef_Lang to validate language codes
+	 * @value object HTMLPurifier_AttrDef_Lang
+	 */
+	protected $validator;
+
+	/**
+	 * Cached copy of dirname(__FILE__), directory of current file without
+	 * trailing slash
+	 * @value string filename
+	 */
+	protected $dir;
+
+	/**
+	 * Keys whose contents are a hash map and can be merged
+	 * @value array lookup
+	 */
+	protected $mergeable_keys_map = array('messages' => true, 'errorNames' => true);
+
+	/**
+	 * Keys whose contents are a list and can be merged
+	 * @value array lookup
+	 */
+	protected $mergeable_keys_list = array();
+
+	/**
+	 * Retrieve sole instance of the factory.
+	 * @param $prototype Optional prototype to overload sole instance with,
+	 *                   or bool true to reset to default factory.
+	 */
+	public static function instance($prototype = null) {
+		static $instance = null;
+		if ($prototype !== null) {
+			$instance = $prototype;
+		} elseif ($instance === null || $prototype == true) {
+			$instance = new HTMLPurifier_LanguageFactory();
+			$instance->setup();
+		}
+		return $instance;
+	}
+
+	/**
+	 * Sets up the singleton, much like a constructor
+	 * @note Prevents people from getting this outside of the singleton
+	 */
+	public function setup() {
+		$this->validator = new HTMLPurifier_AttrDef_Lang();
+		$this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
+	}
+
+	/**
+	 * Creates a language object, handles class fallbacks
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @param $code Code to override configuration with. Private parameter.
+	 */
+	public function create($config, $context, $code = false) {
+
+		// validate language code
+		if ($code === false) {
+			$code = $this->validator->validate(
+			  $config->get('Core.Language'), $config, $context
+			);
+		} else {
+			$code = $this->validator->validate($code, $config, $context);
+		}
+		if ($code === false) $code = 'en'; // malformed code becomes English
+
+		$pcode = str_replace('-', '_', $code); // make valid PHP classname
+		static $depth = 0; // recursion protection
+
+		if ($code == 'en') {
+			$lang = new HTMLPurifier_Language($config, $context);
+		} else {
+			$class = 'HTMLPurifier_Language_' . $pcode;
+			$file  = $this->dir . '/Language/classes/' . $code . '.php';
+			if (file_exists($file) || class_exists($class, false)) {
+				$lang = new $class($config, $context);
+			} else {
+				// Go fallback
+				$raw_fallback = $this->getFallbackFor($code);
+				$fallback = $raw_fallback ? $raw_fallback : 'en';
+				$depth++;
+				$lang = $this->create($config, $context, $fallback);
+				if (!$raw_fallback) {
+					$lang->error = true;
+				}
+				$depth--;
+			}
+		}
+
+		$lang->code = $code;
+
+		return $lang;
+
+	}
+
+	/**
+	 * Returns the fallback language for language
+	 * @note Loads the original language into cache
+	 * @param $code string language code
+	 */
+	public function getFallbackFor($code) {
+		$this->loadLanguage($code);
+		return $this->cache[$code]['fallback'];
+	}
+
+	/**
+	 * Loads language into the cache, handles message file and fallbacks
+	 * @param $code string language code
+	 */
+	public function loadLanguage($code) {
+		static $languages_seen = array(); // recursion guard
+
+		// abort if we've already loaded it
+		if (isset($this->cache[$code])) return;
+
+		// generate filename
+		$filename = $this->dir . '/Language/messages/' . $code . '.php';
+
+		// default fallback : may be overwritten by the ensuing include
+		$fallback = ($code != 'en') ? 'en' : false;
+
+		// load primary localisation
+		if (!file_exists($filename)) {
+			// skip the include: will rely solely on fallback
+			$filename = $this->dir . '/Language/messages/en.php';
+			$cache = array();
+		} else {
+			include $filename;
+			$cache = compact($this->keys);
+		}
+
+		// load fallback localisation
+		if (!empty($fallback)) {
+
+			// infinite recursion guard
+			if (isset($languages_seen[$code])) {
+				trigger_error('Circular fallback reference in language ' .
+					$code, E_USER_ERROR);
+				$fallback = 'en';
+			}
+			$language_seen[$code] = true;
+
+			// load the fallback recursively
+			$this->loadLanguage($fallback);
+			$fallback_cache = $this->cache[$fallback];
+
+			// merge fallback with current language
+			foreach ( $this->keys as $key ) {
+				if (isset($cache[$key]) && isset($fallback_cache[$key])) {
+					if (isset($this->mergeable_keys_map[$key])) {
+						$cache[$key] = $cache[$key] + $fallback_cache[$key];
+					} elseif (isset($this->mergeable_keys_list[$key])) {
+						$cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
+					}
+				} else {
+					$cache[$key] = $fallback_cache[$key];
+				}
+			}
+
+		}
+
+		// save to cache for later retrieval
+		$this->cache[$code] = $cache;
+
+		return;
+	}
 
 }
 

Braces +7 added lines, -2 removed lines

@@ -90,7 +90,10 @@ 
         } else {
             $code = $this->validator->validate($code, $config, $context);
         }
-        if ($code === false) $code = 'en'; // malformed code becomes English
+        if ($code === false) {
+        	$code = 'en';
+        }
+        // malformed code becomes English
 
         $pcode = str_replace('-', '_', $code); // make valid PHP classname
         static $depth = 0; // recursion protection
@@ -139,7 +142,9 @@ 
         static $languages_seen = array(); // recursion guard
 
         // abort if we've already loaded it
-        if (isset($this->cache[$code])) return;
+        if (isset($this->cache[$code])) {
+        	return;
+        }
 
         // generate filename
         $filename = $this->dir . '/Language/messages/' . $code . '.php';

Spacing +8 added lines, -8 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function setup() {
         $this->validator = new HTMLPurifier_AttrDef_Lang();
-        $this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
+        $this->dir = HTMLPURIFIER_PREFIX.'/HTMLPurifier';
     }
 
     /**
@@ -98,8 +98,8 @@ 
         if ($code == 'en') {
             $lang = new HTMLPurifier_Language($config, $context);
         } else {
-            $class = 'HTMLPurifier_Language_' . $pcode;
-            $file  = $this->dir . '/Language/classes/' . $code . '.php';
+            $class = 'HTMLPurifier_Language_'.$pcode;
+            $file  = $this->dir.'/Language/classes/'.$code.'.php';
             if (file_exists($file) || class_exists($class, false)) {
                 $lang = new $class($config, $context);
             } else {
@@ -142,7 +142,7 @@ 
         if (isset($this->cache[$code])) return;
 
         // generate filename
-        $filename = $this->dir . '/Language/messages/' . $code . '.php';
+        $filename = $this->dir.'/Language/messages/'.$code.'.php';
 
         // default fallback : may be overwritten by the ensuing include
         $fallback = ($code != 'en') ? 'en' : false;
@@ -150,7 +150,7 @@ 
         // load primary localisation
         if (!file_exists($filename)) {
             // skip the include: will rely solely on fallback
-            $filename = $this->dir . '/Language/messages/en.php';
+            $filename = $this->dir.'/Language/messages/en.php';
             $cache = array();
         } else {
             include $filename;
@@ -162,7 +162,7 @@ 
 
             // infinite recursion guard
             if (isset($languages_seen[$code])) {
-                trigger_error('Circular fallback reference in language ' .
+                trigger_error('Circular fallback reference in language '.
                     $code, E_USER_ERROR);
                 $fallback = 'en';
             }
@@ -173,12 +173,12 @@ 
             $fallback_cache = $this->cache[$fallback];
 
             // merge fallback with current language
-            foreach ( $this->keys as $key ) {
+            foreach ($this->keys as $key) {
                 if (isset($cache[$key]) && isset($fallback_cache[$key])) {
                     if (isset($this->mergeable_keys_map[$key])) {
                         $cache[$key] = $cache[$key] + $fallback_cache[$key];
                     } elseif (isset($this->mergeable_keys_list[$key])) {
-                        $cache[$key] = array_merge( $fallback_cache[$key], $cache[$key] );
+                        $cache[$key] = array_merge($fallback_cache[$key], $cache[$key]);
                     }
                 } else {
                     $cache[$key] = $fallback_cache[$key];

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

Indentation +91 added lines, -91 removed lines

@@ -7,108 +7,108 @@
 class HTMLPurifier_Length
 {
 
-    /**
-     * String numeric magnitude.
-     */
-    protected $n;
+	/**
+	 * String numeric magnitude.
+	 */
+	protected $n;
 
-    /**
-     * String unit. False is permitted if $n = 0.
-     */
-    protected $unit;
+	/**
+	 * String unit. False is permitted if $n = 0.
+	 */
+	protected $unit;
 
-    /**
-     * Whether or not this length is valid. Null if not calculated yet.
-     */
-    protected $isValid;
+	/**
+	 * Whether or not this length is valid. Null if not calculated yet.
+	 */
+	protected $isValid;
 
-    /**
-     * Lookup array of units recognized by CSS 2.1
-     */
-    protected static $allowedUnits = array(
-        'em' => true, 'ex' => true, 'px' => true, 'in' => true,
-        'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
-    );
+	/**
+	 * Lookup array of units recognized by CSS 2.1
+	 */
+	protected static $allowedUnits = array(
+		'em' => true, 'ex' => true, 'px' => true, 'in' => true,
+		'cm' => true, 'mm' => true, 'pt' => true, 'pc' => true
+	);
 
-    /**
-     * @param number $n Magnitude
-     * @param string $u Unit
-     */
-    public function __construct($n = '0', $u = false) {
-        $this->n = (string) $n;
-        $this->unit = $u !== false ? (string) $u : false;
-    }
+	/**
+	 * @param number $n Magnitude
+	 * @param string $u Unit
+	 */
+	public function __construct($n = '0', $u = false) {
+		$this->n = (string) $n;
+		$this->unit = $u !== false ? (string) $u : false;
+	}
 
-    /**
-     * @param string $s Unit string, like '2em' or '3.4in'
-     * @warning Does not perform validation.
-     */
-    static public function make($s) {
-        if ($s instanceof HTMLPurifier_Length) return $s;
-        $n_length = strspn($s, '1234567890.+-');
-        $n = substr($s, 0, $n_length);
-        $unit = substr($s, $n_length);
-        if ($unit === '') $unit = false;
-        return new HTMLPurifier_Length($n, $unit);
-    }
+	/**
+	 * @param string $s Unit string, like '2em' or '3.4in'
+	 * @warning Does not perform validation.
+	 */
+	static public function make($s) {
+		if ($s instanceof HTMLPurifier_Length) return $s;
+		$n_length = strspn($s, '1234567890.+-');
+		$n = substr($s, 0, $n_length);
+		$unit = substr($s, $n_length);
+		if ($unit === '') $unit = false;
+		return new HTMLPurifier_Length($n, $unit);
+	}
 
-    /**
-     * Validates the number and unit.
-     */
-    protected function validate() {
-        // Special case:
-        if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
-        if ($this->n === '0' && $this->unit === false) return true;
-        if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
-        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
-        // Hack:
-        $def = new HTMLPurifier_AttrDef_CSS_Number();
-        $result = $def->validate($this->n, false, false);
-        if ($result === false) return false;
-        $this->n = $result;
-        return true;
-    }
+	/**
+	 * Validates the number and unit.
+	 */
+	protected function validate() {
+		// Special case:
+		if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
+		if ($this->n === '0' && $this->unit === false) return true;
+		if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
+		if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
+		// Hack:
+		$def = new HTMLPurifier_AttrDef_CSS_Number();
+		$result = $def->validate($this->n, false, false);
+		if ($result === false) return false;
+		$this->n = $result;
+		return true;
+	}
 
-    /**
-     * Returns string representation of number.
-     */
-    public function toString() {
-        if (!$this->isValid()) return false;
-        return $this->n . $this->unit;
-    }
+	/**
+	 * Returns string representation of number.
+	 */
+	public function toString() {
+		if (!$this->isValid()) return false;
+		return $this->n . $this->unit;
+	}
 
-    /**
-     * Retrieves string numeric magnitude.
-     */
-    public function getN() {return $this->n;}
+	/**
+	 * Retrieves string numeric magnitude.
+	 */
+	public function getN() {return $this->n;}
 
-    /**
-     * Retrieves string unit.
-     */
-    public function getUnit() {return $this->unit;}
+	/**
+	 * Retrieves string unit.
+	 */
+	public function getUnit() {return $this->unit;}
 
-    /**
-     * Returns true if this length unit is valid.
-     */
-    public function isValid() {
-        if ($this->isValid === null) $this->isValid = $this->validate();
-        return $this->isValid;
-    }
+	/**
+	 * Returns true if this length unit is valid.
+	 */
+	public function isValid() {
+		if ($this->isValid === null) $this->isValid = $this->validate();
+		return $this->isValid;
+	}
 
-    /**
-     * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
-     * @warning If both values are too large or small, this calculation will
-     *          not work properly
-     */
-    public function compareTo($l) {
-        if ($l === false) return false;
-        if ($l->unit !== $this->unit) {
-            $converter = new HTMLPurifier_UnitConverter();
-            $l = $converter->convert($l, $this->unit);
-            if ($l === false) return false;
-        }
-        return $this->n - $l->n;
-    }
+	/**
+	 * Compares two lengths, and returns 1 if greater, -1 if less and 0 if equal.
+	 * @warning If both values are too large or small, this calculation will
+	 *          not work properly
+	 */
+	public function compareTo($l) {
+		if ($l === false) return false;
+		if ($l->unit !== $this->unit) {
+			$converter = new HTMLPurifier_UnitConverter();
+			$l = $converter->convert($l, $this->unit);
+			if ($l === false) return false;
+		}
+		return $this->n - $l->n;
+	}
 
 }
 

Braces +33 added lines, -11 removed lines

@@ -44,11 +44,15 @@ 
      * @warning Does not perform validation.
      */
     static public function make($s) {
-        if ($s instanceof HTMLPurifier_Length) return $s;
+        if ($s instanceof HTMLPurifier_Length) {
+        	return $s;
+        }
         $n_length = strspn($s, '1234567890.+-');
         $n = substr($s, 0, $n_length);
         $unit = substr($s, $n_length);
-        if ($unit === '') $unit = false;
+        if ($unit === '') {
+        	$unit = false;
+        }
         return new HTMLPurifier_Length($n, $unit);
     }
 
@@ -57,14 +61,24 @@ 
      */
     protected function validate() {
         // Special case:
-        if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
-        if ($this->n === '0' && $this->unit === false) return true;
-        if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
-        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
+        if ($this->n === '+0' || $this->n === '-0') {
+        	$this->n = '0';
+        }
+        if ($this->n === '0' && $this->unit === false) {
+        	return true;
+        }
+        if (!ctype_lower($this->unit)) {
+        	$this->unit = strtolower($this->unit);
+        }
+        if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
+        	return false;
+        }
         // Hack:
         $def = new HTMLPurifier_AttrDef_CSS_Number();
         $result = $def->validate($this->n, false, false);
-        if ($result === false) return false;
+        if ($result === false) {
+        	return false;
+        }
         $this->n = $result;
         return true;
     }
@@ -73,7 +87,9 @@ 
      * Returns string representation of number.
      */
     public function toString() {
-        if (!$this->isValid()) return false;
+        if (!$this->isValid()) {
+        	return false;
+        }
         return $this->n . $this->unit;
     }
 
@@ -91,7 +107,9 @@ 
      * Returns true if this length unit is valid.
      */
     public function isValid() {
-        if ($this->isValid === null) $this->isValid = $this->validate();
+        if ($this->isValid === null) {
+        	$this->isValid = $this->validate();
+        }
         return $this->isValid;
     }
 
@@ -101,11 +119,15 @@ 
      *          not work properly
      */
     public function compareTo($l) {
-        if ($l === false) return false;
+        if ($l === false) {
+        	return false;
+        }
         if ($l->unit !== $this->unit) {
             $converter = new HTMLPurifier_UnitConverter();
             $l = $converter->convert($l, $this->unit);
-            if ($l === false) return false;
+            if ($l === false) {
+            	return false;
+            }
         }
         return $this->n - $l->n;
     }

Spacing +3 added lines, -3 removed lines

@@ -74,18 +74,18 @@
      */
     public function toString() {
         if (!$this->isValid()) return false;
-        return $this->n . $this->unit;
+        return $this->n.$this->unit;
     }
 
     /**
      * Retrieves string numeric magnitude.
      */
-    public function getN() {return $this->n;}
+    public function getN() {return $this->n; }
 
     /**
      * Retrieves string unit.
      */
-    public function getUnit() {return $this->unit;}
+    public function getUnit() {return $this->unit; }
 
     /**
      * Returns true if this length unit is valid.