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

[svn at pti.co.il]

Author: gabor
Date: 2007-07-06 11:00:57 +0300 (Fri, 06 Jul 2007)
New Revision: 247

Modified:
   trunk/
   trunk/lib/CPAN/Forum/DB/Posts.pm
   trunk/lib/CPAN/Forum/DB/Users.pm
   trunk/lib/CPAN/Forum/DBI.pm
   trunk/lib/CPAN/Forum/RM/Notify.pm
Log:
move the DBI helper functions to the CPAN::Forum::DBI module
add a new DBI only function to DB::Users



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

Modified: trunk/lib/CPAN/Forum/DB/Posts.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Posts.pm	2007-07-06 08:00:41 UTC (rev 246)
+++ trunk/lib/CPAN/Forum/DB/Posts.pm	2007-07-06 08:00:57 UTC (rev 247)
@@ -112,31 +112,6 @@
 
     return $self->_fetch_arrayref_of_hashes($sql, $limit);
 }
-sub _fetch_arrayref_of_hashes {
-    my ($self, $sql, @args) = @_;
-
-    my $dbh = CPAN::Forum::DBI::db_Main();
-    my $sth = $dbh->prepare($sql);
-    $sth->execute(@args);
-    my @values;
-    while (my $hr = $sth->fetchrow_hashref) {
-        push @values, $hr;
-    }
-    return \@values;
-}
-sub _fetch_single_hashref {
-    my ($self, $sql, @args) = @_;
-
-    my $dbh = CPAN::Forum::DBI::db_Main();
-    my $sth = $dbh->prepare($sql);
-    $sth->execute(@args);
-    my @values;
-    my $hr = $sth->fetchrow_hashref;
-    $sth->finish;
-    return $hr;
-    
-}
-
 sub mysearch {
     my ($self, $params) = @_;
 

Modified: trunk/lib/CPAN/Forum/DB/Users.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Users.pm	2007-07-06 08:00:41 UTC (rev 246)
+++ trunk/lib/CPAN/Forum/DB/Users.pm	2007-07-06 08:00:57 UTC (rev 247)
@@ -25,6 +25,16 @@
     return $pw;
 }
 
+sub get_user {
+    my ($self, $user_id) = @_;
+    return if not $user_id;
 
+    my $sql = "SELECT id, email, fname, lname, username
+                FROM users
+                WHERE id=?";
+    return $self->_fetch_single_hashref($sql, $user_id);
+}
+
+
 1;
 

Modified: trunk/lib/CPAN/Forum/DBI.pm
===================================================================
--- trunk/lib/CPAN/Forum/DBI.pm	2007-07-06 08:00:41 UTC (rev 246)
+++ trunk/lib/CPAN/Forum/DBI.pm	2007-07-06 08:00:57 UTC (rev 247)
@@ -51,5 +51,33 @@
     return 1;
 }
 
+
+# helper function for plain DBI calls
+sub _fetch_arrayref_of_hashes {
+    my ($self, $sql, @args) = @_;
+
+    my $dbh = CPAN::Forum::DBI::db_Main();
+    my $sth = $dbh->prepare($sql);
+    $sth->execute(@args);
+    my @values;
+    while (my $hr = $sth->fetchrow_hashref) {
+        push @values, $hr;
+    }
+    return \@values;
+}
+sub _fetch_single_hashref {
+    my ($self, $sql, @args) = @_;
+
+    my $dbh = CPAN::Forum::DBI::db_Main();
+    my $sth = $dbh->prepare($sql);
+    $sth->execute(@args);
+    my @values;
+    my $hr = $sth->fetchrow_hashref;
+    $sth->finish;
+    return $hr;
+    
+}
+
+
 1;
 

Modified: trunk/lib/CPAN/Forum/RM/Notify.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Notify.pm	2007-07-06 08:00:41 UTC (rev 246)
+++ trunk/lib/CPAN/Forum/RM/Notify.pm	2007-07-06 08:00:57 UTC (rev 247)
@@ -61,13 +61,14 @@
 
     # TODO: the admin should be able to configure if she wants to get messages on
     # every new user (field update_on_new_user)
-    my $admin = CPAN::Forum::DB::Users->retrieve(1);
+    my $admin = CPAN::Forum::DB::Users->get_user(1);
     my %mail = (
-        To      => $admin->email,
+        To      => $admin->{email},
         From     => $FROM,
         Subject => "New Forum user: " . $user->username,
         Message => $msg,
     );
+    $self->log->debug(Data::Dumper->Dump([\%mail], ['mail']));
     $self->_my_sendmail(%mail);
 }