Bug fix

viames · Oct 10, 2023 · 702588c · 702588c
1 parent fca033e
commit 702588c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
@@ -316,7 +316,7 @@ public function __call(string $name, array $arguments) {
 		$multiPairClass = 'Pair\\' . $multiClass;
 
 		// maybe call is referring to
-		if ('get'==substr($name,0,3)) {
+		if ($this->areKeysPopulated() and 'get'==substr($name,0,3)) {
 
 			// check if invoked a virtual method on Pair class
 			if (class_exists($evenPairClass) and is_subclass_of($evenPairClass,'Pair\ActiveRecord')) {

diff --git a/src/UserRemember.php b/src/UserRemember.php
@@ -91,7 +91,7 @@ public static function getCookieContent(): ?\stdClass {
 			return  NULL;
 		}
 
-		$regex = "#^[123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYWZ]{32}$#";
+		$regex = '#^[' . Utilities::RANDOM_STRING_CHARS . ']{32}$#';
 
 		// check if content exists and RememberMe length
 		if (is_array($content) and isset($content[0]) and isset($content[1]) and preg_match($regex, (string)$content[1])) {

diff --git a/src/Utilities.php b/src/Utilities.php
@@ -7,6 +7,11 @@
  */
 class Utilities {
 
+	/**
+	 * List of characters allowed for the composition of a random string.
+	 */
+	const RANDOM_STRING_CHARS = '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
 	/**
 	 * Custom error handler.
 	 *
@@ -992,11 +997,8 @@ public static function getFileUrl($filePath, $addTimestamp = FALSE) {
 	 */
 	public static function getRandomString(int $length): string {
 
-		// list of available chars for random string
-		$availableChars = '123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVXYWZ';
-
 		// create a random string
-		return substr(str_shuffle($availableChars . $availableChars), 0, $length);
+		return substr(str_shuffle(self::RANDOM_STRING_CHARS . self::RANDOM_STRING_CHARS), 0, $length);
 
 	}