From 3ad4db4a15b4ba59c65e2af797967941f2cb2ba2 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 21 Feb 2017 13:40:24 +0000
Subject: [PATCH] SessionManager angepasst
---
src/java/de/uhilger/filecms/pub/SessionManager.java | 77 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/src/java/de/uhilger/filecms/pub/SessionManager.java b/src/java/de/uhilger/filecms/pub/SessionManager.java
index 3ebf15e..0a394cc 100644
--- a/src/java/de/uhilger/filecms/pub/SessionManager.java
+++ b/src/java/de/uhilger/filecms/pub/SessionManager.java
@@ -1,29 +1,27 @@
/*
- * Nutzerverwaltung - User and role management in your browser
- * Copyright (C) 2011-2017 Ulrich Hilger, http://uhilger.de
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/
- */
+
+ Dateiverwaltung - File management in your browser
+ Copyright (C) 2017 Ulrich Hilger, http://uhilger.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+*/
package de.uhilger.filecms.pub;
-//import de.uhilger.um.api.Api;
-//import static de.uhilger.um.api.UserMgr.MP_USER_DATA;
-//import static de.uhilger.um.api.UserMgr.SQL_GET_USER_DATA;
-//import static de.uhilger.um.api.UserMgr.WITHOUT_BLOBS;
-//import de.uhilger.um.daten.UserData;
import de.uhilger.filecms.api.Api;
+import java.security.Principal;
import java.util.logging.Logger;
/**
@@ -33,36 +31,21 @@
private static final Logger logger = Logger.getLogger(SessionManager.class.getName());
- // /um/pub?c=de.uhilger.um.pub.SessionManager&m=getSessionUser
- /*
- public UserData getSessionUser() {
- UserData userData = new UserData();
- userData.setFirstName("nicht angemeldet");
- userData.setLastName("nicht angemeldet");
- userData.setId("nicht angemeldet");
- userData.setEmail("nicht angemeldet");
- Object p = getRequest().getUserPrincipal();
- if(p instanceof Principal) {
- String id = ((Principal) p).getName();
- logger.finer("User-ID: " + id);
- List userDataList = getDb().select(getSql(SQL_GET_USER_DATA), getMapper(MP_USER_DATA), WITHOUT_BLOBS, id);
- if(userDataList != null && userDataList.size() > 0) {
- Object o = userDataList.get(0);
- if(o instanceof UserData) {
- userData = (UserData) o;
- }
- }
- } else {
- logger.finer("getUserPrincipal returned null or no Principal");
- }
- return userData;
- }
-*/
-
public String expireSession() {
getRequest().getSession().invalidate();
return "Die aktuelle Sitzung ist nicht mehr gueltig.";
}
+ public String getSessionUser() {
+ String id = null;
+ Object p = getRequest().getUserPrincipal();
+ if(p instanceof Principal) {
+ id = ((Principal) p).getName();
+ logger.finer("User-ID: " + id);
+ } else {
+ logger.finer("getUserPrincipal returned null or no Principal");
+ }
+ return id;
+ }
}
--
Gitblit v1.9.3