Compare commits

...

7 Commits

Author SHA1 Message Date
Clemens Schwaighofer
f974b15f78 Smarty Extended update 2025-01-17 18:01:21 +09:00
Clemens Schwaighofer
e8fe1feda5 Release: v9.26.6.1 2025-01-17 14:46:42 +09:00
Clemens Schwaighofer
23fd78e5c8 ACL Login depricate edit access id check 2025-01-17 14:45:54 +09:00
Clemens Schwaighofer
6cdede2997 Release: v9.26.6 2025-01-17 14:40:21 +09:00
Clemens Schwaighofer
ace02b14d8 Merge branch 'development' 2025-01-17 14:39:05 +09:00
Clemens Schwaighofer
58e916d314 Fix ACL Login edit access cuid <-> id lookup 2025-01-17 14:38:41 +09:00
Clemens Schwaighofer
4f6d85f4da Release: v9.26.5 2025-01-17 12:52:30 +09:00
3 changed files with 7 additions and 7 deletions

View File

@@ -25,7 +25,7 @@
"phpstan/phpdoc-parser": "^2.0", "phpstan/phpdoc-parser": "^2.0",
"phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-deprecation-rules": "^2.0",
"phan/phan": "^5.4", "phan/phan": "^5.4",
"egrajp/smarty-extended": "^4.3", "egrajp/smarty-extended": "^5.4",
"gullevek/dotenv": "dev-master", "gullevek/dotenv": "dev-master",
"phpunit/phpunit": "^9" "phpunit/phpunit": "^9"
}, },

View File

@@ -1 +1 @@
9.26.4 9.26.6.1

View File

@@ -3217,7 +3217,7 @@ HTML;
* @return int|null same edit access id if ok * @return int|null same edit access id if ok
* or the default edit access id * or the default edit access id
* if given one is not valid * if given one is not valid
* @deprecated Please switch to using edit access cuid check with ->loginCheckEditAccessValidCuid() * @#deprecated Please switch to using edit access cuid check with ->loginCheckEditAccessValidCuid()
*/ */
public function loginCheckEditAccessId(?int $edit_access_id): ?int public function loginCheckEditAccessId(?int $edit_access_id): ?int
{ {
@@ -3290,10 +3290,10 @@ HTML;
*/ */
public function loginGetEditAccessCuidFromId(int $id): string|false public function loginGetEditAccessCuidFromId(int $id): string|false
{ {
if (!isset($_SESSION['LOGIN_UNIT_ACL_LEVEL'][$id])) { if (!isset($_SESSION['LOGIN_UNIT_LEGACY'][$id])) {
return false; return false;
} }
return (string)$_SESSION['LOGIN_UNIT_ACL_LEVEL'][$id]['cuid']; return (string)$_SESSION['LOGIN_UNIT_LEGACY'][$id]['cuid'];
} }
/** /**
@@ -3304,10 +3304,10 @@ HTML;
*/ */
public function loginGetEditAccessIdFromCuid(string $cuid): int|false public function loginGetEditAccessIdFromCuid(string $cuid): int|false
{ {
if (!isset($_SESSION['LOGIN_UNIT_LEGACY'][$cuid])) { if (!isset($_SESSION['LOGIN_UNIT'][$cuid])) {
return false; return false;
} }
return $_SESSION['LOGIN_UNIT_LEGACY'][$cuid]; return $_SESSION['LOGIN_UNIT'][$cuid]['id'];
} }
/** /**