Skip to content

Commit b0a7cb3

Browse files
mambax7mambax7
authored
Merge pull request #9 from mambax7/master
3.1 RC 1
2 parents 22887c9 + 8c3f7df commit b0a7cb3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2615
-1210
lines changed

‎.scrutinizer.yml‎

Lines changed: 21 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,21 @@
1-
checks:
2-
php:
3-
code_rating: true
4-
variable_existence: true
5-
useless_calls: true
6-
use_statement_alias_conflict: true
7-
unused_variables: true
8-
unused_properties: true
9-
unused_parameters: true
10-
unused_methods: true
11-
unreachable_code: true
12-
sql_injection_vulnerabilities: true
13-
security_vulnerabilities: true
14-
precedence_mistakes: true
15-
precedence_in_conditions: true
16-
parameter_non_unique: true
17-
no_property_on_interface: true
18-
no_non_implemented_abstract_methods: true
19-
deprecated_code_usage: true
20-
closure_use_not_conflicting: true
21-
closure_use_modifiable: true
22-
avoid_useless_overridden_methods: true
23-
avoid_conflicting_incrementers: true
24-
assignment_of_null_return: true
25-
verify_property_names: true
26-
verify_argument_usable_as_reference: true
27-
verify_access_scope_valid: true
28-
use_self_instead_of_fqcn: true
29-
too_many_arguments: true
30-
single_namespace_per_use: true
31-
return_doc_comment_if_not_inferrable: true
32-
return_doc_comments: true
33-
require_scope_for_methods: true
34-
require_scope_for_properties: true
35-
require_php_tag_first: true
36-
require_braces_around_control_structures: true
37-
psr2_control_structure_declaration: true
38-
psr2_switch_declaration: true
39-
psr2_class_declaration: true
40-
no_eval: true
41-
no_else_if_statements: true
42-
avoid_corrupting_byteorder_marks: true
43-
argument_type_checks: true
44-
php5_style_constructor: true
45-
parameter_doc_comments: true
46-
no_duplicate_arguments: true
47-
missing_arguments: true
48-
instanceof_class_exists: true
49-
foreach_traversable: true
50-
no_unnecessary_function_call_in_for_loop: true
1+
# language: php
2+
build:
3+
nodes:
4+
tests: true
5+
analysis:
6+
dependencies:
7+
after:
8+
# The following installs the most recent XOOPS CMS version, you might want
9+
# to install a specific release tag or branch instead.
10+
- git clone --depth=1 https://github.com/XOOPS/XoopsCore25
11+
- git clone --depth=1 https://github.com/mambax7/tag
12+
project_setup:
13+
override: true
14+
tests:
15+
override:
16+
- php-scrutinizer-run --enable-security-analysis
17+
filter:
18+
dependency_paths:
19+
- XoopsCore25/*
20+
- tag/*
21+

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
22
# Contributing to [XOOPS CMS](https://xoops.org)
33
[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
4-
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
4+
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
55

66
Contributions are **welcome** and will be fully **credited**.
77

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
2-
## xLanguage module for [XOOPS CMS 2.5.8+](https://xoops.org)
2+
## xLanguage module for [XOOPS CMS 2.5.9+](https://xoops.org)
33
[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
4-
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
4+
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
55

66
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/XoopsModules25x/xlanguage.svg?style=flat)](https://scrutinizer-ci.com/g/XoopsModules25x/xlanguage/?branch=master)
77
[![Codacy Badge](https://api.codacy.com/project/badge/grade/177664bcc7874ab7bddc1192c59e480d)](https://www.codacy.com/app/mambax7/xlanguage_2)
@@ -12,7 +12,7 @@
1212

1313
**xLanguage** module for [XOOPS CMS](https://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.
1414

15-
[![Tutorial Available](https://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/).
15+
[![Tutorial Available](https://xoops.org/images/tutorial-available-blue.svg)](https://xoops.gitbook.io/xlanguage-tutorial/) Tutorial: see [here](https://xoops.gitbook.io/xlanguage-tutorial/).
1616
To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/xlanguage-tutorial)
1717

1818
[![Translations on Transifex](https://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)

‎admin/about.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
* @since 2.0
1616
* @author XOOPS Development Team
1717
**/
18-
1918
require_once __DIR__ . '/admin_header.php';
2019
xoops_cp_header();
2120

2221
$adminObject->displayNavigation(basename(__FILE__));
23-
$adminObject->setPaypal('xoopsfoundation@gmail.com');
22+
$adminObject::setPaypal('xoopsfoundation@gmail.com');
2423
$adminObject->displayAbout(false);
2524

2625
require_once __DIR__ . '/admin_footer.php';

‎admin/about2.php‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎admin/admin_header.php‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,36 @@
1616
* @author XOOPS Development Team
1717
**/
1818

19-
require_once __DIR__ . '/../../../include/cp_header.php';
19+
//use XoopsModules\Xlanguage;
20+
include dirname(__DIR__) . '/preloads/autoloader.php';
21+
22+
require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
2023
//require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
2124

22-
require_once __DIR__ . '/../class/utility.php';
23-
//require_once __DIR__ . '/../include/common.php';
25+
// require_once dirname(__DIR__) . '/class/Utility.php';
26+
require_once dirname(__DIR__) . '/include/common.php';
2427

2528
$moduleDirName = basename(dirname(__DIR__));
2629

27-
if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
28-
} else {
29-
$moduleHelper = Xmf\Module\Helper::getHelper('system');
30-
}
30+
/** @var \XoopsModules\Xlanguage\Helper $helper */
31+
$helper = \XoopsModules\Xlanguage\Helper::getInstance();
32+
33+
/** @var \Xmf\Module\Admin $adminObject */
3134
$adminObject = \Xmf\Module\Admin::getInstance();
3235

33-
$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
34-
$pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
35-
$pathModIcon32 = $moduleHelper->getModule()->getInfo('modicons32');
36+
//$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
37+
//$pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
38+
//$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
3639

3740
// Load language files
38-
$moduleHelper->loadLanguage('admin');
39-
$moduleHelper->loadLanguage('modinfo');
40-
$moduleHelper->loadLanguage('main');
41-
42-
$myts = MyTextSanitizer::getInstance();
43-
44-
if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
45-
require_once $GLOBALS['xoops']->path('class/template.php');
46-
$xoopsTpl = new XoopsTpl();
47-
}
41+
$helper->loadLanguage('admin');
42+
$helper->loadLanguage('modinfo');
43+
$helper->loadLanguage('common');
44+
//$helper->loadLanguage('main');
45+
46+
//$myts = \MyTextSanitizer::getInstance();
47+
//
48+
//if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
49+
// require_once $GLOBALS['xoops']->path('class/template.php');
50+
// $xoopsTpl = new \XoopsTpl();
51+
//}

‎admin/index.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
* @author XOOPS Team
1717
**/
1818

19-
require_once __DIR__ . '/../../../include/cp_header.php';
20-
2119
require_once __DIR__ . '/admin_header.php';
2220
xoops_cp_header();
2321

‎admin/langform.inc.php‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,68 +15,67 @@
1515
* @since 2.0
1616
* @author D.J.(phppp) php_pp@hotmail.com
1717
**/
18-
19-
include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
20-
$sform = new XoopsThemeForm(_AM_XLANG_EDITLANG, 'langform', xoops_getenv('PHP_SELF'), 'post', true);
18+
require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
19+
$sform = new \XoopsThemeForm(_AM_XLANGUAGE_EDITLANG, 'langform', xoops_getenv('SCRIPT_NAME'), 'post', true);
2120

2221
if ($isBase) {
23-
$lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name);
22+
$lang_select = new \XoopsFormSelect(_AM_XLANGUAGE_NAME, 'lang_name', $lang_name);
2423
$lang_select->addOptionArray($xlanguageHandler->getXoopsLangList());
2524
$sform->addElement($lang_select, true);
2625
} else {
27-
$sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true);
26+
$sform->addElement(new \XoopsFormText(_AM_XLANGUAGE_NAME, 'lang_name', 50, 255, $lang_name), true);
2827
}
2928

30-
$sform->addElement(new XoopsFormText(_AM_XLANG_DESC, 'lang_desc', 50, 255, $lang_desc));
29+
$sform->addElement(new \XoopsFormText(_AM_XLANGUAGE_DESC, 'lang_desc', 50, 255, $lang_desc));
3130

32-
//$sform->addElement(new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code), true);
33-
$lang_code = new XoopsFormText(_AM_XLANG_CODE, 'lang_code', 50, 255, $lang_code);
34-
$lang_code->setDescription(_AM_XLANG_CODE_DESC);
31+
//$sform->addElement(new \XoopsFormText(_AM_XLANGUAGE_CODE, 'lang_code', 50, 255, $lang_code), true);
32+
$lang_code = new \XoopsFormText(_AM_XLANGUAGE_CODE, 'lang_code', 50, 255, $lang_code);
33+
$lang_code->setDescription(_AM_XLANGUAGE_CODE_DESC);
3534
$sform->addElement($lang_code, true);
3635

37-
//$sform->addElement(new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset), true);
38-
$lang_charset = new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset);
39-
$lang_charset->setDescription(_AM_XLANG_CHARSET_DESC);
36+
//$sform->addElement(new \XoopsFormText(_AM_XLANGUAGE_CHARSET, 'lang_charset', 50, 255, $lang_charset), true);
37+
$lang_charset = new \XoopsFormText(_AM_XLANGUAGE_CHARSET, 'lang_charset', 50, 255, $lang_charset);
38+
$lang_charset->setDescription(_AM_XLANGUAGE_CHARSET_DESC);
4039
$sform->addElement($lang_charset, true);
4140

4241
if (!$isBase) {
4342
$baseList = $xlanguageHandler->getAll();
44-
$base_list = array();
43+
$base_list = [];
4544
foreach ($baseList as $base => $baselang) {
4645
$base_list[$base] = $base;
4746
}
4847

49-
$base_select = new XoopsFormSelect(_AM_XLANG_BASE, 'lang_base', $lang_base);
48+
$base_select = new \XoopsFormSelect(_AM_XLANGUAGE_BASE, 'lang_base', $lang_base);
5049
$base_select->addOptionArray($base_list);
5150
$sform->addElement($base_select, true);
5251
}
53-
$sform->addElement(new XoopsFormText(_AM_XLANG_WEIGHT, 'weight', 10, 10, $weight));
52+
$sform->addElement(new \XoopsFormText(_AM_XLANGUAGE_WEIGHT, 'weight', 10, 10, $weight));
5453

55-
$image_option_tray = new XoopsFormElementTray(_AM_XLANG_IMAGE, '');
56-
$image_array = XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/assets/images/');
54+
$image_option_tray = new \XoopsFormElementTray(_AM_XLANGUAGE_IMAGE, '');
55+
$image_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/assets/images/');
5756
$lang_image = empty($lang_image) ? 'noflag.gif' : $lang_image;
58-
$image_select = new XoopsFormSelect('', 'lang_image', $lang_image);
57+
$image_select = new \XoopsFormSelect('', 'lang_image', $lang_image);
5958
$image_select->addOptionArray($image_array);
6059
$image_select->setExtra("onchange='showImgSelected(\"image\", \"lang_image\", \"/modules/" . $xoopsModule->dirname() . '/assets/images/", "", "' . XOOPS_URL . "\")'");
61-
$image_tray = new XoopsFormElementTray('', ' ');
60+
$image_tray = new \XoopsFormElementTray('', ' ');
6261
$image_tray->addElement($image_select);
6362
if (!empty($lang_image)) {
64-
$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>"));
63+
$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>"));
6564
} else {
66-
$image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/images/blank.gif' name='image' id='image' alt=''></div>"));
65+
$image_tray->addElement(new \XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/images/blank.gif' name='image' id='image' alt=''></div>"));
6766
}
6867
$image_option_tray->addElement($image_tray);
6968
$sform->addElement($image_option_tray);
7069

7170
if (isset($lang_id)) {
72-
$sform->addElement(new XoopsFormHidden('lang_id', $lang_id));
71+
$sform->addElement(new \XoopsFormHidden('lang_id', $lang_id));
7372
}
74-
$sform->addElement(new XoopsFormHidden('type', $type));
73+
$sform->addElement(new \XoopsFormHidden('type', $type));
7574

76-
$button_tray = new XoopsFormElementTray('', '');
77-
$button_tray->addElement(new XoopsFormHidden('op', 'save'));
78-
$button_tray->addElement(new XoopsFormButton('', '', _SUBMIT, 'submit'));
79-
$button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit'));
80-
$sform->addElement($button_tray);
75+
$buttonTray = new \XoopsFormElementTray('', '');
76+
$buttonTray->addElement(new \XoopsFormHidden('op', 'save'));
77+
$buttonTray->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
78+
$buttonTray->addElement(new \XoopsFormButton('', '', _CANCEL, 'submit'));
79+
$sform->addElement($buttonTray);
8180

8281
$sform->display();

0 commit comments

Comments
 (0)