Skip to content

Commit 676210d

Browse files
mambax7mambax7
authored
Merge pull request #17 from mambax7/master
3.1 FINAL
2 parents 7c14af3 + d63f18d commit 676210d

Some content is hidden

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

72 files changed

+798
-304
lines changed

‎.scrutinizer.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ build:
1313
override: true
1414
tests:
1515
override:
16-
- php-scrutinizer-run --enable-security-analysis
16+
- php-scrutinizer-run --enable-security-analysis
17+
environment:
18+
php:
19+
version: "7.2"
1720
filter:
1821
dependency_paths:
19-
- XoopsCore25/*
20-
- tag/*
22+
- XoopsCore25/*
23+
- tag/*
2124

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
1+
![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp8.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)
44
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
@@ -9,7 +9,7 @@ We accept contributions via Pull Requests on [Github](https://github.com/XoopsMo
99

1010
## Pull Requests
1111

12-
- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
12+
- **[PSR-12 Coding Standard](https://www.php-fig.org/psr/psr-12/)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
1313
- **Add tests!** - We encourage providing tests for your contributions.
1414
- **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are up-to-date.
1515
- **Consider our release cycle** - We try to follow [Semantic Versioning v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp8_400.png)
1+
![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp8.png)
22
## xLanguage module for [XOOPS CMS 2.5.10+](https://xoops.org)
33
[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
44
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)

‎admin/about.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
* @since 2.0
1717
* @author XOOPS Development Team
1818
**/
19+
1920
use Xmf\Module\Admin;
21+
2022
/** @var Admin $adminObject */
2123

22-
require __DIR__ . '/admin_header.php';
24+
require_once __DIR__ . '/admin_header.php';
2325
xoops_cp_header();
2426

2527
$adminObject->displayNavigation(basename(__FILE__));

‎admin/admin_header.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818

1919
//use XoopsModules\Xlanguage;
2020
use Xmf\Module\Admin;
21-
use XoopsModules\Xlanguage\{
22-
Helper
21+
use XoopsModules\Xlanguage\{Helper
2322
};
23+
2424
/** @var Helper $helper */
2525
/** @var Admin $adminObject */
2626

27-
require dirname(__DIR__) . '/preloads/autoloader.php';
27+
require \dirname(__DIR__) . '/preloads/autoloader.php';
2828

29-
require_once dirname(__DIR__, 3) . '/include/cp_header.php';
29+
require \dirname(__DIR__, 3) . '/include/cp_header.php';
3030
//require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
3131

32-
// require_once dirname(__DIR__) . '/class/Utility.php';
33-
require_once dirname(__DIR__) . '/include/common.php';
32+
// require_once \dirname(__DIR__) . '/class/Utility.php';
33+
require_once \dirname(__DIR__) . '/include/common.php';
3434

35-
$moduleDirName = basename(dirname(__DIR__));
35+
$moduleDirName = \basename(\dirname(__DIR__));
3636

37-
$helper = Helper::getInstance();
37+
$helper = Helper::getInstance();
3838
$adminObject = Admin::getInstance();
3939

4040
//$pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);

‎admin/index.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,42 @@
1717
**/
1818

1919
use Xmf\Module\Admin;
20+
use Xmf\Request;
21+
use Xmf\Yaml;
22+
use XoopsModules\Xlanguage\{
23+
Common,
24+
Common\TestdataButtons,
25+
Helper,
26+
Utility
27+
};
28+
29+
/** @var Admin $adminObject */
30+
/** @var Helper $helper */
31+
/** @var Utility $utility */
2032

2133
require_once __DIR__ . '/admin_header.php';
2234
xoops_cp_header();
2335

2436
$adminObject = Admin::getInstance();
2537

2638
$adminObject->displayNavigation(basename(__FILE__));
39+
40+
//------------- Test Data Buttons ----------------------------
41+
if ($helper->getConfig('displaySampleButton')) {
42+
TestdataButtons::loadButtonConfig($adminObject);
43+
$adminObject->displayButton('left', '');
44+
}
45+
$op = Request::getString('op', 0, 'GET');
46+
switch ($op) {
47+
case 'hide_buttons':
48+
TestdataButtons::hideButtons();
49+
break;
50+
case 'show_buttons':
51+
TestdataButtons::showButtons();
52+
break;
53+
}
54+
//------------- End Test Data Buttons ----------------------------
55+
2756
$adminObject->displayIndex();
2857

2958
require_once __DIR__ . '/admin_footer.php';

‎admin/main.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
use Xmf\Module\Admin;
2020
use Xmf\Request;
21-
use XoopsModules\Xlanguage\{
22-
Helper,
21+
use XoopsModules\Xlanguage\{Helper,
2322
LanguageHandler,
2423
Utility
2524
};
25+
2626
/** @var Helper $helper */
2727
/** @var LanguageHandler $languageHandler */
2828
/** @var Utility $utility */
@@ -46,7 +46,7 @@
4646

4747
define('XLANG_CONFIG_LINK', "<a href='main.php' target='_self'>" . _AM_XLANGUAGE_CONFIG . '</a>');
4848

49-
$helper = Helper::getInstance();
49+
$helper = Helper::getInstance();
5050
$languageHandler = $helper->getHandler('Language');
5151
$languageHandler->loadConfig();
5252

@@ -78,7 +78,7 @@
7878
} else {
7979
$lang = $languageHandler->create(true, $isBase);
8080
}
81-
$lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", '', $lang_name);
81+
$lang_name = preg_replace('/[^a-zA-Z0-9\_\-]/', '', $lang_name);
8282

8383
$lang->setVar('lang_name', $lang_name);
8484
$lang->setVar('lang_desc', $lang_desc);

‎admin/menu.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@
1818

1919
use Xmf\Module\Admin;
2020
use XoopsModules\Xlanguage;
21-
22-
// require_once dirname(__DIR__) . '/class/Helper.php';
23-
//require_once dirname(__DIR__) . '/include/common.php';
2421
/** @var Xlanguage\Helper $helper */
22+
23+
$moduleDirName = \basename(\dirname(__DIR__));
24+
$moduleDirNameUpper = mb_strtoupper($moduleDirName);
25+
2526
$helper = Xlanguage\Helper::getInstance();
2627
$helper->loadLanguage('common');
2728
$helper->loadLanguage('feedback');
2829

2930
$pathIcon32 = Admin::menuIconPath('');
30-
if (is_object($helper->getModule())) {
31-
$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
31+
$pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
32+
if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
33+
$pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
3234
}
3335

3436
$adminmenu[] = [

‎api.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
**/
1818

1919
use Xmf\Request;
20-
use XoopsModules\Xlanguage\{Helper,
20+
use XoopsModules\Xlanguage\{
21+
Helper,
2122
LanguageHandler,
2223
Utility
2324
};
@@ -99,9 +100,9 @@
99100
$GLOBALS['HTTP' . $HV . '_VARS'] = ${$HV};
100101
}
101102
}
102-
ob_start("XoopsModules\Xlanguage\Utility::encodeCharSet");
103+
ob_start('XoopsModules\Xlanguage\Utility::encodeCharSet');
103104
} else {
104-
ob_start("XoopsModules\Xlanguage\Utility::cleanMultiLang");
105+
ob_start('XoopsModules\Xlanguage\Utility::cleanMultiLang');
105106
}
106107

107108
/*

‎assets/css/index.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)