[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gallery-checkins
Subject:    [Gallery-checkins] CVS: gallery2/modules/core/classes GalleryUserGroupMap.class,1.14,1.15 GalleryUse
From:       Bharat Mediratta <bharat () users ! sourceforge ! net>
Date:       2003-03-24 5:32:54
[Download RAW message or body]

Update of /cvsroot/gallery/gallery2/modules/core/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv30166/modules/core/classes

Modified Files:
	GalleryUserGroupMap.class GalleryUserHelper.class 
Log Message:
GalleryUserGroupMap::isUserInSiteAdminGroup now implicitly uses the active user id

Index: GalleryUserGroupMap.class
===================================================================
RCS file: /cvsroot/gallery/gallery2/modules/core/classes/GalleryUserGroupMap.class,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- GalleryUserGroupMap.class	23 Feb 2003 23:30:14 -0000	1.14
+++ GalleryUserGroupMap.class	24 Mar 2003 05:32:51 -0000	1.15
@@ -256,14 +256,13 @@
     
 
     /**
-     * Is the given user id in the admin group?
+     * Is the active user in the admin group?
      *
-     * @param int the id of the user
      * @return array object GalleryStatus a status code
      *               bool true if yes
      * @static
      */
-    function isUserInSiteAdminGroup($userId) {
+    function isUserInSiteAdminGroup() {
 	global $gallery;
 	list ($ret, $adminGroupId) =
 	    $gallery->getModuleParameter('core', 'id.adminGroup');
@@ -271,7 +270,8 @@
 	    return $ret->wrap(__FILE__, __LINE__);
 	}
 
-	list ($ret, $result) = GalleryUserGroupMap::isUserInGroup($userId, $adminGroupId);
+	list ($ret, $result) = GalleryUserGroupMap::isUserInGroup($gallery->getActiveUserId(),
+								  $adminGroupId);
 	if ($ret->isError()) {
 	    return $ret->wrap(__FILE__, __LINE__);
 	}

Index: GalleryUserHelper.class
===================================================================
RCS file: /cvsroot/gallery/gallery2/modules/core/classes/GalleryUserHelper.class,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- GalleryUserHelper.class	18 Mar 2003 07:10:51 -0000	1.17
+++ GalleryUserHelper.class	24 Mar 2003 05:32:51 -0000	1.18
@@ -183,8 +183,7 @@
 	global $gallery;
 
 	/* Make sure we have adequate permissions */
-	list ($ret, $inGroup) =
-	    GalleryUserGroupMap::isUserInSiteAdminGroup($gallery->getActiveUserId());
+	list ($ret, $inGroup) = GalleryUserGroupMap::isUserInSiteAdminGroup();
 	if ($ret->isError()) {
 	    return array($ret->wrap(__FILE__, __LINE__), null);
 	}



-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
[prev in list] [next in list] [prev in thread] [next in thread]