Skip to content

Commit cbf2aca

Browse files
mambax7mambax7
committed
cosmetics
1 parent e4370c5 commit cbf2aca

8 files changed

Lines changed: 65 additions & 31 deletions

File tree

‎.codeclimate.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
engines:
2+
eslint:
3+
enabled: true
4+
csslint:
5+
enabled: true
6+
duplication:
7+
enabled: true
8+
config:
9+
languages:
10+
- javascript
11+
- php
12+
fixme:
13+
enabled: true
14+
phpmd:
15+
enabled: true
16+
config:
17+
file_extensions:
18+
- php
19+
- inc
20+
phpcodesniffer:
21+
enabled: true
22+
config:
23+
file_extensions: "php,inc,lib"
24+
standard: "PSR1,PSR2"
25+
ratings:
26+
paths:
27+
- "**.inc"
28+
- "**.js"
29+
- "**.lib"
30+
- "**.php"
31+
exclude_paths: []

‎admin/langform.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
if ($isBase) {
2323
$lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name);
24-
$lang_select->addOptionArray($xlanguage_handler->getXoopsLangList());
24+
$lang_select->addOptionArray($xlanguageHandler->getXoopsLangList());
2525
$sform->addElement($lang_select, true);
2626
} else {
2727
$sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true);
@@ -40,7 +40,7 @@
4040
$sform->addElement($lang_charset, true);
4141

4242
if (!$isBase) {
43-
$baseList = $xlanguage_handler->getAll();
43+
$baseList = $xlanguageHandler->getAll();
4444
$base_list = array();
4545
foreach ($baseList as $base => $baselang) {
4646
$base_list[$base] = $base;

‎admin/main.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
define('XLANG_CONFIG_LINK', "<a href='main.php' target='_self'>" . _AM_XLANG_CONFIG . '</a>');
3838

39-
$xlanguage_handler = xoops_getModuleHandler('language', 'xlanguage');
40-
$xlanguage_handler->loadConfig();
39+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
40+
$xlanguageHandler->loadConfig();
4141

4242
switch ($op) {
4343
case 'del':
@@ -52,8 +52,8 @@
5252
if (isset($type) && $type === 'ext') {
5353
$isBase = false;
5454
}
55-
$lang = $xlanguage_handler->get($lang_id, $isBase);
56-
$xlanguage_handler->delete($lang);
55+
$lang = $xlanguageHandler->get($lang_id, $isBase);
56+
$xlanguageHandler->delete($lang);
5757
redirect_header('main.php', 2, _AM_XLANG_DELETED);
5858
}
5959
break;
@@ -64,9 +64,9 @@
6464
$isBase = false;
6565
}
6666
if (isset($lang_id) && $lang_id > 0) {
67-
$lang = $xlanguage_handler->get($lang_id, $isBase);
67+
$lang = $xlanguageHandler->get($lang_id, $isBase);
6868
} else {
69-
$lang = $xlanguage_handler->create(true, $isBase);
69+
$lang = $xlanguageHandler->create(true, $isBase);
7070
}
7171
$lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", '', $lang_name);
7272

@@ -79,7 +79,7 @@
7979
$lang->setVar('lang_base', $lang_base);
8080
}
8181
$lang->setVar('weight', $weight);
82-
$xlanguage_handler->insert($lang);
82+
$xlanguageHandler->insert($lang);
8383
redirect_header('main.php', 2, _AM_XLANG_SAVED);
8484
break;
8585

@@ -95,11 +95,11 @@
9595
$isBase = false;
9696
}
9797
if (isset($lang_id) && $lang_id > 0) {
98-
$lang = $xlanguage_handler->get($lang_id, $isBase);
98+
$lang = $xlanguageHandler->get($lang_id, $isBase);
9999
} elseif (isset($lang_name)) {
100-
$lang = $xlanguage_handler->getByName($lang_name, $isBase);
100+
$lang = $xlanguageHandler->getByName($lang_name, $isBase);
101101
} else {
102-
$lang = $xlanguage_handler->create(true, $isBase);
102+
$lang = $xlanguageHandler->create(true, $isBase);
103103
}
104104
$lang_name = $lang->getVar('lang_name');
105105
$lang_desc = $lang->getVar('lang_desc');
@@ -173,11 +173,11 @@
173173

174174
function languageList()
175175
{
176-
global $xlanguage_handler, $xoopsModule;
176+
global $xlanguageHandler, $xoopsModule;
177177

178178
global $pathIcon16;
179179

180-
$lang_list = $xlanguage_handler->getAllList();
180+
$lang_list = $xlanguageHandler->getAllList();
181181
if (is_array($lang_list) && count($lang_list) > 0) {
182182
echo "<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\">";
183183
echo "<div style='text-align: center;'><b><h4>" . _AM_XLANG_LANGLIST . '</h4></b><br>';

‎api.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
$xlanguage['lang'] = $xoopsConfig['language'];
4646
}
4747

48-
$xlanguage_handler = xoops_getModuleHandler('language', 'xlanguage');
49-
$xlanguage_handler->loadConfig();
50-
$lang = $xlanguage_handler->getByName($xlanguage['lang']);
48+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
49+
$xlanguageHandler->loadConfig();
50+
$lang = $xlanguageHandler->getByName($xlanguage['lang']);
5151
if (is_object($lang) && strcasecmp($lang->getVar('lang_name'), $xoopsConfig['language'])) {
5252
if ($lang->hasBase()) {
5353
$xoopsConfig['language'] = $lang->getVar('lang_name');
5454
} else {
55-
$lang_base = $xlanguage_handler->getByName($lang->getVar('lang_base'));
55+
$lang_base = $xlanguageHandler->getByName($lang->getVar('lang_base'));
5656
if (is_object($lang_base)) {
5757
$xlanguage['charset_base'] = $lang_base->getVar('lang_charset');
5858
$xlanguage['action'] = true;
@@ -69,7 +69,7 @@
6969
}
7070
unset($lang);
7171

72-
$GLOBALS['xlanguage_handler'] = $xlanguage_handler;
72+
$GLOBALS['xlanguage_handler'] = $xlanguageHandler;
7373

7474
if ($xlanguage['action']) {
7575
//if (CONV_REQUEST && (!empty($_GET)||!empty($_POST))) {

‎blocks/xlanguage_blocks.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ function b_xlanguage_select_show($options)
2424

2525
$block = array();
2626

27-
$xlanguage_handler = xoops_getModuleHandler('language', 'xlanguage');
28-
$xlanguage_handler->loadConfig();
29-
$lang_list = $xlanguage_handler->getAllList();
27+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
28+
$xlanguageHandler->loadConfig();
29+
$lang_list = $xlanguageHandler->getAllList();
3030
if (!is_array($lang_list) || count($lang_list) < 1) {
3131
return $block;
3232
}

‎class/language.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ public function &getAll($isBase = true)
237237
*/
238238
public function &getAllList()
239239
{
240-
$baseArray = $this->getAll();
240+
$baseArray =& $this->getAll();
241241

242-
$extArray = $this->getAll(false);
242+
$extArray =& $this->getAll(false);
243243
$ret = array();
244244
if (is_array($baseArray) && count($baseArray) > 0) {
245245
foreach ($baseArray as $base) {
@@ -382,7 +382,7 @@ public function createConfig()
382382

383383
$file_content = '<?php';
384384
unset($this->cached_config);
385-
$baseArray = $this->getAll();
385+
$baseArray =& $this->getAll();
386386
if (is_array($baseArray) && count($baseArray) > 0) {
387387
$file_content .= "\n \$" . XLANGUAGE_CONFIG_VAR . "['xlanguage_base'] = array(";
388388
foreach ($baseArray as $lang) {
@@ -399,7 +399,7 @@ public function createConfig()
399399
$file_content .= "\n );";
400400
}
401401

402-
$extArray = $this->getAll(false);
402+
$extArray =& $this->getAll(false);
403403
if (is_array($extArray) && count($extArray) > 0) {
404404
$file_content .= "\n \$" . XLANGUAGE_CONFIG_VAR . "['xlanguage_ext'] = array(";
405405
foreach ($extArray as $lang) {

‎include/functions.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ function xlanguage_convert_item($value, $out_charset, $in_charset)
5858
return $value;
5959
}
6060

61+
/**
62+
* @return mixed
63+
*/
6164
function xlanguage_createConfig()
6265
{
6366
$xlang_handler = xoops_getModuleHandler('language', 'xlanguage');
@@ -189,8 +192,8 @@ function xlanguage_ml($s)
189192
global $xoopsConfig;
190193
global $xlanguage_langs;
191194
if (!isset($xlanguage_langs)) {
192-
$xlanguage_handler = xoops_getModuleHandler('language', 'xlanguage');
193-
$langs = $xlanguage_handler->getAll(true);
195+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
196+
$langs = $xlanguageHandler->getAll(true);
194197
// $langs = $GLOBALS['xlanguage_handler']->getAll(true); //mb
195198
foreach (array_keys($langs) as $_lang) {
196199
$xlanguage_langs[$_lang] = $langs[$_lang]->getVar('lang_code');
@@ -325,7 +328,7 @@ function getPreferredLanguage()
325328
$langs = array();
326329
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
327330
// break up string into pieces (languages and q factors)
328-
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
331+
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.\d+))?/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
329332
if (count($lang_parse[1])) {
330333
// create a list like "en" => 0.8
331334
$langs = array_combine($lang_parse[1], $lang_parse[4]);
@@ -344,7 +347,7 @@ function getPreferredLanguage()
344347
break;
345348
}
346349
//if complex language simplify it
347-
if (stristr($lang, '-')) {
350+
if (strstr($lang, '-')) {
348351
$tmp = explode('-', $lang);
349352
$lang = $tmp[0];
350353
}

‎xoops_version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
//about
3535
$modversion['release_file'] = XOOPS_URL . '/modules/' . $modversion['dirname'] . '/docs/changelog.txt';
36-
$modversion['release_date'] = '2015/09/23';
36+
$modversion['release_date'] = '2016/06/12';
3737
$modversion['module_website_url'] = 'www.xoops.org/';
3838
$modversion['module_website_name'] = 'XOOPS';
3939
$modversion['module_status'] = 'Beta 1';

0 commit comments

Comments
 (0)