update modulbuilder itself - correction 2

ggoffy · ggoffy · commit 85f1754f6f42 · 2026-04-08T20:53:40.000+02:00
diff --git a/admin/fields.php b/admin/fields.php
@@ -209,7 +209,7 @@
                 if ($order > 0) {
                     $fieldsObj = $fieldsHandler->get($order);
                     $fieldsObj->setVar('field_order', $i);
-                    if ($fieldsHandler->insert($fieldsObj)) {
+                    if (!$fieldsHandler->insert($fieldsObj)) {
                         $error = true;
                     }
                     ++$i;
diff --git a/class/Common/Resizer.php b/class/Common/Resizer.php
@@ -203,7 +203,15 @@ public function mergeImage(): void
                 $dest = \imagecreatefromjpeg($this->endFile);
                 $src = \imagecreatefromjpeg($this->sourceFile);
                 break;
-            // ... etc
+            case 'image/gif':
+                $dest = \imagecreatefromgif($this->endFile);
+                $src = \imagecreatefromgif($this->sourceFile);
+                break;
+            default:
+                return;
+         }
+        if (!$dest || !$src) {
+            return;
         }
         if (4 == $this->mergeType) {
             $imgWidth  = (int)\round($this->maxWidth / 2 - 1);
@@ -253,7 +261,18 @@ public function mergeImage(): void
                     break;
             }
         }
-        \imagejpeg($dest, $this->endFile);
+        // image output
+        switch ($this->imageMimetype) {
+            case 'image/png':
+                \imagepng($dest, $this->endFile, 0);
+                break;
+            case 'image/jpeg':
+                \imagejpeg($dest, $this->endFile, $this->jpgQuality);
+                break;
+            case 'image/gif':
+                \imagegif($dest, $this->endFile);
+                break;
+        }
 
         \imagedestroy($src);
         \imagedestroy($dest);
diff --git a/files/commonfiles/class/Common/Resizer.php b/files/commonfiles/class/Common/Resizer.php
@@ -203,7 +203,15 @@ public function mergeImage(): void
                 $dest = \imagecreatefromjpeg($this->endFile);
                 $src = \imagecreatefromjpeg($this->sourceFile);
                 break;
-            // ... etc
+            case 'image/gif':
+                $dest = \imagecreatefromgif($this->endFile);
+                $src = \imagecreatefromgif($this->sourceFile);
+                break;
+            default:
+                return;
+         }
+        if (!$dest || !$src) {
+            return;
         }
         if (4 == $this->mergeType) {
             $imgWidth  = (int)\round($this->maxWidth / 2 - 1);
@@ -253,7 +261,18 @@ public function mergeImage(): void
                     break;
             }
         }
-        \imagejpeg($dest, $this->endFile);
+        // image output
+        switch ($this->imageMimetype) {
+            case 'image/png':
+                \imagepng($dest, $this->endFile, 0);
+                break;
+            case 'image/jpeg':
+                \imagejpeg($dest, $this->endFile, $this->jpgQuality);
+                break;
+            case 'image/gif':
+                \imagegif($dest, $this->endFile);
+                break;
+        }
 
         \imagedestroy($src);
         \imagedestroy($dest);
diff --git a/files/commonfiles/include/install.php b/files/commonfiles/include/install.php
@@ -72,8 +72,12 @@ function xoops_module_install_modulebuilder(\XoopsModule $module)
                     continue;
                 }
             }
-            if (!\chmod($path, 0775) && !\is_writable($path)) {
-                $success = false;
+            if (!@\is_writable($path)) {
+                \chmod($path, 0775);
+                \clearstatcache(false, $path);
+                if (!@\is_writable($path)) {
+                    $success = false;
+                }
             }
         }
     }
diff --git a/files/ratingfiles/class/RatingsHandler.php b/files/ratingfiles/class/RatingsHandler.php
@@ -120,15 +120,15 @@ public function getItemRating(int $itemid = 0, int $source = 0)
                 $ItemRating['avg_rate_value'] = \number_format($current_rating / $count, 2);
             }
             if (1 == $count) {
-                $text      = \str_replace('%c', $ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_1);
-                $shorttext = \str_replace('%c', $ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_SHORT_1);
+                $text      = \str_replace('%c', (string)$ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_1);
+                $shorttext = \str_replace('%c', (string)$ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_SHORT_1);
             } else {
-                $text      = \str_replace('%c', $ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_X);
-                $shorttext = \str_replace('%c', $ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_SHORT_X);
+                $text      = \str_replace('%c', (string)$ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_X);
+                $shorttext = \str_replace('%c', (string)$ItemRating['avg_rate_value'], \_MA_MODULEBUILDER_RATING_CURRENT_SHORT_X);
             }
-            $text                    = \str_replace('%m', $max_units, $text);
-            $text                    = \str_replace('%t', $ItemRating['nb_ratings'], $text);
-            $shorttext               = \str_replace('%t', $ItemRating['nb_ratings'], $shorttext);
+            $text                    = \str_replace('%m', (string)$max_units, $text);
+            $text                    = \str_replace('%t', (string)$ItemRating['nb_ratings'], $text);
+            $shorttext               = \str_replace('%t', (string)$ItemRating['nb_ratings'], $shorttext);
             $ItemRating['text']      = $text;
             $ItemRating['shorttext'] = $shorttext;
             $ItemRating['size']      = ($ItemRating['avg_rate_value'] * $rating_unitwidth) . 'px';
diff --git a/include/update.php b/include/update.php
@@ -33,29 +33,33 @@
  */
 function xoops_module_update_modulebuilder($module, $prev_version = null)
 {
-    $ret = null;
+    $ret = true;
     if ($prev_version < 191) {
         update_modulebuilder_v191($module);
     }
 
 	if (!modulebuilder_check_db($module)) {
+        $ret = false;
         print_r($module->getErrors());
     }
 
     if (!clean_index_files()) {
+        $ret = false;
         print_r($module->getErrors());
     }
 	
 	//check upload directory
 	require_once __DIR__ . '/install.php';
-    xoops_module_install_modulebuilder($module);
+    if (!xoops_module_install_modulebuilder($module)) {
+        $ret = false;
+    }
 	
     $errors = $module->getErrors();
     if (!empty($errors)) {
         print_r($errors);
     }
 
-    return null;
+    return $ret;
 }
 
 // irmtfan bug fix: solve templates duplicate issue

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@`
`209`	`209`	`if ($order > 0) {`
`210`	`210`	`$fieldsObj = $fieldsHandler->get($order);`
`211`	`211`	`$fieldsObj->setVar('field_order', $i);`
`212`		`- if ($fieldsHandler->insert($fieldsObj)) {`
	`212`	`+ if (!$fieldsHandler->insert($fieldsObj)) {`
`213`	`213`	`$error = true;`
`214`	`214`	`}`
`215`	`215`	`++$i;`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,12 @@ function xoops_module_install_modulebuilder(\XoopsModule $module)`
`72`	`72`	`continue;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`- if (!\chmod($path, 0775) && !\is_writable($path)) {`
`76`		`- $success = false;`
	`75`	`+ if (!@\is_writable($path)) {`
	`76`	`+ \chmod($path, 0775);`
	`77`	`+ \clearstatcache(false, $path);`
	`78`	`+ if (!@\is_writable($path)) {`
	`79`	`+ $success = false;`
	`80`	`+ }`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,29 +33,33 @@`
`33`	`33`	`*/`
`34`	`34`	`function xoops_module_update_modulebuilder($module, $prev_version = null)`
`35`	`35`	`{`
`36`		`- $ret = null;`
	`36`	`+ $ret = true;`
`37`	`37`	`if ($prev_version < 191) {`
`38`	`38`	`update_modulebuilder_v191($module);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (!modulebuilder_check_db($module)) {`
	`42`	`+ $ret = false;`
`42`	`43`	`print_r($module->getErrors());`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`if (!clean_index_files()) {`
	`47`	`+ $ret = false;`
`46`	`48`	`print_r($module->getErrors());`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`//check upload directory`
`50`	`52`	`require_once __DIR__ . '/install.php';`
`51`		`- xoops_module_install_modulebuilder($module);`
	`53`	`+ if (!xoops_module_install_modulebuilder($module)) {`
	`54`	`+ $ret = false;`
	`55`	`+ }`
`52`	`56`
`53`	`57`	`$errors = $module->getErrors();`
`54`	`58`	`if (!empty($errors)) {`
`55`	`59`	`print_r($errors);`
`56`	`60`	`}`
`57`	`61`
`58`		`- return null;`
	`62`	`+ return $ret;`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`// irmtfan bug fix: solve templates duplicate issue`