Merge branch 'master' of https://github.com/XoopsModules25x/modulebuilder

Author: mambax7

class/Building.php

@@ -100,6 +100,18 @@ public function clearDir($dir, $pattern = '*'): void
                 \unlink($file);
             }
         }
+        $file = $dir . '/.gitignore';
+        if (is_file($file)) {
+            \unlink($file);
+        }
+        $file = $dir . '/.gitattributes';
+        if (is_file($file)) {
+            \unlink($file);
+        }
+        $file = $dir . '/.scrutinizer.yml';
+        if (is_file($file)) {
+            \unlink($file);
+        }
         if (\is_dir($dir)) {
             \rmdir($dir);
         }

class/Files/CreateArchitecture.php

@@ -160,6 +160,10 @@ public function setBaseFoldersFiles($module): void
             \copy($copyFile, $copyNewFile);
         } else {
             // Copy file
+            if (!\file_exists($logoPng)) {
+                $logoPng = 'tdmxoops_logo.png';
+                $logoGifFrom = TDMC_UPLOAD_IMGMOD_PATH . '/' . $logoPng;
+            }
             $copyFile    = TDMC_IMAGES_LOGOS_URL . '/' . $logoPng;
             $copyNewFile = $logoGifFrom;
             \copy($copyFile, $copyNewFile);

class/Files/CreateFile.php

@@ -329,7 +329,11 @@ public function getLanguage($moduleDirname, $prefix = '', $suffix = '', $addFq =
      */
     public function getLeftString($string)
     {
-        return \mb_substr($string, 0, (int)\mb_strpos($string, '_'));
+        $ret = '';
+        if ('' != $string) {
+            $ret .= \mb_substr($string, 0, (int)\mb_strpos($string, '_'));
+        }
+        return $ret;
     }
 
     /**
@@ -340,12 +344,14 @@ public function getLeftString($string)
      */
     public function getRightString($string = null)
     {
-        if (\mb_strpos($string, '_')) {
-            $str = \mb_strpos($string, '_');
-            if (false !== $str) {
-                $ret = \mb_substr($string, $str + 1, \mb_strlen($string));
+        if ('' != $string) {
+            if (\mb_strpos($string, '_')) {
+                $str = \mb_strpos($string, '_');
+                if (false !== $str) {
+                    $ret = \mb_substr($string, $str + 1, \mb_strlen($string));
 
-                return $ret;
+                    return $ret;
+                }
             }
         }
 
@@ -382,7 +388,11 @@ public function getCamelCase($string, $ucfirst = false, $lcfirst = false)
      */
     public function getUcfirst($string)
     {
-        return \ucfirst($string);
+        $ret = '';
+        if ('' != $string) {
+            $ret .= \ucfirst($string);
+        }
+        return $ret;
     }
 
     /**
@@ -393,7 +403,11 @@ public function getUcfirst($string)
      */
     public function getLcfirst($string)
     {
-        return \lcfirst($string);
+        $ret = '';
+        if ('' != $string) {
+            $ret .= \lcfirst($string);
+        }
+        return $ret;
     }
 
     /**
@@ -404,7 +418,11 @@ public function getLcfirst($string)
      */
     public function getStrToUpper($string)
     {
-        return \mb_strtoupper($string);
+        $ret = '';
+        if ('' != $string) {
+            $ret .= \mb_strtoupper($string);
+        }
+        return $ret;
     }
 
     /**
@@ -415,7 +433,11 @@ public function getStrToUpper($string)
      */
     public function getStrToLower($string)
     {
-        return \mb_strtolower($string);
+        $ret = '';
+        if ('' != $string) {
+            $ret .= \mb_strtolower($string);
+        }
+        return $ret;
     }
 
     /**

class/Form/FormRadio.php

@@ -31,8 +31,8 @@ public function render()
     {
         $ret           = '';
         $ele_name      = $this->getName();
-        $ele_title     = $this->getTitle();
-        $ele_value     = $this->getValue();
+        $ele_title     = (string)$this->getTitle();
+        $ele_value     = (string)$this->getValue();
         $ele_options   = $this->getOptions();
         $ele_extra     = $this->getExtra();
         $ele_delimeter = empty($this->columns) ? $this->getDelimeter() : '';
@@ -41,6 +41,12 @@ public function render()
         }
         $i      = 0;
         $id_ele = 0;
+        if ('' != $ele_title) {
+            $ele_title = htmlspecialchars($ele_title, ENT_QUOTES);
+        }
+        if ('' != $ele_value) {
+            $ele_value = htmlspecialchars($ele_value, ENT_QUOTES);
+        }
         foreach ($ele_options as $value => $name) {
             ++$id_ele;
             if (!empty($this->columns)) {
@@ -49,7 +55,7 @@ public function render()
                 }
                 $ret .= '<td class="radio">';
             }
-            $ret .= '<input type="radio" name="' . $ele_name . '" id="' . $ele_name . '[' . $value . ']' . $id_ele . '" title = "' . htmlspecialchars($ele_title, ENT_QUOTES) . '" value="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+            $ret .= '<input type="radio" name="' . $ele_name . '" id="' . $ele_name . '[' . $value . ']' . $id_ele . '" title = "' . $ele_title . '" value="' . $ele_value . '"';
             if (isset($ele_value) && $value == $ele_value) {
                 $ret .= ' checked';
             }

class/LogoGenerator.php

@@ -85,7 +85,7 @@ public static function createLogo($logoIcon, $moduleName)
 
         // Write text
         $textColor     = imagecolorallocate($imageModule, 0, 0, 0);
-        $spaceToBorder = (92 - mb_strlen($moduleName) * 7.5) / 2;
+        $spaceToBorder = (int)\floor((92 - mb_strlen($moduleName) * 7.5) / 2);
         imagefttext($imageModule, 8.5, 0, $spaceToBorder, 45, $textColor, $font, $moduleName, []);
 
         imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 32, 32);

docs/changelog.txt

@@ -17,6 +17,9 @@
 - replaced Common/XoopsConfirm by Common/Confirm(mamba/goffy)
 - table renaming in fieldelements (goffy)
 - added new fieldelements integer/float (goffy)
+- uninstall with bak-file creation (mamba/goffy)
+- module update to php8 (mamba)
+- fix bug in type cast (liomj/goffy)
 
 <h5>3.5.1 Beta 1   [NOT RELEASED]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.25, PHP 8.0.12, PHP 8.1.0 Beta 4
  - semantic versioning (mamba)

files/commonfiles/include/uninstall.php

@@ -36,27 +36,23 @@ function xoops_module_uninstall_modulebuilder(\XoopsModule $module)
 
     $helper = Modulebuilder\Helper::getInstance();
 
-    $utility = new Modulebuilder\Utility();
-
     $success = true;
     $helper->loadLanguage('admin');
 
     //------------------------------------------------------------------
-    // Remove uploads folder (and all subfolders) if they exist
+    // Rename uploads folder to BAK and add date to name
     //------------------------------------------------------------------
-
-    $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
-    foreach ($old_directories as $old_dir) {
-        $dirInfo = new \SplFileInfo($old_dir);
-        if ($dirInfo->isDir()) {
-            // The directory exists so delete it
-            if (!$utility::rrmdir($old_dir)) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
-                $success = false;
-            }
+    $uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
+    $dirInfo = new \SplFileInfo($uploadDirectory);
+    if ($dirInfo->isDir()) {
+        // The directory exists so rename it
+        $date = date('Y-m-d');
+        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
+            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $uploadDirectory));
+            $success = false;
         }
-        unset($dirInfo);
     }
+    unset($dirInfo);
     /*
     //------------ START ----------------
     //------------------------------------------------------------------