Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43b51895f0 | ||
|
|
d0e294ecf5 |
@@ -885,13 +885,13 @@ class Login
|
|||||||
$this->acl['show_ea_extra'] = false;
|
$this->acl['show_ea_extra'] = false;
|
||||||
}
|
}
|
||||||
// set the default edit access
|
// set the default edit access
|
||||||
$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'];
|
$this->acl['default_edit_access'] = $_SESSION['UNIT_DEFAULT'] ?? null;
|
||||||
// integrate the type acl list, but only for the keyword -> level
|
// integrate the type acl list, but only for the keyword -> level
|
||||||
foreach ($this->default_acl_list as $level => $data) {
|
foreach ($this->default_acl_list as $level => $data) {
|
||||||
$this->acl['min'][$data['type']] = $level;
|
$this->acl['min'][$data['type']] = $level;
|
||||||
}
|
}
|
||||||
// set the full acl list too
|
// set the full acl list too
|
||||||
$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'];
|
$this->acl['acl_list'] = $_SESSION['DEFAULT_ACL_LIST'] ?? [];
|
||||||
// debug
|
// debug
|
||||||
// $this->debug('ACL', $this->print_ar($this->acl));
|
// $this->debug('ACL', $this->print_ar($this->acl));
|
||||||
}
|
}
|
||||||
@@ -1453,7 +1453,8 @@ EOM;
|
|||||||
* checks that the given edit access id is valid for this user
|
* checks that the given edit access id is valid for this user
|
||||||
* @param int|null $edit_access_id edit access id to check
|
* @param int|null $edit_access_id edit access id to check
|
||||||
* @return int|null same edit access id if ok
|
* @return int|null same edit access id if ok
|
||||||
* or the default edit access id if given one is not valid
|
* or the default edit access id
|
||||||
|
* if given one is not valid
|
||||||
*/
|
*/
|
||||||
public function loginCheckEditAccessId(?int $edit_access_id): ?int
|
public function loginCheckEditAccessId(?int $edit_access_id): ?int
|
||||||
{
|
{
|
||||||
@@ -1463,7 +1464,7 @@ EOM;
|
|||||||
is_array($_SESSION['UNIT']) &&
|
is_array($_SESSION['UNIT']) &&
|
||||||
!array_key_exists($edit_access_id, $_SESSION['UNIT'])
|
!array_key_exists($edit_access_id, $_SESSION['UNIT'])
|
||||||
) {
|
) {
|
||||||
return (int)$_SESSION['UNIT_DEFAULT'];
|
return $_SESSION['UNIT_DEFAULT'] ?? null;
|
||||||
} else {
|
} else {
|
||||||
return $edit_access_id;
|
return $edit_access_id;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -503,7 +503,7 @@ class ArrayIO extends \CoreLibs\DB\IO
|
|||||||
// max id, falls INSERT
|
// max id, falls INSERT
|
||||||
$q = 'SELECT MAX(' . $this->pk_name . ') + 1 AS pk_id FROM ' . $this->table_name;
|
$q = 'SELECT MAX(' . $this->pk_name . ') + 1 AS pk_id FROM ' . $this->table_name;
|
||||||
if (is_array($res = $this->dbReturnRow($q))) {
|
if (is_array($res = $this->dbReturnRow($q))) {
|
||||||
$pk_id = $res['pkd_id'];
|
$pk_id = $res['pk_id'];
|
||||||
} else {
|
} else {
|
||||||
$pk_id = 1;
|
$pk_id = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
* Language\Encoding::__mbMimeEncode -> Convert\MimeEncode::__mbMimeEncode
|
* Language\Encoding::__mbMimeEncode -> Convert\MimeEncode::__mbMimeEncode
|
||||||
* Langauge\Encoding::checkConvertEncoding -> Check\Encoding::checkConvertEncoding
|
* Langauge\Encoding::checkConvertEncoding -> Check\Encoding::checkConvertEncoding
|
||||||
* Langauge\Encoding::setErrorChar -> Check\Encoding::setErrorChar
|
* Langauge\Encoding::setErrorChar -> Check\Encoding::setErrorChar
|
||||||
* Langauge\Encoding::getErrorChar -> Encoding::getErrorChar
|
* Langauge\Encoding::getErrorChar -> Check\Encoding::getErrorChar
|
||||||
* Langauge\Encoding::convertEncoding -> Convert\Encoding::convertEncoding
|
* Langauge\Encoding::convertEncoding -> Convert\Encoding::convertEncoding
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user