From f59f41cd9ecab4609d0b92b2dc8d45b7af173cab Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 15 Mar 2006 22:55:00 +0000
Subject: [PATCH] WebGUI::User->isInGroup does not take a UID argument anymore.
 Grepped all files and fixed these errors: 	- Passed userId replaced by
 User object creation and use. 	- Where $session->user->userId was used, it
 was removed. Updated POD inside Group.pm

---
 lib/WebGUI/Asset.pm                | 6 ++++--
 lib/WebGUI/Asset/Wobject/Poll.pm   | 2 +-
 lib/WebGUI/Group.pm                | 2 +-
 lib/WebGUI/Operation/MessageLog.pm | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 43d4567a0..ed205db58 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -80,10 +80,11 @@ sub canAdd {
 	my $className = shift;
 	my $session = shift;
 	my $userId = shift || $session->user->userId;
+	my $user = WebGUI::User->new($self->session, $userId);
 	my $subclassGroupId = shift;
 	my $addPrivs = $session->config->get("assetAddPrivilege");
 	my $groupId = $addPrivs->{$className} || $subclassGroupId || '12';
-        return $session->user->isInGroup($groupId,$userId);
+        return $user->isInGroup($groupId);
 }
 
 
@@ -102,10 +103,11 @@ Unique hash identifier for a user. If not supplied, current user.
 sub canEdit {
 	my $self = shift;
 	my $userId = shift || $self->session->user->userId;
+	my $user = WebGUI::User->new($self->session, $userId);
  	if ($userId eq $self->get("ownerUserId")) {
                 return 1;
 	}
-        return $self->session->user->isInGroup($self->get("groupIdEdit"),$userId);
+        return $user->isInGroup($self->get("groupIdEdit"));
 }
 
 
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index bba91c0be..75960d955 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -312,7 +312,7 @@ sub view {
         $var{question} = $self->get("question");
 	if ($self->get("active") eq "0") {
 		$showPoll = 0;
-	} elsif ($self->session->user->isInGroup($self->get("voteGroup"),$self->session->user->userId)) {
+	} elsif ($self->session->user->isInGroup($self->get("voteGroup"))) {
 		if ($self->_hasVoted()) {
 			$showPoll = 0;
 		} else {
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index a8c601b11..987927b84 100755
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -65,7 +65,7 @@ This package provides an object-oriented way of managing WebGUI groups and group
  $arrayRef = $self->session->user->getGroups($userId);
  $arrayRef = $group->getGroupsIn($recursive);
  $arrayRef = $group->getUsers($groupId);
- $boolean = $self->session->user->isInGroup($groupId, $userId);
+ $boolean = $self->session->user->isInGroup($groupId);
  $boolean = $group->userIsAdmin($userId,$groupId);
  $epoch = $group->userGroupExpireDate($userId,$groupId);
 
diff --git a/lib/WebGUI/Operation/MessageLog.pm b/lib/WebGUI/Operation/MessageLog.pm
index 5da1ad9ba..629e4af1b 100644
--- a/lib/WebGUI/Operation/MessageLog.pm
+++ b/lib/WebGUI/Operation/MessageLog.pm
@@ -54,8 +54,8 @@ Templated display all messages for the current user.
 
 sub www_viewMessageLog {
 	my $session = shift;
-   my (@msg, $vars);
-   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
+	my (@msg, $vars);
+	return $session->privilege->insufficient() unless ($session->user->isInGroup(2));
 	my $i18n = WebGUI::International->new($session);
    $vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';
    my $p = WebGUI::Paginator->new($session,$session->url->page('op=viewMessageLog'));
@@ -100,8 +100,8 @@ Templated display of a single message for the user.
 
 sub www_viewMessageLogMessage {
 	my $session = shift;
-   my ($data, $vars);
-   return $session->privilege->insufficient() unless ($session->user->isInGroup(2,$session->user->userId));
+	my ($data, $vars);
+	return $session->privilege->insufficient() unless ($session->user->isInGroup(2));
 	my $i18n = WebGUI::International->new($session);
    $vars->{displayTitle} = '<h1>'.$i18n->get(159).'</h1>';