Merge pull request #12 from mambax7/master

1.04_FINAL
XoopsModules25x · Aug 8, 2021 · aae4e34 · aae4e34
2 parents 6b92cb1 + 6f84de9
commit aae4e34
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 30 deletions.
diff --git a/admin/admin_footer.php b/admin/admin_footer.php
@@ -20,7 +20,7 @@
 use Xmf\Module\Admin;
 
 $pathIcon32 = Admin::iconUrl('', 32);
-$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
+//$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
 
 echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
 

diff --git a/admin/admin_header.php b/admin/admin_header.php
@@ -23,7 +23,6 @@
 require_once \dirname(__DIR__) . '/include/common.php';
 
 $moduleDirName = \basename(\dirname(__DIR__));
-/** @var Moduleinstaller\Helper $helper */
 $helper      = Moduleinstaller\Helper::getInstance();
 $adminObject = Admin::getInstance();
 

diff --git a/admin/menu.php b/admin/menu.php
@@ -10,7 +10,6 @@
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-/** @var \XoopsModules\Moduleinstaller\Helper $helper */
 $helper = Helper::getInstance();
 $helper->loadLanguage('common');
 $helper->loadLanguage('feedback');

diff --git a/class/Common/ServerStats.php b/class/Common/ServerStats.php
@@ -49,7 +49,7 @@ public static function getServerStats()
         $gdlib = \function_exists('gd_info') ? '<span style="color: green;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . \constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
         $html  .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
         if (\function_exists('gd_info')) {
-            if (true === ($gdlib = gd_info())) {
+            if (true == ($gdlib = gd_info())) {
                 $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
             }
         }

diff --git a/class/Common/SysUtility.php b/class/Common/SysUtility.php
@@ -95,13 +95,13 @@ public static function truncateHtml($text, $length = 100, $ending = '...', $exac
                     $truncate .= $line_matchings[1];
                 }
                 // calculate the length of the plain text part of the line; handle entities as one character
-                $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
+                $content_length = mb_strlen(\preg_replace('/&[0-9a-z]{2,8};|&#\d{1,7};|[0-9a-f]{1,6};/i', ' ', $line_matchings[2]));
                 if ($total_length + $content_length > $length) {
                     // the number of characters which are left
                     $left            = $length - $total_length;
                     $entities_length = 0;
                     // search for html entities
-                    if (\preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
+                    if (\preg_match_all('/&[0-9a-z]{2,8};|&#\d{1,7};|[0-9a-f]{1,6};/i', $line_matchings[2], $entities, \PREG_OFFSET_CAPTURE)) {
                         // calculate the real length of all entities in the legal range
                         foreach ($entities[0] as $entity) {
                             if ($left >= $entity[1] + 1 - $entities_length) {
@@ -210,7 +210,7 @@ public static function fieldExists($fieldname, $table)
      * @param int          $id_field
      * @param int          $id
      *
-     * @return mixed
+     * @return void
      */
     public static function cloneRecord($tableName, $id_field, $id)
     {
@@ -225,7 +225,7 @@ public static function cloneRecord($tableName, $id_field, $id)
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
+        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", $tempTable) . "')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
             exit($GLOBALS['xoopsDB']->error());

diff --git a/class/Common/VersionChecks.php b/class/Common/VersionChecks.php
@@ -26,9 +26,9 @@ trait VersionChecks
     /**
      * Verifies XOOPS version meets minimum requirements for this module
      * @static
-     * @param \XoopsModule $module
+     * @param \XoopsModule|null $module
      *
-     * @param null|string  $requiredVer
+     * @param null|string       $requiredVer
      * @return bool true if meets requirements, false if not
      */
     public static function checkVerXoops(XoopsModule $module = null, $requiredVer = null)

diff --git a/class/InstallWizard.php b/class/InstallWizard.php
@@ -165,7 +165,7 @@ public function loadLangFile($file)
      */
     public function initLanguage($language)
     {
-        $language = \preg_replace("/[^a-z0-9_\-]/i", '', $language);
+        $language = \preg_replace('/[^a-z0-9_\-]/i', '', $language);
         if (!\file_exists("./language/{$language}/install.php")) {
             $language = 'english';
         }
@@ -176,7 +176,7 @@ public function initLanguage($language)
     /**
      * @param $page
      *
-     * @return bool|mixed
+     * @return false|int|string
      */
     public function setPage($page)
     {

diff --git a/class/Utility.php b/class/Utility.php
@@ -28,7 +28,7 @@
 
 use XoopsModules\Moduleinstaller;
 use XoopsModules\Moduleinstaller\Common;
-use XoopsModules\Moduleinstaller\Constants;
+//use XoopsModules\Moduleinstaller\Constants;
 
 /**
  * Class Utility

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,6 +1,17 @@
-<h5>1.04 RC-2  [2020-12-01]</h5>  Dev: Xoops 2.5.11, PHP 7.4.13, PHP 8.0
+<h5>1.04 Final  [2021-12-01]</h5>  Dev: Xoops 2.5.11, PHP 7.4.22, PHP 8.0.8
+<hr>
+- 1.04 Final Release
+
+<h5>1.04 RC-2  [NOT RELEASED]</h5>  Dev: Xoops 2.5.11, PHP 7.4.13, PHP 8.0
 <hr>
 - fixed InstallWizard name (SebT34/mamba)
+- simplify loading of language files (mamba)
+- language updates (mamba)
+- image update for PHP8 (mamba)
+- add round((float) (mamba)
+- remove function cloneRecord (mamba)
+- min PHP 7.3 (mamba)
+- Unqualified function/constant reference (mamba)
 
 <h5>1.04 RC-1  [2020-12-01]</h5>  Dev: Xoops 2.5.11, PHP 7.4.13, PHP 8.0
 <hr>

diff --git a/extras/main.php b/extras/main.php
@@ -228,9 +228,9 @@
         foreach ($module as $mid) {
             $mid                          = (int)$mid;
             $modifs_mods[$i]['mid']       = $mid;
-            $modifs_mods[$i]['oldname']   = htmlspecialchars(($oldname[$mid]));
-            $modifs_mods[$i]['newname']   = htmlspecialchars(trim(($newname[$mid])));
-            $modifs_mods[$i]['newstatus'] = isset($newstatus[$mid]) ? htmlspecialchars($newstatus[$mid]) : 0;
+            $modifs_mods[$i]['oldname']   = htmlspecialchars(($oldname[$mid]), ENT_QUOTES | ENT_HTML5);
+            $modifs_mods[$i]['newname']   = htmlspecialchars(trim(($newname[$mid])), ENT_QUOTES | ENT_HTML5);
+            $modifs_mods[$i]['newstatus'] = isset($newstatus[$mid]) ? htmlspecialchars($newstatus[$mid], ENT_QUOTES | ENT_HTML5) : 0;
             ++$i;
         }
         $xoopsTpl->assign('modifs_mods', $modifs_mods);
@@ -320,7 +320,7 @@
         xoops_cp_footer();
         break;
     case 'install':
-        $module = htmlspecialchars($module);
+        $module = htmlspecialchars($module, ENT_QUOTES | ENT_HTML5);
         // Get module handler
         /** @var \XoopsModuleHandler $moduleHandler */
         $moduleHandler = xoops_getHandler('module');
@@ -375,7 +375,7 @@
         xoops_cp_footer();
         break;
     case 'uninstall':
-        $module = htmlspecialchars($module);
+        $module = htmlspecialchars($module, ENT_QUOTES | ENT_HTML5);
         // Get module handler
         /** @var \XoopsModuleHandler $moduleHandler */
         $moduleHandler = xoops_getHandler('module');
@@ -429,7 +429,7 @@
         xoops_cp_footer();
         break;
     case 'update':
-        $module = htmlspecialchars($module);
+        $module = htmlspecialchars($module, ENT_QUOTES | ENT_HTML5);
         // Get module handler
         /** @var \XoopsModuleHandler $moduleHandler */
         $moduleHandler = xoops_getHandler('module');

diff --git a/extras/modulesadmin.php b/extras/modulesadmin.php
@@ -110,7 +110,7 @@ function xoops_module_install($dirname)
             }
         }
 
-        if (false === $error) {
+        if (!$error) {
             $sqlfile = $module->getInfo('sqlfile');
             if (is_array($sqlfile) && !empty($sqlfile[XOOPS_DB_TYPE])) {
                 $sql_file_path = XOOPS_ROOT_PATH . '/modules/' . $dirname . '/' . $sqlfile[XOOPS_DB_TYPE];
@@ -155,7 +155,7 @@ function xoops_module_install($dirname)
                         }
                     }
                     // if there was an error, delete the tables created so far, so the next installation will not fail
-                    if (true === $error) {
+                    if ($error) {
                         foreach ($created_tables as $ct) {
                             $db->query('DROP TABLE ' . $db->prefix($ct));
                         }
@@ -814,7 +814,7 @@ function xoops_module_update($dirname)
 
     $myts = \MyTextSanitizer::getInstance();
 
-    $dirname = htmlspecialchars(trim($dirname));
+    $dirname = htmlspecialchars(trim($dirname), ENT_QUOTES | ENT_HTML5);
     /** @var \XoopsModuleHandler $moduleHandler */
     $moduleHandler = xoops_getHandler('module');
     $module        = $moduleHandler->getByDirname($dirname);
@@ -856,7 +856,7 @@ function xoops_module_update($dirname)
         }
         $msgs[] = '<strong>' . _VERSION . ':</strong> ' . $module->getInfo('version') . '&nbsp;' . $module->getInfo('module_status');
         if (false !== $module->getInfo('author') && '' != trim($module->getInfo('author'))) {
-            $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')));
+            $msgs[] = '<strong>' . _AUTHOR . ':</strong> ' . htmlspecialchars(trim($module->getInfo('author')), ENT_QUOTES | ENT_HTML5);
         }
         $msgs[] = '</div><div class="logger">';
         $msgs[] = _AM_SYSTEM_MODULES_MODULE_DATA_UPDATE;
@@ -885,7 +885,7 @@ function xoops_module_update($dirname)
                 // START irmtfan solve templates duplicate issue
                 // if (!in_array($tpl['file'], $delng)) { // irmtfan bug fix: remove codes for delete templates
                 $type = ($tpl['type'] ?? 'module');
-                if (preg_match("/\.css$/i", $tpl['file'])) {
+                if (preg_match('/\.css$/i', $tpl['file'])) {
                     $type = 'css';
                 }
                 $criteria = new \CriteriaCompo();

diff --git a/include/oninstall.php b/include/oninstall.php
@@ -33,7 +33,7 @@ function xoops_module_pre_install_moduleinstaller(\XoopsModule $module)
     $xoopsSuccess = $utility::checkVerXoops($module);
     $phpSuccess   = $utility::checkVerPhp($module);
 
-    if (false !== $xoopsSuccess && false !== $phpSuccess) {
+    if ($xoopsSuccess && $phpSuccess) {
         $moduleTables = &$module->getInfo('tables');
         foreach ($moduleTables as $table) {
             $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
@@ -55,7 +55,6 @@ function xoops_module_install_moduleinstaller(\XoopsModule $module)
 
     $moduleDirName = \basename(\dirname(__DIR__));
 
-    /** @var Moduleinstaller\Helper $helper */
     $helper       = Moduleinstaller\Helper::getInstance();
     $utility      = new Utility();
     $configurator = new Moduleinstaller\Common\Configurator();

diff --git a/include/onuninstall.php b/include/onuninstall.php
@@ -35,7 +35,6 @@ function xoops_module_uninstall_moduleinstaller(\XoopsModule $module)
 
     $moduleDirName      = \basename(\dirname(__DIR__));
     $moduleDirNameUpper = mb_strtoupper($moduleDirName);
-    /** @var Moduleinstaller\Helper $helper */
     $helper = Moduleinstaller\Helper::getInstance();
 
     $utility = new Utility();

diff --git a/xoops_version.php b/xoops_version.php
@@ -24,8 +24,8 @@
 $moduleDirName = basename(__DIR__);
 
 $modversion['version']             = '1.04';
-$modversion['module_status']       = 'RC-2';
-$modversion['release_date']        = '2021/06/20';
+$modversion['module_status']       = 'Final';
+$modversion['release_date']        = '2021/08/08';
 $modversion['name']                = _MI_INSTALLER_NAME;
 $modversion['description']         = _MI_INSTALLER_DESC;
 $modversion['author']              = 'Michael Beck';