Converted forum to catalyst.

[ndwebbie.git] / NDWeb / Pages / Users.pm

diff --git a/NDWeb/Pages/Users.pm b/NDWeb/Pages/Users.pm
index 8f6fa490b66b957e398d198dabb4d647baa49403..b06289ebb062f8deab43db0bd6ec2cb6981aa248 100644 (file)
--- a/NDWeb/Pages/Users.pm
+++ b/NDWeb/Pages/Users.pm
@@ -17,16 +17,16 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::Users;
+package NDWeb::Pages::Users;
 use strict;
 use warnings;
 use ND::Include;
 use CGI qw/:standard/;
-use ND::Web::Include;
+use NDWeb::Include;
 
-use base qw/ND::Web::XMLPage/;
+use base qw/NDWeb::XMLPage/;
 
-$ND::Web::Page::PAGES{users} = __PACKAGE__;
+$NDWeb::Page::PAGES{users} = __PACKAGE__;
 
 sub render_body {
        my $self = shift;
@@ -40,7 +40,7 @@ sub render_body {
        my $user;
        if (defined param('user') && param('user') =~ /^(\d+)$/){
                my $query = $DBH->prepare(q{
-                       SELECT uid,username,hostmask,CASE WHEN u.planet IS NULL THEN '' ELSE coords(x,y,z) END AS planet,attack_points,defense_points,scan_points,humor_points,info 
+                       SELECT uid,username,hostmask,CASE WHEN u.planet IS NULL THEN '' ELSE coords(x,y,z) END AS planet,attack_points,defense_points,scan_points,humor_points,info, email, sms
                        FROM users u LEFT OUTER JOIN current_planet_stats p ON u.planet = p.id
                        WHERE uid = ?;
                        }) or $error .= "<p> Something went wrong: </p>";
@@ -51,7 +51,7 @@ sub render_body {
        if ($user && defined param('cmd') && param('cmd') eq 'change'){
                $DBH->begin_work;
                for my $param (param()){
-                       if ($param =~ /^c:(planet|\w+_points|hostmask|info|username)$/){
+                       if ($param =~ /^c:(planet|\w+_points|hostmask|info|username|email|sms)$/){
                                my $column = $1;
                                my $value = param($column);
                                if ($column eq 'planet'){
@@ -106,7 +106,9 @@ sub render_body {
                $BODY->param(Defense_points => $user->{defense_points});
                $BODY->param(Scan_points => $user->{scan_points});
                $BODY->param(humor_points => $user->{humor_points});
-               $BODY->param(info => escapeHTML $user->{info});
+               $BODY->param(info => $user->{info});
+               $BODY->param(Email => $user->{email});
+               $BODY->param(SMS => $user->{sms});
 
                my $groups = $DBH->prepare(q{SELECT g.gid,g.groupname,uid FROM groups g LEFT OUTER JOIN (SELECT gid,uid FROM groupmembers WHERE uid = ?) AS gm ON g.gid = gm.gid});
                $groups->execute($user->{uid});
@@ -131,10 +133,7 @@ sub render_body {
                        ORDER BY lower(username)})or $error .= $DBH->errstr;
                $query->execute or $error .= $DBH->errstr;
                my @users;
-               my $i = 0;
                while (my $user = $query->fetchrow_hashref){
-                       $i++;
-                       $user->{ODD} = $i % 2;
                        push @users, $user;
                }
                $BODY->param(Users => \@users);