diff --git a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php index 896946d..fbebe48 100644 --- a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php +++ b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php @@ -20,18 +20,20 @@ # # SPDX-License-Identifier: AGPL-3.0-or-later */ - $api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']); - - // Remove user menu Settings item for non-administrator users - if(!array_key_exists('core_apps', $_["settingsnavigation"])){ - unset($_["settingsnavigation"]["settings"]); - } - -$getUserAvatar = static function (int $size) use ($_): string { - $avatar_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/avatar-provider"; - return $avatar_url; +// \OCP\Util::addScript('dd', 'navbar'); +// style('dd', 'ddstyles'); +$api_url = "https://" . preg_replace('/^nextcloud\./', 'api.', $_SERVER['HTTP_HOST']); +$profile_url = "https://" . preg_replace('/^nextcloud\./', 'sso.', $_SERVER['HTTP_HOST']) . "/auth/realms/master/account"; +$showsettings = in_array($_['user_uid'], ['admin', 'ddadmin']) ? true : false; + + $getUserAvatar = static function (int $size) use ($_): string { + return \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [ + 'userId' => $_['user_uid'], + 'size' => $size, + 'v' => $_['userAvatarVersion'] + ]); } - +//script('dd', 'navbar.js'); ?> @@ -58,27 +60,19 @@ $getUserAvatar = static function (int $size) use ($_): string { - - - + + + - data-themes=> - + $initialState) { ?> @@ -90,6 +84,9 @@ $getUserAvatar = static function (int $size) use ($_): string {