mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-31 19:30:21 +02:00
Remove trailing whitespace.
Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>
This commit is contained in:
@@ -9,46 +9,46 @@
|
||||
*/
|
||||
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,
|
||||
@@ -64,7 +64,7 @@ class HTMLPurifier_LanguageFactory
|
||||
}
|
||||
return $instance;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Sets up the singleton, much like a constructor
|
||||
* @note Prevents people from getting this outside of the singleton
|
||||
@@ -73,7 +73,7 @@ class HTMLPurifier_LanguageFactory
|
||||
$this->validator = new HTMLPurifier_AttrDef_Lang();
|
||||
$this->dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Creates a language object, handles class fallbacks
|
||||
* @param $config Instance of HTMLPurifier_Config
|
||||
@@ -81,7 +81,7 @@ class HTMLPurifier_LanguageFactory
|
||||
* @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(
|
||||
@@ -91,10 +91,10 @@ class HTMLPurifier_LanguageFactory
|
||||
$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 {
|
||||
@@ -114,13 +114,13 @@ class HTMLPurifier_LanguageFactory
|
||||
$depth--;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$lang->code = $code;
|
||||
|
||||
|
||||
return $lang;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the fallback language for language
|
||||
* @note Loads the original language into cache
|
||||
@@ -130,23 +130,23 @@ class HTMLPurifier_LanguageFactory
|
||||
$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
|
||||
@@ -156,10 +156,10 @@ class HTMLPurifier_LanguageFactory
|
||||
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 ' .
|
||||
@@ -167,11 +167,11 @@ class HTMLPurifier_LanguageFactory
|
||||
$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])) {
|
||||
@@ -184,14 +184,14 @@ class HTMLPurifier_LanguageFactory
|
||||
$cache[$key] = $fallback_cache[$key];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
// save to cache for later retrieval
|
||||
$this->cache[$code] = $cache;
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user