fix "Only variables should be passed by reference" error and don't di…

…sclose raw SEED value, ref. 3446a34
f3-factory · May 27, 2018 · 8d41c1e · 8d41c1e
1 parent a081736
commit 8d41c1e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/db/jig/session.php b/db/jig/session.php
@@ -180,9 +180,9 @@ function __construct(\DB\Jig $db,$file='sessions',$onsuspect=NULL,$key=NULL) {
 		register_shutdown_function('session_commit');
 		$fw=\Base::instance();
 		$headers=$fw->HEADERS;
-		$this->_csrf=$fw->SEED.'.'.$fw->hash(
+		$this->_csrf=$fw->hash($fw->SEED.
 			extension_loaded('openssl')?
-				array_pop(unpack('L',openssl_random_pseudo_bytes(4))):
+				implode(unpack('L',openssl_random_pseudo_bytes(4))):
 				mt_rand()
 			);
 		if ($key)

diff --git a/db/mongo/session.php b/db/mongo/session.php
@@ -180,9 +180,9 @@ function __construct(\DB\Mongo $db,$table='sessions',$onsuspect=NULL,$key=NULL)
 		register_shutdown_function('session_commit');
 		$fw=\Base::instance();
 		$headers=$fw->HEADERS;
-		$this->_csrf=$fw->SEED.'.'.$fw->hash(
+		$this->_csrf=$fw->hash($fw->SEED.
 			extension_loaded('openssl')?
-				array_pop(unpack('L',openssl_random_pseudo_bytes(4))):
+				implode(unpack('L',openssl_random_pseudo_bytes(4))):
 				mt_rand()
 			);
 		if ($key)

diff --git a/db/sql/session.php b/db/sql/session.php
@@ -204,9 +204,9 @@ function __construct(\DB\SQL $db,$table='sessions',$force=TRUE,$onsuspect=NULL,$
 		register_shutdown_function('session_commit');
 		$fw=\Base::instance();
 		$headers=$fw->HEADERS;
-		$this->_csrf=$fw->SEED.'.'.$fw->hash(
+		$this->_csrf=$fw->hash($fw->SEED.
 			extension_loaded('openssl')?
-				array_pop(unpack('L',openssl_random_pseudo_bytes(4))):
+				implode(unpack('L',openssl_random_pseudo_bytes(4))):
 				mt_rand()
 			);
 		if ($key)

diff --git a/session.php b/session.php
@@ -182,9 +182,9 @@ function __construct($onsuspect=NULL,$key=NULL,$cache=null) {
 		register_shutdown_function('session_commit');
 		$fw=\Base::instance();
 		$headers=$fw->HEADERS;
-		$this->_csrf=$fw->SEED.'.'.$fw->hash(
+		$this->_csrf=$fw->hash($fw->SEED.
 			extension_loaded('openssl')?
-				array_pop(unpack('L',openssl_random_pseudo_bytes(4))):
+				implode(unpack('L',openssl_random_pseudo_bytes(4))):
 				mt_rand()
 			);
 		if ($key)