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

[svn at pti.co.il]

Author: gabor
Date: 2007-07-22 07:03:49 +0300 (Sun, 22 Jul 2007)
New Revision: 298

Modified:
   trunk/
   trunk/lib/CPAN/Forum/DB/Users.pm
   trunk/lib/CPAN/Forum/RM/Admin.pm
   trunk/lib/CPAN/Forum/RM/Subscriptions.pm
   trunk/lib/CPAN/Forum/RM/Users.pm
   trunk/templates/admin_edit_user.tmpl
Log:
mypan is now generated using plain SQL
fullname is returned from the info_by query of DB::Users



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4305
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4306
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-22 04:03:27 UTC (rev 297)
+++ trunk/lib/CPAN/Forum/DB/Users.pm	2007-07-22 04:03:49 UTC (rev 298)
@@ -37,7 +37,7 @@
     Carp::croak("Invalid field '$field'") if none {$field eq $_} @FIELDS;
     Carp::croak("No value supplied") if not $value;
 
-    my $sql = "SELECT id, email, fname, lname, username
+    my $sql = "SELECT id, email, fname, lname, username, fname || ' ' || lname fullname
                 FROM users
                 WHERE $field=?";
     return $self->_fetch_single_hashref($sql, $value);

Modified: trunk/lib/CPAN/Forum/RM/Admin.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Admin.pm	2007-07-22 04:03:27 UTC (rev 297)
+++ trunk/lib/CPAN/Forum/RM/Admin.pm	2007-07-22 04:03:49 UTC (rev 298)
@@ -83,7 +83,7 @@
         return $self->internal_error("", "restricted_area");
     }
 
-    my $data = CPAN::Forum::DB::Configure->get_all_pairs;
+    my $data = CPAN::Forum::DB::Configure->get_all_pairs; # SQL
     $self->log->debug(Data::Dumper->Dump([$data], ['config']));
 
     my $t = $self->load_tmpl("admin.tmpl");

Modified: trunk/lib/CPAN/Forum/RM/Subscriptions.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Subscriptions.pm	2007-07-22 04:03:27 UTC (rev 297)
+++ trunk/lib/CPAN/Forum/RM/Subscriptions.pm	2007-07-22 04:03:49 UTC (rev 298)
@@ -34,17 +34,14 @@
         loop_context_vars => 1,
     );
     my $username = $self->session->param("username");
-    my ($user) = CPAN::Forum::DB::Users->search(username => $username);
+    my $user = CPAN::Forum::DB::Users->info_by(username => $username);
 
     if (not $user) {
         return $self->internal_error(
             "Trouble accessing personal information of: '$username'",
             );
     }
-    my $fullname = "";
-    $fullname .= $user->fname if $user->fname;
-    $fullname .= " " if $fullname;
-    $fullname .= $user->lname if $user->lname;
+    my $fullname = $user->{fullname};
 
     $t->param(fullname => $fullname);
     $t->param(title    => "Information about $username");
@@ -61,7 +58,7 @@
             return $self->internal_error("Accessing");
         }
         $gids = $grp->id;
-        my ($s) = CPAN::Forum::DB::Subscriptions->search(uid => $user->id, gid => $grp->id);
+        my ($s) = CPAN::Forum::DB::Subscriptions->search(uid => $user->{id}, gid => $grp->id);
         if ($s) {
             push @subscriptions, {
                 gid       => $grp->id,
@@ -81,7 +78,7 @@
             };
         }
     } else { # show all subscriptions
-        my ($s) = CPAN::Forum::DB::Subscriptions_all->search(uid => $user->id);
+        my ($s) = CPAN::Forum::DB::Subscriptions_all->search(uid => $user->{id});
         $self->log->debug("all subscriptions " . ($s ? "found" : "not found"));
         push @subscriptions, {
             gid       => "_all",
@@ -92,7 +89,7 @@
         };
         $gids = "_all";
 
-        my $it = CPAN::Forum::DB::Subscriptions_pauseid->search(uid => $user->id);
+        my $it = CPAN::Forum::DB::Subscriptions_pauseid->search(uid => $user->{id});
         while (my $s = $it->next) {
             $gids .= ($gids ? ",_" : "_") . $s->pauseid->id; 
             push @subscriptions, {
@@ -104,7 +101,7 @@
             };
         }
 
-        $it = CPAN::Forum::DB::Subscriptions->search(uid => $user->id);
+        $it = CPAN::Forum::DB::Subscriptions->search(uid => $user->{id});
         while (my $s = $it->next) {
             $gids .= ($gids ? "," : "") . $s->gid->id; 
             push @subscriptions, {

Modified: trunk/lib/CPAN/Forum/RM/Users.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Users.pm	2007-07-22 04:03:27 UTC (rev 297)
+++ trunk/lib/CPAN/Forum/RM/Users.pm	2007-07-22 04:03:49 UTC (rev 298)
@@ -34,10 +34,7 @@
     }
 
 
-    my $fullname = "";
-    $fullname .= $user->{fname} if $user->{fname};
-    $fullname .= " " if $fullname;
-    $fullname .= $user->{lname} if $user->{lname};
+    my $fullname = $user->{fullname};
     #$fullname = $username if not $fullname;
 
     $t->param(this_username => $username);

Modified: trunk/templates/admin_edit_user.tmpl
===================================================================
--- trunk/templates/admin_edit_user.tmpl	2007-07-22 04:03:27 UTC (rev 297)
+++ trunk/templates/admin_edit_user.tmpl	2007-07-22 04:03:49 UTC (rev 298)
@@ -21,7 +21,7 @@
 <p>
 <input type="hidden" name="rm" value="admin_edit_user_process" />
 <input type="hidden" name="uid" value="<TMPL_VAR uid>" />
-E-mail: <input name="email" value="<TMPL_VAR email>" /><br />
+E-mail: <input name="email" value="<TMPL_VAR email>" size="40" /><br />
 <input type="submit" value="Update user" />
 </p>
 </form>