Merge pull request #89 from mambax7/master

updates/cosmetics
XoopsModules25x · Oct 29, 2021 · 796a84c · 796a84c
2 parents f89f00b + efdf48c
commit 796a84c
Show file tree

Hide file tree

Showing 191 changed files with 1,818 additions and 5,588 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -7,17 +7,17 @@ build:
     analysis:
       dependencies:
         after:
-        # The following installs the most recent XOOPS CMS version, you might want
-        # to install a specific release tag or branch instead.
-        - git clone --depth=1 https://github.com/XOOPS/XoopsCore25
-        - git clone --depth=1 https://github.com/mambax7/tag
+          # The following installs the most recent XOOPS CMS version, you might want
+          # to install a specific release tag or branch instead.
+          - git clone --depth=1 https://github.com/XOOPS/XoopsCore25
+          - git clone --depth=1 https://github.com/mambax7/tag
       project_setup:
         override: true
       tests:
         override:
-        - php-scrutinizer-run --enable-security-analysis
+          - php-scrutinizer-run --enable-security-analysis
 filter:
   dependency_paths:
-  - XoopsCore25/*
-  - tag/*
+    - XoopsCore25/*
+    - tag/*
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,5 +1,7 @@
 ![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
+
 # Contributing to [XOOPS CMS](https://xoops.org)
+
 [![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
 [![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
 

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 ![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
+
 ## TdmDownloads module for  [XOOPS CMS 2.5.9+](https://xoops.org)
+
 [![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
 [![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
 
@@ -11,8 +13,8 @@
 
 **TdmDownloads** module for [XOOPS CMS](https://xoops.org) creates a Downloads section where users can download/submit/rate various files.
 
-[![Tutorial Available](https://xoops.org/images/tutorial-available-blue.svg)](https://xoops.gitbook.io/tdmdownloads-tutorial/) Tutorial: see [GitBook](https://xoops.gitbook.io/tdmdownloads-tutorial/).
-To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/tdmdownloads-tutorial)
+[![Tutorial Available](https://xoops.org/images/tutorial-available-blue.svg)](https://xoops.gitbook.io/tdmdownloads-tutorial/) Tutorial: see [GitBook](https://xoops.gitbook.io/tdmdownloads-tutorial/). To contribute to the
+Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/tdmdownloads-tutorial)
 
 [![Translations on Transifex](https://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)
 

diff --git a/admin/about.php b/admin/about.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * TDMDownload
@@ -23,7 +25,7 @@
 xoops_cp_header();
 // pour file protection
 $xoopsUrl       = parse_url(XOOPS_URL);
-$xoopsUrl       = str_replace('www.', '', $xoopsUrl['host']??'');
+$xoopsUrl       = str_replace('www.', '', $xoopsUrl['host'] ?? '');
 $fileProtection = _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO1 . '<br><br>' . XOOPS_ROOT_PATH . '/uploads/' . $moduleDirName . '/downloads/' . '<br><br>' . _AM_TDMDOWNLOADS_ABOUT_FILEPROTECTION_INFO2 . '<br><br>';
 $fileProtection .= 'RewriteEngine on' . '<br>' . 'RewriteCond %s{HTTP_REFERER} !' . $xoopsUrl . '/.*$ [NC]<br>ReWriteRule \.*$ - [F]';
 

diff --git a/admin/admin_footer.php b/admin/admin_footer.php
@@ -1,5 +1,6 @@
-<?php declare(strict_types=1);
+<?php
 
+declare(strict_types=1);
 /*
  * You may not change or alter any portion of this comment or credits
  * of supporting developers from this source code or any supporting source code
@@ -9,7 +10,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
-
 /**
  * @copyright    XOOPS Project (https://xoops.org)
  * @license      GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html)
@@ -20,5 +20,4 @@
 if (isset($templateMain)) {
     $GLOBALS['xoopsTpl']->display("db:{$templateMain}");
 }
-
 xoops_cp_footer();
diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * TDMDownload
@@ -18,60 +20,46 @@
 use Xmf\Module\Admin;
 use XoopsModules\Tdmdownloads\{
     Helper,
-    Tree};
+    Tree
+};
 
 // Include xoops admin header
 require_once dirname(__DIR__, 3) . '/include/cp_header.php';
-
 require_once XOOPS_ROOT_PATH . '/kernel/module.php';
 require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 //require_once XOOPS_ROOT_PATH . '/class/tree.php';
 //require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
 require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
 require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-
 require dirname(__DIR__) . '/include/common.php';
-
 $moduleDirName = basename(dirname(__DIR__));
-
-/** @var \XoopsModules\Tdmdownloads\Helper $helper */
 $helper = Helper::getInstance();
-
 /** @var \Xmf\Module\Admin $adminObject */
 $adminObject = Admin::getInstance();
-
-$myts = \MyTextSanitizer::getInstance();
-
+$myts        = \MyTextSanitizer::getInstance();
 if ($xoopsUser) {
     $xoopsModule = \XoopsModule::getByDirname($moduleDirName);
-
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
         redirect_header(XOOPS_URL . '/', 3, _NOPERM);
     }
 } else {
     redirect_header(XOOPS_URL . '/', 3, _NOPERM);
 }
-
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
     require_once $GLOBALS['xoops']->path('class/template.php');
-
     $xoopsTpl = new \XoopsTpl();
 }
-
 // Include language file
 xoops_loadLanguage('admin', 'system');
 // Load language files
 $helper->loadLanguage('admin');
 $helper->loadLanguage('modinfo');
 $helper->loadLanguage('main');
 $helper->loadLanguage('common');
-
 if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
     require_once $GLOBALS['xoops']->path('class/theme.php');
-
     $GLOBALS['xoTheme'] = new \xos_opal_Theme();
 }
-
 //paramétres:
 // pour les images des catégories:
 $uploaddir = XOOPS_ROOT_PATH . '/uploads/' . $moduleDirName . '/images/cats/';
@@ -85,7 +73,6 @@
 // pour les images des champs:
 $uploaddir_field = XOOPS_ROOT_PATH . '/uploads/' . $moduleDirName . '/images/field/';
 $uploadurl_field = XOOPS_URL . '/uploads/' . $moduleDirName . '/images/field/';
-
 //permission
 /** @var \XoopsGroupPermHandler $grouppermHandler */
 $grouppermHandler = xoops_getHandler('groupperm');

diff --git a/admin/blockform.php b/admin/blockform.php
@@ -1,5 +1,6 @@
-<?php declare(strict_types=1);
+<?php
 
+declare(strict_types=1);
 /**
  * You may not change or alter any portion of this comment or credits
  * of supporting developers from this source code or any supporting source code
@@ -14,27 +15,23 @@
  * @license         GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  */
 require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName); //$capsDirName
-
-$form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
+$form               = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
 if (isset($block['name'])) {
     $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_NAME, $block['name']));
 }
 $side_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
-$side_select->addOptionArray(
-    [
-        0 => _AM_SYSTEM_BLOCKS_SBLEFT,
-        1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
-        3 => _AM_SYSTEM_BLOCKS_CBLEFT,
-        4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
-        5 => _AM_SYSTEM_BLOCKS_CBCENTER,
-        7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-        8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-        9 => _AM_SYSTEM_BLOCKS_CBBOTTOM,
-    ]
-);
+$side_select->addOptionArray([
+                                 0 => _AM_SYSTEM_BLOCKS_SBLEFT,
+                                 1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
+                                 3 => _AM_SYSTEM_BLOCKS_CBLEFT,
+                                 4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
+                                 5 => _AM_SYSTEM_BLOCKS_CBCENTER,
+                                 7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+                                 8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+                                 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM,
+                             ]);
 $form->addElement($side_select);
 $form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
 $form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
@@ -52,74 +49,55 @@
 $form->addElement(new \XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
 if ($block['is_custom']) {
     $textarea = new \XoopsFormDhtmlTextArea(_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-
     $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . _AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
-
     $form->addElement($textarea, true);
-
     $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
-
-    $ctype_select->addOptionArray(
-        [
-            'H' => _AM_SYSTEM_BLOCKS_HTML,
-            'P' => _AM_SYSTEM_BLOCKS_PHP,
-            'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
-            'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE,
-        ]
-    );
-
+    $ctype_select->addOptionArray([
+                                      'H' => _AM_SYSTEM_BLOCKS_HTML,
+                                      'P' => _AM_SYSTEM_BLOCKS_PHP,
+                                      'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
+                                      'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE,
+                                  ]);
     $form->addElement($ctype_select);
 } else {
     if ('' !== $block['template']) {
         /** @var XoopsTplfileHandler $tplfileHandler */
-
         $tplfileHandler = xoops_getHandler('tplfile');
-
         /** @var \XoopsTplfile[] $btemplate */
-
         $btemplate = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
-
         if (count($btemplate) > 0) {
             $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
         } else {
             /** @var \XoopsTplfile[] $btemplate2 */
-
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
-
             if (count($btemplate2) > 0) {
                 $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
             }
         }
     }
-
     if (false !== $block['edit_form']) {
         $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_OPTIONS, $block['edit_form']));
     }
 }
 $cache_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
-$cache_select->addOptionArray(
-    [
-        '0'       => _NOCACHE,
-        '30'      => sprintf(_SECONDS, 30),
-        '60'      => _MINUTE,
-        '300'     => sprintf(_MINUTES, 5),
-        '1800'    => sprintf(_MINUTES, 30),
-        '3600'    => _HOUR,
-        '18000'   => sprintf(_HOURS, 5),
-        '86400'   => _DAY,
-        '259200'  => sprintf(_DAYS, 3),
-        '604800'  => _WEEK,
-        '2592000' => _MONTH,
-    ]
-);
+$cache_select->addOptionArray([
+                                  '0'       => _NOCACHE,
+                                  '30'      => sprintf(_SECONDS, 30),
+                                  '60'      => _MINUTE,
+                                  '300'     => sprintf(_MINUTES, 5),
+                                  '1800'    => sprintf(_MINUTES, 30),
+                                  '3600'    => _HOUR,
+                                  '18000'   => sprintf(_HOURS, 5),
+                                  '86400'   => _DAY,
+                                  '259200'  => sprintf(_DAYS, 3),
+                                  '604800'  => _WEEK,
+                                  '2592000' => _MONTH,
+                              ]);
 $form->addElement($cache_select);
-
 /** @var \XoopsGroupPermHandler $grouppermHandler */
 $grouppermHandler = xoops_getHandler('groupperm');
 $groups           = $grouppermHandler->getGroupIds('block_read', $block['bid']);
-
 $form->addElement(new \XoopsFormSelectGroup(_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
-
 if (isset($block['bid'])) {
     $form->addElement(new \XoopsFormHidden('bid', $block['bid']));
 }
@@ -129,14 +107,11 @@
 if ($block['is_custom']) {
     $buttonTray->addElement(new \XoopsFormButton('', 'previewblock', _PREVIEW, 'submit'));
 }
-
 //Submit buttons
 $buttonTray    = new \XoopsFormElementTray('', '');
 $submit_button = new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit');
 $buttonTray->addElement($submit_button);
-
 $cancel_button = new \XoopsFormButton('', '', _CANCEL, 'button');
 $cancel_button->setExtra('onclick="history.go(-1)"');
 $buttonTray->addElement($cancel_button);
-
 $form->addElement($buttonTray);