Added special message for AUTH users

[pithos] / src / gr / ebs / gss / server / rest / UserHandler.java

diff --git a/src/gr/ebs/gss/server/rest/UserHandler.java b/src/gr/ebs/gss/server/rest/UserHandler.java
index 674c0e1..de8c52d 100644 (file)
--- a/src/gr/ebs/gss/server/rest/UserHandler.java
+++ b/src/gr/ebs/gss/server/rest/UserHandler.java
@@ -91,21 +91,19 @@ public class UserHandler extends RequestHandler {
                                        put("groups", parentUrl + PATH_GROUPS).put("trash", parentUrl + PATH_TRASH).
                                        put("shared", parentUrl + PATH_SHARED).put("others", parentUrl + PATH_OTHERS).
                                        put("quota", statistics).put("tags", parentUrl + PATH_TAGS);
-                       String announcement = getConfiguration().getString("announcement");
+                       String announcement = getConfiguration().getString("announcement", "");
+            String authgr = getConfiguration().getString("authgr", "auth.gr");
+            if (authgr.equals(user.getHomeOrganization()))
+                announcement += getConfiguration().getString("authAnnouncement", "");
                        if (announcement != null && !announcement.isEmpty())
                                json.put("announcement", announcement);
-                       List<UserLogin> userLogins = user.getUserLogins();
-                       logger.debug("*****userLogins.size() = " +userLogins.size());
+                       List<UserLogin> userLogins = getService().getLastUserLogins(owner.getId());                     
                        UserLogin currentLogin = userLogins.get(0);
                        Date currentLoginDate = currentLogin.getLoginDate();
-                       
                        UserLogin lastLogin = userLogins.get(1);
-                       Date lastLoginDate = lastLogin.getLoginDate();
-                       
-                       json.put("lastlogin", lastLoginDate);
-                       json.put("currentlogin", currentLoginDate);
-//                     if (owner.getLastLogin() != null)
-//                             json.put("lastLogin", owner.getLastLogin().getTime());                  
+                       Date lastLoginDate = lastLogin.getLoginDate();                                          
+                       json.put("lastLogin", lastLoginDate.getTime())
+                               .put("currentLogin", currentLoginDate.getTime());                               
                } catch (JSONException e) {
                        logger.error("", e);
                        resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);