Author: tdraier
Date: Mon Jun 25 12:43:35 2007
New Revision: 17727

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17727&repname=
=3Djahia
Log:
fixed site membership test ( cookie login for shared users ) (backport 1721=
6)

Modified:
    trunk/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBPr=
ovider.java

Modified: trunk/core/src/java/org/jahia/services/usermanager/JahiaUserManag=
erDBProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/usermanager/JahiaUserManagerDBProvider.java&rev=3D17727&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBPr=
ovider.java (original)
+++ trunk/core/src/java/org/jahia/services/usermanager/JahiaUserManagerDBPr=
ovider.java Mon Jun 25 12:43:35 2007
@@ -443,8 +443,13 @@
         while (userKeyEnum.hasNext ()) {
             String curUserKey =3D (String) userKeyEnum.next ();
             JahiaUser user =3D lookupUser (curUserKey);
-            if (user.getSiteID() =3D=3D siteID) {
-                result.add (user);
+            try {
+                JahiaUser member =3D ServicesRegistry.getInstance().getJah=
iaSiteUserManagerService().getMember(siteID, user.getUsername());
+                if (member !=3D null && member.getUserKey().equals(user.ge=
tUserKey())) {
+                    result.add (user);
+                }
+            } catch (JahiaException e) {
+                logger.error("Cannot get site member",e);
             }
         }
 =


_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to