deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing PHPMD errors

Browse source
This commit is contained in:
Dan Cryer 2014-12-11 17:07:06 +00:00
parent cfe15c9bed
commit 64b4fca3ca
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
PHPCI/Helper/Lang.php
View file

@ -60,8 +60,10 @@ class Lang
if (in_array($language, self::$languages)) { if (in_array($language, self::$languages)) {
self::$language = $language; self::$language = $language;
self::$strings = self::loadLanguage(); self::$strings = self::loadLanguage();
return; return true;
} }
return false;
} }
/** /**
@ -73,6 +75,7 @@ class Lang
$languages = array(); $languages = array();
foreach (self::$languages as $language) { foreach (self::$languages as $language) {
$strings = array();
require(PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php'); require(PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php');
$languages[$language] = $strings['language_name']; $languages[$language] = $strings['language_name'];
} }
@ -103,14 +106,8 @@ class Lang
} }
// Try cookies first: // Try cookies first:
if (isset($_COOKIE) && array_key_exists('phpcilang', $_COOKIE)) { if (isset($_COOKIE) && array_key_exists('phpcilang', $_COOKIE) && self::setLanguage($_COOKIE['phpcilang'])) {
$language = $_COOKIE['phpcilang']; return;
if (in_array($language, self::$languages)) {
self::$language = $language;
self::$strings = self::loadLanguage();
return;
}
} }
// Try user language: // Try user language:
@ -119,12 +116,9 @@ class Lang
foreach ($langs as $lang) { foreach ($langs as $lang) {
$parts = explode(';', $lang); $parts = explode(';', $lang);
$language = strtolower($parts[0]); $language = strtolower($parts[0]);
if (in_array($language, self::$languages)) { if (self::setLanguage($language)) {
self::$language = $language;
self::$strings = self::loadLanguage();
return; return;
} }
} }
@ -132,10 +126,7 @@ class Lang
// Try the installation default language: // Try the installation default language:
$language = $config->get('phpci.basic.language', null); $language = $config->get('phpci.basic.language', null);
if (self::setLanguage($language)) {
if (in_array($language, self::$languages)) {
self::$language = $language;
self::$strings = self::loadLanguage();
return; return;
} }