Merge pull request #184 from mambax7/master

3.5 Final

Author: mambax7

.scrutinizer.yml

@@ -14,6 +14,9 @@ build:
       tests:
         override:
           - php-scrutinizer-run --enable-security-analysis
+  environment:
+    php:
+      version: "7.2"
 filter:
   dependency_paths:
     - XoopsCore25/*

CONTRIBUTING.md

@@ -10,11 +10,11 @@ We accept contributions via Pull Requests on [Github](https://github.com/XoopsMo
 ## Pull Requests
 
 - **[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).
-- **Add tests!** - We encourage providing tests with your contributions. We're using [Codeception](www.codeception.com) and PhpUnit
+- **Add tests!** - We encourage providing tests with your contributions. We're using [Codeception](https://www.codeception.com) and PhpUnit
 - **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are kept up-to-date.
 - **Consider our release cycle** - We try to follow [Semantic Versioning v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
 - **Create feature branches** - Don't ask us to pull from your master branch.
 - **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
 - **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
 
-**Happy coding, and _May the Source be with You_!**
+Happy coding, and **_May the Source be with You_**!

README.md

@@ -1,7 +1,7 @@
 ![alt XOOPS CMS](https://xoops.org/images/logoXoops4GithubRepository.png)
 ## Suico module for  [XOOPS CMS 2.5.10+](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)](LICENSE)
+[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)
 
 [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/XoopsModules25x/suico.svg?style=flat)](https://scrutinizer-ci.com/g/XoopsModules25x/suico/?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9b911a286e284d92809acb077b9da7fd)](https://www.codacy.com/app/mambax7/suico)

abandongroup.php

@@ -20,7 +20,9 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    RelgroupuserHandler
+};
 
 require __DIR__ . '/header.php';
 /**
@@ -50,7 +52,7 @@
      * Creating the factory  and the criteria to delete the picture
      * The user must be the owner
      */
-    $relgroupuserFactory = new Suico\RelgroupuserHandler(
+    $relgroupuserFactory = new RelgroupuserHandler(
         $xoopsDB
     );
     $criteria_rel_id     = new Criteria('rel_id', $relgroupuser_id);

activate.php

@@ -35,18 +35,16 @@
     }
     if ($thisuser->getVar('actkey') != $actkey) {
         redirect_header(XOOPS_URL . '/', 5, _US_ACTKEYNOT);
-    } else {
-        if ($thisuser->getVar('level') > 0) {
+    } elseif ($thisuser->getVar('level') > 0) {
             redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/index.php', 5, _US_ACONTACT, false);
-        } else {
-            if (false !== $memberHandler->activateUser($thisuser)) {
+        } elseif (false !== $memberHandler->activateUser($thisuser)) {
                 $xoopsPreload = XoopsPreload::getInstance();
                 $xoopsPreload->triggerEvent('core.behavior.user.activate', $thisuser);
                 /* @var XoopsConfigHandler $configHandler */
                 $configHandler              = xoops_getHandler('config');
                 $GLOBALS['xoopsConfigUser'] = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
                 if (2 == $GLOBALS['xoopsConfigUser']['activation_type']) {
-                    $myts        = MyTextSanitizer::getInstance();
+                    $myts        = \MyTextSanitizer::getInstance();
                     $xoopsMailer = xoops_getMailer();
                     $xoopsMailer->useMail();
                     $xoopsMailer->setTemplate('activated.tpl');
@@ -58,10 +56,10 @@
                     $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
                     $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $GLOBALS['xoopsConfig']['sitename']));
                     include $GLOBALS['xoops']->path('header.php');
-                    if (!$xoopsMailer->send()) {
-                        printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
-                    } else {
+                    if ($xoopsMailer->send()) {
                         printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
+                    } else {
+                        printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
                     }
                     require __DIR__ . '/footer.php';
                 } else {
@@ -70,11 +68,10 @@
             } else {
                 redirect_header(XOOPS_URL . '/index.php', 5, 'Activation failed!');
             }
-        }
-    }
+
     // Not implemented yet: re-send activiation code
 } elseif (!empty($_REQUEST['email']) && 0 != $xoopsConfigUser['activation_type']) {
-    $myts = MyTextSanitizer::getInstance();
+    $myts = \MyTextSanitizer::getInstance();
     /* @var XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $getuser       = $memberHandler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email']))));
@@ -94,16 +91,16 @@
     $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
     $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
     $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser[0]->getVar('uname')));
-    if (!$xoopsMailer->send()) {
-        echo _US_YOURREGMAILNG;
-    } else {
+    if ($xoopsMailer->send()) {
         echo _US_YOURREGISTERED;
+    } else {
+        echo _US_YOURREGMAILNG;
     }
 } else {
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $form = new XoopsThemeForm('', 'form', 'activate.php');
-    $form->addElement(new XoopsFormText(_US_EMAIL, 'email', 25, 255));
-    $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+    $form = new \XoopsThemeForm('', 'form', 'activate.php');
+    $form->addElement(new \XoopsFormText(_US_EMAIL, 'email', 25, 255));
+    $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
     $form->display();
 }
 $xoBreadcrumbs[] = ['title' => _MD_SUICO_REGISTER];

admin/admin_header.php

@@ -20,8 +20,13 @@
  */
 
 use Xmf\Module\Admin;
-use XoopsModules\Suico\Helper;
-use XoopsModules\Suico\Utility;
+use XoopsModules\Suico\{
+    Helper,
+    Utility
+};
+/** @var Helper $helper */
+/** @var Utility $utility */
+/** @var Admin $adminObject */
 
 include dirname(__DIR__) . '/preloads/autoloader.php';
 require dirname(__DIR__, 3) . '/include/cp_header.php';
@@ -64,10 +69,10 @@
 $audioHandler = $helper->getHandler('Audio');
 /** @var XoopsPersistableObjectHandler $privacyHandler */
 $privacyHandler = $helper->getHandler('Privacy');
-$myts           = MyTextSanitizer::getInstance();
+$myts           = \MyTextSanitizer::getInstance();
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
     require XOOPS_ROOT_PATH . '/class/template.php';
-    $xoopsTpl = new XoopsTpl();
+    $xoopsTpl = new \XoopsTpl();
 }
 $pathIcon16    = Xmf\Module\Admin::iconUrl('', 16);
 $pathIcon32    = Xmf\Module\Admin::iconUrl('', 32);

admin/audios.php

@@ -64,11 +64,11 @@
             //            $uploader->setPrefix('url_');
             $uploader->setPrefix('aud_' . $uid . '_');
             $uploader->fetchMedia(Request::getString('xoops_upload_file', '', 'POST')[0]);
-            if (!$uploader->upload()) {
+            if ($uploader->upload()) {
+                $audioObject->setVar('filename', $uploader->getSavedFileName());
+            } else {
                 $errors = $uploader->getErrors();
                 redirect_header('javascript:history.go(-1)', 3, $errors);
-            } else {
-                $audioObject->setVar('filename', $uploader->getSavedFileName());
             }
         }
         $dateTimeObj = \DateTime::createFromFormat(_SHORTDATESTRING, Request::getString('date_created', '', 'POST'));
@@ -148,7 +148,7 @@
         // Display Page Navigation
         if ($audioTempRows > $audioPaginationLimit) {
             xoops_load('XoopsPageNav');
-            $pagenav = new XoopsPageNav(
+            $pagenav = new \XoopsPageNav(
                 $audioTempRows, $audioPaginationLimit, $start, 'start', 'op=list' . '&sort=' . $sort . '&order=' . $order . ''
             );
             $GLOBALS['xoopsTpl']->assign('pagenav', null === $pagenav ? $pagenav->renderNav() : '');
@@ -200,7 +200,7 @@
             // Display Navigation
             if ($audioCount > $audioPaginationLimit) {
                 xoops_load('XoopsPageNav');
-                $pagenav = new XoopsPageNav(
+                $pagenav = new \XoopsPageNav(
                     $audioCount, $audioPaginationLimit, $start, 'start', 'op=list' . '&sort=' . $sort . '&order=' . $order . ''
                 );
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));

admin/blockform.php

@@ -20,11 +20,11 @@
 //$helper = \XoopsModules\Suico\Helper::getInstance();
 //$helper->loadLanguage('blocksadmin');
 xoops_loadLanguage('blocksadmin', $moduleDirName);
-$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']));
+    $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_NAME, $block['name']));
 }
-$side_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
+$side_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
 $side_select->addOptionArray(
     [
         0 => _AM_SYSTEM_BLOCKS_SBLEFT,
@@ -39,12 +39,12 @@
 );
 $form->addElement($side_select);
 $form->addElement(
-    new XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight'])
+    new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight'])
 );
 $form->addElement(
-    new XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible'])
+    new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible'])
 );
-$mod_select = new XoopsFormSelect(
+$mod_select = new \XoopsFormSelect(
     constant(
         'CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN'
     ), 'bmodule', $block['modules'], 5, true
@@ -59,9 +59,9 @@
 ksort($module_list);
 $mod_select->addOptionArray($module_list);
 $form->addElement($mod_select);
-$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
+$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 = 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,
@@ -70,7 +70,7 @@
         ) . '</span>'
     );
     $form->addElement($textarea, true);
-    $ctype_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
+    $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctype_select->addOptionArray(
         [
             'H' => _AM_SYSTEM_BLOCKS_HTML,
@@ -87,7 +87,7 @@
         $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
         if (count($btemplate) > 0) {
             $form->addElement(
-                new XoopsFormLabel(
+                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>'
@@ -97,7 +97,7 @@
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
             if (count($btemplate2) > 0) {
                 $form->addElement(
-                    new XoopsFormLabel(
+                    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>'
@@ -107,10 +107,10 @@
         }
     }
     if (false !== $block['edit_form']) {
-        $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_OPTIONS, $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 = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
 $cache_select->addOptionArray(
     [
         '0'       => _NOCACHE,
@@ -130,21 +130,21 @@
 /** @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));
+$form->addElement(new \XoopsFormSelectGroup(_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
 if (isset($block['bid'])) {
-    $form->addElement(new XoopsFormHidden('bid', $block['bid']));
+    $form->addElement(new \XoopsFormHidden('bid', $block['bid']));
 }
-$form->addElement(new XoopsFormHidden('op', $block['op']));
-$form->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
-$button_tray = new XoopsFormElementTray('', '&nbsp;');
+$form->addElement(new \XoopsFormHidden('op', $block['op']));
+$form->addElement(new \XoopsFormHidden('fct', 'blocksadmin'));
+$button_tray = new \XoopsFormElementTray('', '&nbsp;');
 if ($block['is_custom']) {
-    $button_tray->addElement(new XoopsFormButton('', 'previewblock', _PREVIEW, 'submit'));
+    $button_tray->addElement(new \XoopsFormButton('', 'previewblock', _PREVIEW, 'submit'));
 }
 //Submit buttons
-$button_tray   = new XoopsFormElementTray('', '');
-$submit_button = new XoopsFormButton('', 'submitblock', _SUBMIT, 'submit');
+$button_tray   = new \XoopsFormElementTray('', '');
+$submit_button = new \XoopsFormButton('', 'submitblock', _SUBMIT, 'submit');
 $button_tray->addElement($submit_button);
-$cancel_button = new XoopsFormButton('', '', _CANCEL, 'button');
+$cancel_button = new \XoopsFormButton('', '', _CANCEL, 'button');
 $cancel_button->setExtra('onclick="history.go(-1)"');
 $button_tray->addElement($cancel_button);
 $form->addElement($button_tray);

admin/blocksadmin.php

@@ -285,7 +285,7 @@ function cloneBlock($bid)
         xoops_loadLanguage('admin/blocksadmin', 'system');
         xoops_loadLanguage('admin/groups', 'system');
         //        mpu_adm_menu();
-        $myblock = new XoopsBlock($bid);
+        $myblock = new \XoopsBlock($bid);
         $db      = XoopsDatabaseFactory::getDatabaseConnection();
         $sql     = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
         $result  = $db->query($sql);
@@ -341,7 +341,7 @@ function isBlockCloned(
         xoops_loadLanguage('admin', 'system');
         xoops_loadLanguage('admin/blocksadmin', 'system');
         xoops_loadLanguage('admin/groups', 'system');
-        $block = new XoopsBlock($bid);
+        $block = new \XoopsBlock($bid);
         $clone = $block->xoopsClone();
         if (empty($bmodule)) {
             xoops_cp_header();
@@ -421,7 +421,7 @@ function setOrder(
         $bcachetime,
         $bmodule
     ) {
-        $myblock = new XoopsBlock($bid);
+        $myblock = new \XoopsBlock($bid);
         $myblock->setVar('title', $title);
         $myblock->setVar('weight', $weight);
         $myblock->setVar('visible', $visible);
@@ -444,7 +444,7 @@ function editBlock($bid)
         xoops_loadLanguage('admin/blocksadmin', 'system');
         xoops_loadLanguage('admin/groups', 'system');
         //        mpu_adm_menu();
-        $myblock = new XoopsBlock($bid);
+        $myblock = new \XoopsBlock($bid);
         $db      = XoopsDatabaseFactory::getDatabaseConnection();
         $sql     = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
         $result  = $db->query($sql);
@@ -502,7 +502,7 @@ function updateBlock(
         $options,
         $groups
     ) {
-        $myblock = new XoopsBlock($bid);
+        $myblock = new \XoopsBlock($bid);
         $myblock->setVar('title', $btitle);
         $myblock->setVar('weight', $bweight);
         $myblock->setVar('visible', $bvisible);
@@ -513,9 +513,9 @@ function updateBlock(
             $options_count = count($options);
             if ($options_count > 0) {
                 //Convert array values to comma-separated
-                for ($i = 0; $i < $options_count; ++$i) {
-                    if (is_array($options[$i])) {
-                        $options[$i] = implode(',', $options[$i]);
+                foreach ($options as $i => $iValue) {
+                    if (is_array($iValue)) {
+                        $options[$i] = implode(',', $iValue);
                     }
                 }
                 $options = implode('|', $options);

admin/configs.php

@@ -127,7 +127,7 @@
         // Display Page Navigation
         if ($configsTempRows > $configsPaginationLimit) {
             xoops_load('XoopsPageNav');
-            $pagenav = new XoopsPageNav(
+            $pagenav = new \XoopsPageNav(
                 $configsTempRows, $configsPaginationLimit, $start, 'start', 'op=list' . '&sort=' . $sort . '&order=' . $order . ''
             );
             $GLOBALS['xoopsTpl']->assign('pagenav', null === $pagenav ? $pagenav->renderNav() : '');
@@ -185,7 +185,7 @@
             // Display Navigation
             if ($configsCount > $configsPaginationLimit) {
                 xoops_load('XoopsPageNav');
-                $pagenav = new XoopsPageNav(
+                $pagenav = new \XoopsPageNav(
                     $configsCount, $configsPaginationLimit, $start, 'start', 'op=list' . '&sort=' . $sort . '&order=' . $order . ''
                 );
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));