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

[svn at pti.co.il]

Author: gabor
Date: 2007-07-19 08:50:20 +0300 (Thu, 19 Jul 2007)
New Revision: 252

Modified:
   trunk/
   trunk/lib/CPAN/Forum.pm
   trunk/lib/CPAN/Forum/DB/Users.pm
   trunk/lib/CPAN/Forum/RM/Notify.pm
   trunk/www/cgi/index.pl
Log:
user registration is now using plain DBI calls



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

Modified: trunk/lib/CPAN/Forum/DB/Users.pm
===================================================================
--- trunk/lib/CPAN/Forum/DB/Users.pm	2007-07-19 05:50:02 UTC (rev 251)
+++ trunk/lib/CPAN/Forum/DB/Users.pm	2007-07-19 05:50:20 UTC (rev 252)
@@ -16,7 +16,19 @@
     $_[0]->{username} = lc $_[0]->{username};
     });
 
+sub add_user {
+    my ($self, $args) = @_;
+ 
+    my $dbh = CPAN::Forum::DBI::db_Main();
+    $dbh->do("INSERT INTO users (username, email, password) VALUES (?, ?, ?)",
+              undef,
+              lc($args->{username}), lc($args->{email}), _generate_pw(7));
 
+    my $sql = "SELECT id, username, password, email FROM users WHERE username=?";
+    return $self->_fetch_single_hashref($sql, lc $args->{username});
+}
+
+
 sub _generate_pw {
     my ($n) = @_;
     my @c = ('a'..'z', 'A'..'Z', 1..9);

Modified: trunk/lib/CPAN/Forum/RM/Notify.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Notify.pm	2007-07-19 05:50:02 UTC (rev 251)
+++ trunk/lib/CPAN/Forum/RM/Notify.pm	2007-07-19 05:50:20 UTC (rev 252)
@@ -57,7 +57,7 @@
 
     my $FROM = $self->config("from");
 
-    my $msg = "\nUsername: " . $user->username . "\n"; 
+    my $msg = "\nUsername: " . $user->{username} . "\n"; 
 
     # TODO: the admin should be able to configure if she wants to get messages on
     # every new user (field update_on_new_user)
@@ -65,7 +65,7 @@
     my %mail = (
         To      => $admin->{email},
         From     => $FROM,
-        Subject => "New Forum user: " . $user->username,
+        Subject => "New Forum user: " . $user->{username},
         Message => $msg,
     );
     $self->log->debug(Data::Dumper->Dump([\%mail], ['mail']));

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2007-07-19 05:50:02 UTC (rev 251)
+++ trunk/lib/CPAN/Forum.pm	2007-07-19 05:50:20 UTC (rev 252)
@@ -849,7 +849,7 @@
     }
    
     my $user = eval {
-        CPAN::Forum::DB::Users->create({
+        CPAN::Forum::DB::Users->add_user({
                 username => $q->param('nickname'),
                 email    => $q->param('email'),
             });
@@ -867,7 +867,7 @@
     my ($self, $user) = @_;
 
     # TODO: put this text in a template
-    my $password = $user->password;
+    my $password = $user->{password};
     my $subject = "CPAN::Forum registration";
     my $message = <<MSG;
 
@@ -883,7 +883,7 @@
     $self->log->debug("FROM field set to be $FROM");
 
     my %mail = (
-        To       => $user->email,
+        To       => $user->{email},
         From     => $FROM,
         Subject  => $subject,
         Message  => $message,

Modified: trunk/www/cgi/index.pl
===================================================================
--- trunk/www/cgi/index.pl	2007-07-19 05:50:02 UTC (rev 251)
+++ trunk/www/cgi/index.pl	2007-07-19 05:50:20 UTC (rev 252)
@@ -5,7 +5,8 @@
 $| = 1;
 
 # Enable for DBI debugging
-BEGIN { $ENV{DBI_TRACE}='1=/tmp/dbitrace.log'; }
+#BEGIN { $ENV{DBI_TRACE}='1=/tmp/dbitrace.log'; }
+#chmod 0666, '/tmp/dbitrace.log';
 
 use FindBin qw($Bin);
 my $ROOT;