web/modules/rhn/RHN/DB/User.pm | 33 ---------------------------------
1 file changed, 33 deletions(-)
New commits:
commit 21c625d8a28ee5bb5218ee66f9cb43d63a916b02
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 17:24:38 2010 +0100
Removal of approve and banish made remove_from_group unused.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 2b04f51..501f883 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -1722,28 +1722,6 @@ EOQ
}
-sub remove_from_group {
- my $self = shift;
- my $label = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT UG.id
- FROM rhnUserGroupType UGT,
- rhnUserGroup UG
- WHERE UG.org_id = ?
- AND UG.group_type = UGT.id
- AND UGT.label = ?
-EOQ
-
- $sth->execute($self->org_id, $label);
- my ($ugid) = $sth->fetchrow;
- $sth->finish;
-
- $dbh->call_procedure("rhn_user.delete_from_usergroup", $self->id,
$ugid);
- $dbh->commit;
-}
-
sub has_incomplete_info {
my $self = shift;
commit 86195f264d1d55ea651c66ce89659699e3f36f8b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 17:23:33 2010 +0100
approve not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index d45c4b9..2b04f51 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -1759,17 +1759,6 @@ sub has_incomplete_info {
return 0;
}
-sub approve {
- my $self = shift;
-
- $self->set_password(PXT::Utils->random_password(10));
- $self->remove_from_group('org_applicant');
-
- $self->commit;
-
- return $self->password;
-}
-
sub grant_servergroup_permission {
my $self = shift;
my $uid;
Show replies by date