Skip to content

Commit a85001a

Browse files
mambax7mambax7
authored
Merge pull request #5 from mambax7/master
XOOPS 2.5.8, PHP 7
2 parents 33398c7 + cbf2aca commit a85001a

27 files changed

+604
-523
lines changed

‎.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: []

‎README.md‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
#xLanguage
2-
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
1+
![alt XOOPS CMS](http://xoops.org/images/logoXoops4GithubRepository.png)
2+
##xLanguage module for [XOOPS CMS 2.5.8+](https://xoops.org)
3+
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
4+
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/XoopsModules25x/xlanguage.svg?style=flat)](https://scrutinizer-ci.com/g/XoopsModules25x/xlanguage/?branch=master)
5+
[![Codacy Badge](https://api.codacy.com/project/badge/grade/177664bcc7874ab7bddc1192c59e480d)](https://www.codacy.com/app/mambax7/xlanguage_2)
6+
[![Code Climate](https://img.shields.io/codeclimate/github/XoopsModules25x/xlanguage.svg?style=flat)](https://codeclimate.com/github/XoopsModules25x/xlanguage)
7+
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/f9b47b9f-9d03-4d6f-a639-badc6e3b1475/mini.png)](https://insight.sensiolabs.com/projects/f9b47b9f-9d03-4d6f-a639-badc6e3b1475)
8+
[![Latest Pre-Release](https://img.shields.io/github/tag/XoopsModules25x/xlanguage.svg?style=flat)](https://github.com/XoopsModules25x/xlanguage/tags/)
9+
[![Latest Version](https://img.shields.io/github/release/XoopsModules25x/xlanguage.svg?style=flat)](https://github.com/XoopsModules25x/xlanguage/releases/)
10+
11+
xLanguage module for [XOOPS CMS](http://xoops.org) handles displaying contents in different languages, like English, French and Chinese. If you want to switch between languages, this module is for you.
12+
13+
[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/xlanguage-tutorial/) Tutorial: see [here](https://www.gitbook.com/book/xoops/xlanguage-tutorial/).
14+
To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/xlanguage-tutorial)
15+
16+
[![Translations on Transifex](http://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)
17+
18+
Please visit us on [http://xoops.org](http://xoops.org)
19+
20+
The upcoming "next generation" version of XOOPS CMS is being crafted on GitHub at: https://github.com/XOOPS
321

4-
xLanguage handles displaying contents in different languages, like English, French and Chinese. If you want to switch between languages, this module is for you.

‎admin/about.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
1111
*
1212
* @copyright XOOPS Project (http://xoops.org)
13-
* @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
14-
* @package xlanguage
13+
* @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
14+
* @package xlanguage
1515
* @since 2.0
16-
* @author XOOPS Development Team
17-
* @version $Id $
16+
* @author XOOPS Development Team
1817
**/
1918

2019
include_once __DIR__ . '/admin_header.php';
@@ -23,7 +22,7 @@
2322

2423
$aboutAdmin = new ModuleAdmin();
2524

26-
echo $aboutAdmin->addNavigation('about.php');
25+
echo $aboutAdmin->addNavigation(basename(__FILE__));
2726
echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
2827

2928
include_once __DIR__ . '/admin_footer.php';

‎admin/about2.php‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,60 +14,59 @@
1414
* @package xlanguage
1515
* @since 2.0
1616
* @author D.J.(phppp) [email protected]
17-
* @version $Id $
1817
**/
1918

2019
include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
21-
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
20+
include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
2221
xoops_cp_header();
23-
$myts = &MyTextSanitizer::getInstance();
22+
$myts = MyTextSanitizer::getInstance();
2423

25-
$module_handler =& xoops_gethandler('module');
26-
$versioninfo =& $module_handler->get($xoopsModule->getVar('mid'));
24+
$moduleHandler = xoops_getHandler('module');
25+
$versioninfo = $moduleHandler->get($xoopsModule->getVar('mid'));
2726

2827
// Left headings...
29-
echo "<a href='index.php'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/" . $versioninfo -> getInfo('image') . "' alt='' hspace='10' vspace='0' align='left'></a>";
30-
echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " ver "
31-
. $versioninfo->getInfo('version') . "</div>";
32-
echo "</div>";
33-
echo "<div>" . _MI_XLANG_RELEASE . ": " . $versioninfo -> getInfo('releasedate') . "</div>";
28+
echo "<a href='index.php'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/' . $versioninfo->getInfo('image') . "' alt='' hspace='10' vspace='0' align='left'></a>";
29+
echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . ' ver '
30+
. $versioninfo->getInfo('version') . '</div>';
31+
echo '</div>';
32+
echo '<div>' . _MI_XLANG_RELEASE . ': ' . $versioninfo->getInfo('releasedate') . '</div>';
3433

3534
// Author Information
36-
$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_INFO, "", "");
35+
$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_INFO, '', '');
3736
if ($versioninfo->getInfo('author_realname')) {
38-
$author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")";
37+
$author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
3938
} else {
4039
$author_name = $versioninfo->getInfo('author');
4140
}
42-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_NAME, $author_name));
43-
$author_sites = $versioninfo -> getInfo('author_website');
44-
$author_site_info = "";
41+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_NAME, $author_name));
42+
$author_sites = $versioninfo->getInfo('author_website');
43+
$author_site_info = '';
4544
foreach ($author_sites as $site) {
46-
$author_site_info .= "<a href='" . $site['url'] . "' target='blank'>" . $site['name'] . "</a>; ";
45+
$author_site_info .= "<a href='" . $site['url'] . "' target='blank'>" . $site['name'] . '</a>; ';
4746
}
48-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_WEBSITE, $author_site_info));
49-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo -> getInfo('author_email') . "'>" . $versioninfo -> getInfo('author_email') . "</a>"));
50-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_CREDITS, $versioninfo -> getInfo('credits')));
51-
$sform -> display();
47+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_WEBSITE, $author_site_info));
48+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo->getInfo('author_email') . "'>" . $versioninfo->getInfo('author_email') . '</a>'));
49+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_CREDITS, $versioninfo->getInfo('credits')));
50+
$sform->display();
5251

53-
$sform = new XoopsThemeForm(_MI_XLANG_MODULE_INFO, "", "");
54-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_STATUS, $versioninfo -> getInfo('status')));
55-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_XOOPSVERSION, $versioninfo -> getInfo('xoopsversion')));
56-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_DEMO, "<a href='" . $versioninfo -> getInfo('demo_site_url') . "' target='blank'>" . $versioninfo -> getInfo('demo_site_name') . "</a>"));
57-
$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_SUPPORT, "<a href='" . $versioninfo -> getInfo('support_site_url') . "' target='blank'>" . $versioninfo -> getInfo('support_site_name') . "</a>"));
58-
$sform -> display();
52+
$sform = new XoopsThemeForm(_MI_XLANG_MODULE_INFO, '', '');
53+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_MODULE_STATUS, $versioninfo->getInfo('status')));
54+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_MODULE_XOOPSVERSION, $versioninfo->getInfo('xoopsversion')));
55+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_MODULE_DEMO, "<a href='" . $versioninfo->getInfo('demo_site_url') . "' target='blank'>" . $versioninfo->getInfo('demo_site_name') . '</a>'));
56+
$sform->addElement(new XoopsFormLabel(_MI_XLANG_MODULE_SUPPORT, "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='blank'>" . $versioninfo->getInfo('support_site_name') . '</a>'));
57+
$sform->display();
5958

60-
$file = "../bugfixlist.txt";
59+
$file = '../bugfixlist.txt';
6160
if (@file_exists($file)) {
62-
$fp = @fopen($file, "r");
61+
$fp = @fopen($file, 'r');
6362
$bugtext = @fread($fp, filesize($file));
6463
@fclose($file);
65-
$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_BUGFIXES, "", "");
64+
$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_BUGFIXES, '', '');
6665
ob_start();
67-
echo "<div class='even' align='left'>".$myts->displayTarea($bugtext)."</div>";
68-
$sform -> addElement(new XoopsFormLabel('', ob_get_contents(), 0));
66+
echo "<div class='even' align='left'>" . $myts->displayTarea($bugtext) . '</div>';
67+
$sform->addElement(new XoopsFormLabel('', ob_get_contents(), 0));
6968
ob_end_clean();
70-
$sform -> display();
69+
$sform->display();
7170
unset($file);
7271
}
7372

‎admin/admin_footer.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?php
22

3-
echo "<div class='adminfooter'>\n"
4-
." <div style='text-align: center;'>\n"
5-
." <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
6-
." </div>\n"
7-
." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
8-
."</div>";
3+
echo "<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
4+
. " <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . " </div>\n" . ' ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
5+
. '</div>';
96

107
xoops_cp_footer();

‎admin/admin_header.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* @package xlanguage
1515
* @since 2.0
1616
* @author XOOPS Development Team
17-
* @version $Id $
1817
**/
1918

2019
$path = dirname(dirname(dirname(__DIR__)));
@@ -34,8 +33,8 @@
3433
xoops_loadLanguage('modinfo', $moduleDirName);
3534
xoops_loadLanguage('main', $moduleDirName);
3635

37-
$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
38-
$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
36+
$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
37+
$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
3938
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
4039

41-
include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
40+
include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');

‎admin/index.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* @package xlanguage
1515
* @since 2.0
1616
* @author XOOPS Team
17-
* @version $Id $
1817
**/
1918

2019
include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
@@ -24,7 +23,7 @@
2423

2524
$indexAdmin = new ModuleAdmin();
2625

27-
echo $indexAdmin->addNavigation('index.php');
28-
echo $indexAdmin->renderIndex();
26+
echo $indexAdmin->addNavigation(basename(__FILE__));
27+
echo $indexAdmin->renderIndex();
2928

3029
include_once __DIR__ . '/admin_footer.php';

‎admin/langform.inc.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
* @package xlanguage
1515
* @since 2.0
1616
* @author D.J.(phppp) [email protected]
17-
* @version $Id $
1817
**/
1918

20-
include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
21-
$sform = new XoopsThemeForm(_AM_XLANG_EDITLANG, "langform", xoops_getenv('PHP_SELF'));
19+
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
20+
$sform = new XoopsThemeForm(_AM_XLANG_EDITLANG, 'langform', xoops_getenv('PHP_SELF'));
2221

2322
if ($isBase) {
2423
$lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name);
25-
$lang_select->addOptionArray($xlanguage_handler->getXoopsLangList());
24+
$lang_select->addOptionArray($xlanguageHandler->getXoopsLangList());
2625
$sform->addElement($lang_select, true);
2726
} else {
2827
$sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true);
@@ -41,7 +40,7 @@
4140
$sform->addElement($lang_charset, true);
4241

4342
if (!$isBase) {
44-
$baseList =& $xlanguage_handler->getAll();
43+
$baseList = $xlanguageHandler->getAll();
4544
$base_list = array();
4645
foreach ($baseList as $base => $baselang) {
4746
$base_list[$base] = $base;
@@ -54,15 +53,16 @@
5453
$sform->addElement(new XoopsFormText(_AM_XLANG_WEIGHT, 'weight', 10, 10, $weight));
5554

5655
$image_option_tray = new XoopsFormElementTray(_AM_XLANG_IMAGE, '');
57-
$image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule -> dirname() . "/assets/images/");
58-
$lang_image =(empty($lang_image))?'noflag.gif':$lang_image;
59-
$image_select = new XoopsFormSelect('', 'lang_image', $lang_image);
56+
$image_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/assets/images/');
57+
$lang_image = empty($lang_image) ? 'noflag.gif' : $lang_image;
58+
$image_select = new XoopsFormSelect('', 'lang_image', $lang_image);
6059
$image_select->addOptionArray($image_array);
61-
$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 . "\")'");
6261
$image_tray = new XoopsFormElementTray('', '&nbsp;');
6362
$image_tray->addElement($image_select);
6463
if (!empty($lang_image)) {
65-
$image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/assets/images/" . $lang_image . "' name='image' id='image' alt='' /></div>"));
64+
$image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/assets/images/' . $lang_image
65+
. "' name='image' id='image' alt='' /></div>"));
6666
} else {
6767
$image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/images/blank.gif' name='image' id='image' alt='' /></div>"));
6868
}

0 commit comments

Comments
 (0)