Skip to content

Commit e02937a

Browse files
mambax7mambax7
committed
3.05 RC 1
1 parent 9a13f21 commit e02937a

13 files changed

Lines changed: 87 additions & 73 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/
1919

2020
Please visit us on [https://xoops.org](https://xoops.org)
2121

22-
The upcoming "next generation" version of XOOPS CMS is being crafted on GitHub at: https://github.com/XOOPS
22+
Current and upcoming "next generation" versions of XOOPS CMS are being crafted on GitHub at: https://github.com/XOOPS
2323

‎admin/langform.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
$lang_image = empty($lang_image) ? 'noflag.gif' : $lang_image;
5858
$image_select = new XoopsFormSelect('', 'lang_image', $lang_image);
5959
$image_select->addOptionArray($image_array);
60-
$image_select->setExtra("onchange='showImgSelected(\"image\", \"lang_image\", \"/modules/" . $xoopsModule->dirname() . "/assets/images/\", \"\", \"" . XOOPS_URL . "\")'");
60+
$image_select->setExtra("onchange='showImgSelected(\"image\", \"lang_image\", \"/modules/" . $xoopsModule->dirname() . '/assets/images/", "", "' . XOOPS_URL . "\")'");
6161
$image_tray = new XoopsFormElementTray('', ' ');
6262
$image_tray->addElement($image_select);
6363
if (!empty($lang_image)) {

‎admin/main.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

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

39+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
3940
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
4041
$xlanguageHandler->loadConfig();
4142

‎admin/menu.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
use Xmf\Module\Admin;
2020
use Xmf\Module\Helper;
2121

22-
// defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
22+
// defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
2323

2424
//$path = dirname(dirname(dirname(__DIR__)));
2525
//require_once $path . '/mainfile.php';

‎api.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
$xlanguage['lang'] = $xoopsConfig['language'];
4646
}
4747

48+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
4849
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
4950
$xlanguageHandler->loadConfig();
5051
$lang = $xlanguageHandler->getByName($xlanguage['lang']);

‎blocks/xlanguage_blocks.php‎

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

2525
$block = array();
2626

27+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
2728
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
2829
$xlanguageHandler->loadConfig();
2930
$lang_list = $xlanguageHandler->getAllList();
@@ -52,10 +53,10 @@ function b_xlanguage_select_show($options)
5253
$QUERY_STRING_array = array_filter(explode('&', xoops_getenv('QUERY_STRING')));
5354
$QUERY_STRING_new = array();
5455
foreach ($QUERY_STRING_array as $QUERY) {
55-
if (substr($QUERY, 0, strlen(XLANGUAGE_LANG_TAG) + 1) != XLANGUAGE_LANG_TAG . '=') {
56+
if (0 !== strpos($QUERY, XLANGUAGE_LANG_TAG . '=')) {
5657
$vals = explode('=', $QUERY);
5758
foreach (array_keys($vals) as $key) {
58-
if (preg_match("/^a-z0-9$/i", $vals[$key])) {
59+
if (preg_match('/^a-z0-9$/i', $vals[$key])) {
5960
$vals[$key] = urlencode($vals[$key]);
6061
}
6162
}

‎class/language.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function loadConfig()
131131
*
132132
* @return Blanguage|null|Xlanguage
133133
*/
134-
public function &get($id, $isBase = true)
134+
public function get($id, $isBase = true)
135135
{
136136
$lang = null;
137137
$id = (int)$id;
@@ -162,7 +162,7 @@ public function &get($id, $isBase = true)
162162
*
163163
* @return Blanguage|null|Xlanguage
164164
*/
165-
public function &getByName($name)
165+
public function getByName($name)
166166
{
167167
$lang = null;
168168
if (empty($name) || preg_match("/[^a-zA-Z0-9\_\-]/", $name)) {
@@ -206,7 +206,7 @@ public function &getByName($name)
206206
*
207207
* @return array
208208
*/
209-
public function &getAll($isBase = true)
209+
public function getAll($isBase = true)
210210
{
211211
$prefix = $isBase ? 'xlanguage_base' : 'xlanguage_ext';
212212
$ret = array();
@@ -235,7 +235,7 @@ public function &getAll($isBase = true)
235235
/**
236236
* @return array
237237
*/
238-
public function &getAllList()
238+
public function getAllList()
239239
{
240240
$baseArray = $this->getAll();
241241

@@ -411,14 +411,14 @@ public function createConfig()
411411
if (is_array($baseArray) && count($baseArray) > 0) {
412412
$file_content .= "\n \$" . XLANGUAGE_CONFIG_VAR . "['xlanguage_base'] = array(";
413413
foreach ($baseArray as $lang) {
414-
$file_content .= "\n \"" . $lang->getVar('lang_name') . "\"=>array(";
414+
$file_content .= "\n \"" . $lang->getVar('lang_name') . '"=>array(';
415415
$file_content .= "\n \"lang_id\"=>" . $lang->getVar('lang_id') . ',';
416416
$file_content .= "\n \"weight\"=>" . $lang->getVar('weight') . ',';
417-
$file_content .= "\n \"lang_name\"=>\"" . $lang->getVar('lang_name') . "\",";
418-
$file_content .= "\n \"lang_desc\"=>\"" . $lang->getVar('lang_desc') . "\",";
419-
$file_content .= "\n \"lang_code\"=>\"" . $lang->getVar('lang_code') . "\",";
420-
$file_content .= "\n \"lang_charset\"=>\"" . $lang->getVar('lang_charset') . "\",";
421-
$file_content .= "\n \"lang_image\"=>\"" . $lang->getVar('lang_image') . "\"";
417+
$file_content .= "\n \"lang_name\"=>\"" . $lang->getVar('lang_name') . '",';
418+
$file_content .= "\n \"lang_desc\"=>\"" . $lang->getVar('lang_desc') . '",';
419+
$file_content .= "\n \"lang_code\"=>\"" . $lang->getVar('lang_code') . '",';
420+
$file_content .= "\n \"lang_charset\"=>\"" . $lang->getVar('lang_charset') . '",';
421+
$file_content .= "\n \"lang_image\"=>\"" . $lang->getVar('lang_image') . '"';
422422
$file_content .= "\n ),";
423423
}
424424
$file_content .= "\n );";
@@ -428,15 +428,15 @@ public function createConfig()
428428
if (is_array($extArray) && count($extArray) > 0) {
429429
$file_content .= "\n \$" . XLANGUAGE_CONFIG_VAR . "['xlanguage_ext'] = array(";
430430
foreach ($extArray as $lang) {
431-
$file_content .= "\n \"" . $lang->getVar('lang_name') . "\"=>array(";
431+
$file_content .= "\n \"" . $lang->getVar('lang_name') . '"=>array(';
432432
$file_content .= "\n \"lang_id\"=>" . $lang->getVar('lang_id') . ',';
433433
$file_content .= "\n \"weight\"=>" . $lang->getVar('weight') . ',';
434-
$file_content .= "\n \"lang_name\"=>\"" . $lang->getVar('lang_name') . "\",";
435-
$file_content .= "\n \"lang_desc\"=>\"" . $lang->getVar('lang_desc') . "\",";
436-
$file_content .= "\n \"lang_code\"=>\"" . $lang->getVar('lang_code') . "\",";
437-
$file_content .= "\n \"lang_charset\"=>\"" . $lang->getVar('lang_charset') . "\",";
438-
$file_content .= "\n \"lang_image\"=>\"" . $lang->getVar('lang_image') . "\",";
439-
$file_content .= "\n \"lang_base\"=>\"" . $lang->getVar('lang_base') . "\"";
434+
$file_content .= "\n \"lang_name\"=>\"" . $lang->getVar('lang_name') . '",';
435+
$file_content .= "\n \"lang_desc\"=>\"" . $lang->getVar('lang_desc') . '",';
436+
$file_content .= "\n \"lang_code\"=>\"" . $lang->getVar('lang_code') . '",';
437+
$file_content .= "\n \"lang_charset\"=>\"" . $lang->getVar('lang_charset') . '",';
438+
$file_content .= "\n \"lang_image\"=>\"" . $lang->getVar('lang_image') . '",';
439+
$file_content .= "\n \"lang_base\"=>\"" . $lang->getVar('lang_base') . '"';
440440
$file_content .= "\n ),";
441441
}
442442
$file_content .= "\n );";

‎class/utility.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static function checkVerXoops(XoopsModule $module = null, $requiredVer =
120120
}
121121
}
122122

123-
if (!$success) {
123+
if (false === $success) {
124124
$module->setErrors(sprintf(_AM_XLANG_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
125125
}
126126

‎docs/changelog.txt‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
3.05 RC 1 NOT RELEASED
2-
=================================
1+
<h5>3.05 RC 1 [2017-09-02]</h5>
2+
<hr>
33
- code cosmetics (mamba)
44
- removed @version (mamba)
55
- addNavigation(basename(__FILE__)) (mamba)
@@ -10,47 +10,53 @@
1010
- reference mismatch (mamba)
1111
- Hardening to type safe (mamba)
1212
- update Help (mamba)
13-
14-
3.05 Beta 1 NOT RELEASED
15-
=================================
13+
- php-cs-fixer updates (mamba)
14+
- started conversion to XMF (mamba)
15+
&nbsp;&nbsp;- updated addInfoBoxLine entries (mamba)
16+
&nbsp;&nbsp;- displayNavigation(basename(__FILE__)) (mamba)
17+
&nbsp;&nbsp;- changed to ->displayButton('left') (mamba)
18+
19+
<h5>3.05 Beta 1 [NOT RELEASED</h5>
20+
<hr>
1621
- moved all images, CSS, and JS files to /assets (mamba)
1722
- renamed .html Smarty templates to .tpl (mamba)
1823
- fixed language auto-detection (Rewarder/Mamba)
1924

20-
3.04:
21-
=================================
25+
<h5>3.04</h5>
26+
<hr>
2227
- updated POSIX Regex to PCRE (Mamba)
2328
- minor fixes (Mamba)
2429
- fixing generation of configuration file for extended languages
2530

26-
3.03:
27-
=================================
31+
<h5>3.03</h5>
32+
<hr>
2833
1 updated to XOOPS 2.5.x GUI using ModuleAdmin class (Mamba)
2934

30-
3.02:
31-
=================================
35+
<h5>3.02</h5>
36+
<hr>
37+
3238
1 adjusted for Xoops 2.4.0 using Preloads, no hacks of Core files required anymore in 2.4.0 and above (trabis)
3339

34-
3.0:
35-
=================================
40+
<h5>3.0:</h5>
41+
<hr>
3642
1 compatable for all Xoops active versions
3743
2 added smarty template for block
3844
3 added inline scripts for displaying language switch manner anywhere prefered
3945

40-
2.04:
41-
=================================
46+
<h5>2.04</h5>
47+
<hr>
4248
capable for different language cache, reported by suico @ xoops.org
4349

44-
2.03:
45-
=================================
50+
<h5>2.03</h5>
51+
<hr>
4652
"input" parse improvement, reported by irmtfan @ xoops.org
4753

48-
2.02
49-
=================================
54+
<h5>2.02</h5>
55+
<hr>
5056
bugfix for XSS vulnerability
5157
Thanks domifara @ dev.xoops.org
5258

53-
2.01
54-
=================================
59+
<h5>2.01</h5>
60+
<hr>
5561
bugfix for nonexisting language
5662

‎include/functions.php‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,20 @@ function xlanguage_convert_item($value, $out_charset, $in_charset)
6363
*/
6464
function xlanguage_createConfig()
6565
{
66-
$xlangHandler = xoops_getModuleHandler('language', 'xlanguage');
66+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
67+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
6768

68-
return $xlangHandler->createConfig();
69+
return $xlanguageHandler->createConfig();
6970
}
7071

7172
/**
7273
* @return mixed
7374
*/
7475
function xlanguage_loadConfig()
7576
{
76-
$xlangHandler = xoops_getModuleHandler('language', 'xlanguage');
77-
$config = $xlangHandler->loadFileConfig();
77+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
78+
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
79+
$config = $xlanguageHandler->loadFileConfig();
7880

7981
return $config;
8082
}
@@ -180,7 +182,8 @@ function xlanguage_encoding($output)
180182
$in_charset = $xlanguage['charset_base'];
181183
$out_charset = $xlanguage['charset'];
182184

183-
return $output = xlanguage_convert_encoding($output, $out_charset, $in_charset);
185+
$output = xlanguage_convert_encoding($output, $out_charset, $in_charset);
186+
return $output;
184187
}
185188

186189
/**
@@ -192,6 +195,8 @@ function xlanguage_ml($s)
192195
global $xoopsConfig;
193196
global $xlanguage_langs;
194197
if (!isset($xlanguage_langs)) {
198+
199+
/** @var \XlanguageLanguageHandler $xlanguageHandler */
195200
$xlanguageHandler = xoops_getModuleHandler('language', 'xlanguage');
196201
$langs = $xlanguageHandler->getAll(true);
197202
// $langs = $GLOBALS['xlanguageHandler']->getAll(true); //mb
@@ -283,11 +288,11 @@ function xlanguage_select_show($options = null)
283288
if (!empty($block['display'])) { //mb
284289
if (in_array($block['display'], array('images', 'text'))) {
285290
foreach ($block['languages'] as $name => $lang) {
286-
$content .= "<a href=\"" . $block['url'] . $lang['name'] . "\" title=\"" . $lang['desc'] . "\">";
291+
$content .= '<a href="' . $block['url'] . $lang['name'] . '" title="' . $lang['desc'] . '">';
287292
if ($block['display'] === 'images') {
288-
$content .= "<img src=\"" . $lang['image'] . "\" alt=\"" . $lang['desc'] . "\"";
293+
$content .= '<img src="' . $lang['image'] . '" alt="' . $lang['desc'] . '"';
289294
if ($block['selected'] != $lang['name']) {
290-
$content .= " style=\"MozOpacity: .8; opacity: .8; filter:Alpha(opacity=80);\"";
295+
$content .= ' style="MozOpacity: .8; opacity: .8; filter:Alpha(opacity=80);"';
291296
}
292297
$content .= '>';
293298
} else {
@@ -299,12 +304,12 @@ function xlanguage_select_show($options = null)
299304
}
300305
}
301306
} else {
302-
$content .= "<select name=\"" . $block['tag'] . "\"
303-
onChange=\"if (this.options[this.selectedIndex].value.length >0) { window.document.location=this.options[this.selectedIndex].value;}\"
304-
>";
307+
$content .= '<select name="' . $block['tag'] . '"
308+
onChange="if (this.options[this.selectedIndex].value.length >0) { window.document.location=this.options[this.selectedIndex].value;}"
309+
>';
305310
if (!empty($block['languages'])) { //mb
306311
foreach ($block['languages'] as $name => $lang) {
307-
$content .= "<option value=\"" . $block['url'] . $lang['name'] . "\"";
312+
$content .= '<option value="' . $block['url'] . $lang['name'] . '"';
308313
if ($block['selected'] == $lang['name']) {
309314
$content .= ' selected ';
310315
}

0 commit comments

Comments
 (0)