diff --git a/www/layout/admin/javascript/edit.jq.js b/www/layout/admin/javascript/edit.jq.js index 56307ae3..9de6d88a 100644 --- a/www/layout/admin/javascript/edit.jq.js +++ b/www/layout/admin/javascript/edit.jq.js @@ -85,6 +85,21 @@ function getScrollOffset() }; } +/** + * wrapper to get the correct scroll offset for opener page (from popup) + * @return {Object} object with x/y px + */ +function getScrollOffsetOpener() // eslint-disable-line no-unused-vars +{ + var left, top; + left = opener.window.pageXOffset || (opener.document.documentElement.scrollLeft || opener.document.body.scrollLeft); + top = opener.window.pageYOffset || (opener.document.documentElement.scrollTop || opener.document.body.scrollTop); + return { + left: left, + top: top + }; +} + /** * centers div to current window size middle * @param {String} id element to center diff --git a/www/lib/CoreLibs/ACL/Login.php b/www/lib/CoreLibs/ACL/Login.php index c9bca303..9522d52c 100644 --- a/www/lib/CoreLibs/ACL/Login.php +++ b/www/lib/CoreLibs/ACL/Login.php @@ -1146,18 +1146,18 @@ class Login // user > page > group // group ACL 0 if ($_SESSION['GROUP_ACL_LEVEL'] != -1) { - $this->acl['base'] = $_SESSION['GROUP_ACL_LEVEL']; + $this->acl['base'] = (int)$_SESSION['GROUP_ACL_LEVEL']; } // page ACL 1 if ( isset($_SESSION['PAGES_ACL_LEVEL'][$this->page_name]) && $_SESSION['PAGES_ACL_LEVEL'][$this->page_name] != -1 ) { - $this->acl['base'] = $_SESSION['PAGES_ACL_LEVEL'][$this->page_name]; + $this->acl['base'] = (int)$_SESSION['PAGES_ACL_LEVEL'][$this->page_name]; } // user ACL 2 if ($_SESSION['USER_ACL_LEVEL'] != -1) { - $this->acl['base'] = $_SESSION['USER_ACL_LEVEL']; + $this->acl['base'] = (int)$_SESSION['USER_ACL_LEVEL']; } } $_SESSION['BASE_ACL_LEVEL'] = $this->acl['base']; diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php index d36453cd..eb706907 100644 --- a/www/lib/CoreLibs/DB/IO.php +++ b/www/lib/CoreLibs/DB/IO.php @@ -2057,10 +2057,11 @@ class IO /** * this is only needed for Postgresql. Converts postgresql arrays to PHP * Recommended to rather user 'array_to_json' instead and convet JSON in PHP + * or if ARRAY_AGG -> JSONB_AGG * * @param string $text input text to parse to an array * @return array PHP array of the parsed data - * @deprecated Recommended to use 'array_to_json' in PostgreSQL instead + * @deprecated Recommended to use 'array_to_json/jsonb_agg' in PostgreSQL instead */ public function dbArrayParse(string $text): array {