fixed bugs in set_cookie functions inside IO Class

Aldea-mean-2024 · Nov 2, 2022 · a96616a · a96616a
1 parent b0c3ccb
commit a96616a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 21 deletions.
diff --git a/app/config/config.php b/app/config/config.php
@@ -57,7 +57,7 @@
 | LavaLust Version
 | -------------------------------------------------------------------
 */
-$config['VERSION']                 = '3.1.0';
+$config['VERSION']                 = '3.1.1';
 
 /*
 | -------------------------------------------------------------------
@@ -213,10 +213,10 @@
 $config['cookie_prefix']           = '';
 $config['cookie_domain']           = '';
 $config['cookie_path']             = '/';
-$config['cookie_secure']           = TRUE;
+$config['cookie_secure']           = FALSE;
 $config['cookie_expiration']       = 86400;
 $config['cookie_httponly']         = FALSE;
-$config['cookie_samesite']         = 'None';
+$config['cookie_samesite']         = 'Lax';
 
 /*
 |--------------------------------------------------------------------------

diff --git a/scheme/kernel/Io.php b/scheme/kernel/Io.php
@@ -160,11 +160,11 @@ public function set_cookie($name, $value = '', $expiration = 0, $options = array
 		{
 			if(count($options) > 0)
 			{
-				foreach($options as $key => $value)
+				foreach($options as $key => $val)
 				{
 					if(isset($options[$key]) && $options[$key] != 'expiration')
 					{
-						$arr[$key] = $value;
+						$arr[$key] = $val;
 					} else {
 						$arr[$key] = config_item('cookie_' . $key);
 					}
@@ -180,27 +180,21 @@ public function set_cookie($name, $value = '', $expiration = 0, $options = array
 		} else {
 			$arr['expiration'] =  ($expiration > 0) ? time() + $expiration : 0;
 		}
-		
+
 		foreach($lists as $key)
 		{
 			$arr[$key] = config_item('cookie_' . $key);
 		}
 
-		//check for PHP Version later than 7.3.0
-		if (PHP_VERSION_ID < 70300)
-		{
-			setcookie($arr['prefix'].$name, $value, $arr['expiration'], $arr['path'].'; samesite='.$arr['samesite'], $arr['domain'], $arr['secure'], $arr['httponly']);
-		} else {
-			setcookie($arr['prefix'].$name, $value,
-				array(
-					'expires' => $arr['expiration'],
-					'path' => $arr['path'],
-					'domain' => $arr['domain'],
-					'secure' => (bool) $arr['secure'],
-					'httponly' => (bool) $arr['httponly'],
-					'samesite' => $arr['samesite']
-				));
-		}
+		setcookie($arr['prefix'].$name, $value,
+			array(
+				'expires' => $arr['expiration'],
+				'path' => $arr['path'],
+				'domain' => $arr['domain'],
+				'secure' => (bool) $arr['secure'],
+				'httponly' => (bool) $arr['httponly'],
+				'samesite' => $arr['samesite']
+			));
 	}
 
 	/**