[Cpan-forum-commit] rev 339 - in trunk: . lib/CPAN/Forum lib/CPAN/Forum/DB lib/CPAN/Forum/RM

[svn at pti.co.il]

Author: gabor
Date: 2007-08-14 11:33:37 +0300 (Tue, 14 Aug 2007)
New Revision: 339

Removed:
   trunk/lib/CPAN/Forum/DB/Usergroups.pm
Modified:
   trunk/
   trunk/MANIFEST
   trunk/lib/CPAN/Forum/DB/Users.pm
   trunk/lib/CPAN/Forum/INC.pm
   trunk/lib/CPAN/Forum/RM/Login.pm
Log:
move is_admin from DB::Usergroups to DB::Users
eliminate need for DB::Usergroups



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4425
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4426
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/MANIFEST
===================================================================
--- trunk/MANIFEST	2007-08-14 08:33:18 UTC (rev 338)
+++ trunk/MANIFEST	2007-08-14 08:33:37 UTC (rev 339)
@@ -27,7 +27,6 @@
 lib/CPAN/Forum/DB/Subscriptions.pm
 lib/CPAN/Forum/DB/Tags.pm
 lib/CPAN/Forum/DB/Users.pm
-lib/CPAN/Forum/DB/Usergroups.pm
 lib/CPAN/Forum/DB/UserInGroup.pm
 
 lib/CPAN/Forum/RM/Admin.pm

Deleted: trunk/lib/CPAN/Forum/DB/Usergroups.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Usergroups.pm	2007-08-14 08:33:18 UTC (rev 338)
+++ trunk/lib/CPAN/Forum/DB/Usergroups.pm	2007-08-14 08:33:37 UTC (rev 339)
@@ -1,21 +0,0 @@
-package CPAN::Forum::DB::Usergroups;
-use strict;
-use warnings;
-use base 'CPAN::Forum::DBI';
-#__PACKAGE__->table('usergroups');
-#__PACKAGE__->columns(All => qw/id name/);
-
-sub is_admin {
-    my ($self, $id) = @_;
-
-    my $sql = "SELECT id FROM usergroups, user_in_group
-               WHERE 
-               usergroups.name='admin' AND
-               user_in_group.uid = ? AND
-               user_in_group.gid=usergroups.id
-               ";
-    $self->_fetch_single_value($sql, $id);
-}
-
-1;
-

Modified: trunk/lib/CPAN/Forum/DB/Users.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Users.pm	2007-08-14 08:33:18 UTC (rev 338)
+++ trunk/lib/CPAN/Forum/DB/Users.pm	2007-08-14 08:33:37 UTC (rev 339)
@@ -7,6 +7,7 @@
 __PACKAGE__->columns(All => qw/id username password email fname lname status
                             update_on_new_user/);
 __PACKAGE__->has_many(posts => "CPAN::Forum::DB::Posts");
+ 
 
 use List::MoreUtils qw(none);
 
@@ -91,5 +92,18 @@
     return $self->_fetch_arrayref_of_hashes($sql, $username);
 }
 
+sub is_admin {
+    my ($self, $id) = @_;
+
+    my $sql = "SELECT id FROM usergroups, user_in_group
+               WHERE 
+               usergroups.name='admin' AND
+               user_in_group.uid = ? AND
+               user_in_group.gid=usergroups.id
+               ";
+    $self->_fetch_single_value($sql, $id);
+}
+
+
 1;
 

Modified: trunk/lib/CPAN/Forum/INC.pm
===================================================================
--- trunk/lib/CPAN/Forum/INC.pm	2007-08-14 08:33:18 UTC (rev 338)
+++ trunk/lib/CPAN/Forum/INC.pm	2007-08-14 08:33:37 UTC (rev 339)
@@ -13,7 +13,6 @@
 use CPAN::Forum::DB::Subscriptions_all;
 use CPAN::Forum::DB::Subscriptions_pauseid;
 use CPAN::Forum::DB::Subscriptions;
-use CPAN::Forum::DB::Usergroups;
 use CPAN::Forum::DB::UserInGroup;
 use CPAN::Forum::DB::Users;
 

Modified: trunk/lib/CPAN/Forum/RM/Login.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Login.pm	2007-08-14 08:33:18 UTC (rev 338)
+++ trunk/lib/CPAN/Forum/RM/Login.pm	2007-08-14 08:33:37 UTC (rev 339)
@@ -59,7 +59,7 @@
     $session->param(fname     => $user->{fname});
     $session->param(lname     => $user->{lname});
     $session->param(email     => $user->{email});
-    if (CPAN::Forum::DB::Usergroups->is_admin($user->{id})) { # SQL
+    if (CPAN::Forum::DB::Users->is_admin($user->{id})) { # SQL
         $session->param(admin     => 1);
     }