Merge pull request #1585 from mambax7/feature/fix_xoops_setcookie()

fix for xoops_setcookie()

Author: mambax7

htdocs/include/xoopssetcookie.php

@@ -22,8 +22,8 @@
  * @param string $name The name of the cookie.
  * @param string|null $value The value of the cookie.
  * @param int $expire The time the cookie expires. This is a Unix timestamp.
- * @param string $path The path on the server in which the cookie will be available on.
- * @param string $domain The (sub)domain that the cookie is available to.
+ * @param string|null $path The path on the server in which the cookie will be available on.
+ * @param string|null $domain The (sub)domain that the cookie is available to.
  * @param bool|null $secure Indicates that the cookie should only be transmitted over a secure HTTPS connection.
  * If null, it will be auto-detected.
  * @param bool $httponly When TRUE the cookie will be made accessible only through the HTTP protocol.
@@ -34,8 +34,8 @@ function xoops_setcookie(
     string $name,
     ?string $value = '',
     int $expire = 0,
-    string $path = '/',
-    string $domain = '',
+    ?string $path = '/',
+    ?string $domain = '',
     ?bool $secure = null,
     bool $httponly = true,
     string $samesite = 'Lax'
@@ -50,6 +50,9 @@ function xoops_setcookie(
     if (!is_string($host)) {
         $host = ''; // Fallback for invalid XOOPS_URL
     }
+    if (!is_string($domain)) {
+        $domain = ''; // Fallback for invalid domain
+    }
 
     // Validate the domain BEFORE using it.
     if (class_exists('\Xoops\RegDom\RegisteredDomain')) {

htdocs/install/page_end.php

@@ -32,7 +32,7 @@
 include_once __DIR__ . '/../class/logger/xoopslogger.php';
 
 $_SESSION = [];
-xoops_setcookie('xo_install_user', '', null, null, null);
+xoops_setcookie('xo_install_user', '', 0, '', '');
 $key = \Xmf\Jwt\KeyFactory::build('install');
 $key->kill();
 defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');

htdocs/install/page_langselect.php

@@ -29,17 +29,17 @@
 require_once __DIR__ . '/include/common.inc.php';
 defined('XOOPS_INSTALL') || die('XOOPS Installation wizard die');
 
-xoops_setcookie('xo_install_lang', 'english', null, null, null);
+xoops_setcookie('xo_install_lang', 'english', 0, '', '');
 if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_REQUEST['lang'])) {
     $lang = $_REQUEST['lang'];
-    xoops_setcookie('xo_install_lang', $lang, null, null, null);
+    xoops_setcookie('xo_install_lang', $lang, 0, '', '');
 
     $wizard->redirectToPage('+1');
     exit();
 }
 
 $_SESSION['settings'] = [];
-xoops_setcookie('xo_install_user', '', null, null, null);
+xoops_setcookie('xo_install_user', '', 0, '', '');
 
 $pageHasForm = true;
 $title = LANGUAGE_SELECTION;

htdocs/install/page_tablesfill.php

@@ -118,7 +118,7 @@ function xoops_loadLanguage($name, $domain = '', $language = null)
     ];
     $token = \Xmf\Jwt\TokenFactory::build('install', $claims, 60 * 60);
 
-    xoops_setcookie('xo_install_user', $token, 0, null, null, null, true);
+    xoops_setcookie('xo_install_user', $token, 0, '', '', null, true);
 }
 
 include __DIR__ . '/include/install_tpl.php';