Changeset 13

Timestamp:

02/18/07 23:37:11 (3 years ago)

Author:

eevee

Message:

Moved contact icons to their own subfolder.
Did some code cleanup, a little refactoring, and a few minor fixes.

Location:

veekun

Files:

• README.pod (modified) (2 diffs)
• lib/Vee.pm (modified) (4 diffs)
• lib/Vee/Controller/Dex.pm (modified) (1 diff)
• lib/Vee/Controller/Users.pm (modified) (5 diffs)
• lib/Vee/View/TT.pm (modified) (1 diff)
• root/images/icons/contact (added)
• root/images/icons/contact/aim.png (moved) (moved from veekun/root/images/icons/aim.png)
• root/images/icons/contact/email.png (moved) (moved from veekun/root/images/icons/email.png)
• root/images/icons/contact/homepage.png (moved) (moved from veekun/root/images/icons/homepage.png)
• root/images/icons/contact/icq.png (moved) (moved from veekun/root/images/icons/icq.png)
• root/images/icons/contact/lj.png (moved) (moved from veekun/root/images/icons/lj.png)
• root/images/icons/contact/msn.png (moved) (moved from veekun/root/images/icons/msn.png)
• root/images/icons/contact/yim.png (moved) (moved from veekun/root/images/icons/yim.png)
• site_options.yml (modified) (2 diffs)
• templates/forum/common.tt (modified) (1 diff)
• templates/users/edit.tt (modified) (1 diff)
• templates/users/info.tt (modified) (1 diff)

veekun/README.pod

@@ -25 +25 @@
     Catalyst::Plugin::Session::Store::DBIC
     DBIx::Class
+    Email::Valid
+    Image::Size
+    JSON
+    String::Approx
     Template
-    String::Approx
-    JSON
     YAML
 
@@ -33 +35 @@
 development.
 
-    Catalyst::Helper
+    Catalyst::Devel
 
 =head2 Database Setup

veekun/lib/Vee.pm

@@ -7 +7 @@
 
 # load crap
-#    Authorization::Roles?
+# first group are DEBUG-ONLY!
 use Catalyst qw/
     -Debug
     StackTrace
-
     Static::Simple 
     
@@ -33 +32 @@
 our $VERSION = '0.01';
 
+=head1 NAME
+
+Vee - Code for veekun.com
+
+=head1 SYNOPSIS
+
+    script/vee_server.pl
+
+=head1 DESCRIPTION
+
+Codebase for veekun.com; includes a forum, Pokedex, gallery, and other such
+generic website things.
+
+=cut
+
 # have to get site config before setup so controller init can play with options
 my $siteopt_source = 'site_options.yml';
@@ -41 +55 @@
 __PACKAGE__->model('DBIC')->storage->dbh->disconnect;
 
-# override cookie handling to allow for session cookies
-# this is so beautiful  :D  I love perl
-#{
-#    no strict 'refs';
-#    no warnings 'redefine';
-#    my $old_sub = \&Catalyst::Plugin::Session::State::Cookie::finalize_cookies;
-#    *Catalyst::Plugin::Session::State::Cookie::finalize_cookies = sub {
-#        my $c = $_[0];
-#        local $c->config->{session}{cookie_expires} = 0
-#            if $c->session->{session_cookie};
-#    
-#        &$old_sub( @_ );
-#    };
-#}
+=head1 METHODS
 
-# shortcut to get website options (rather than app options)
-# what can I say, I'm lazy
+=head2 site_opts
+
+Extremely lazy method for getting site options.  Seriously, seriously lazy.
+
+=cut
+
 sub site_opts {
     return shift->config->{site};
 }
 
-# shortcut for generating URIs
+=head2 uri
+
+Shortcut for generating URIs.
+
+    $c->uri( $controller, $action, @arguments )
+
+=cut
+
 sub uri {
     my ($self, $con, $sub, @args) = @_;
@@ -158 +170 @@
 }
 
-=head1 NAME
-
-Vee - Code for veekun.com
-
-=head1 SYNOPSIS
-
-    script/vee_server.pl
-
-=head1 DESCRIPTION
-
-Codebase for veekun.com; includes a forum, Pokedex, gallery, and other such
-generic website things.
-
 =head1 SEE ALSO
 

veekun/lib/Vee/Controller/Dex.pm

@@ -184 +184 @@
         $c->vee_stop('No match for ', $entry, ' was found.  You may wish to try the <a href="' . $c->uri('Dex', 'pokemon_list') . '">Pok&eacute;mon list</a>, <a href="' . $c->uri('Dex', 'move_list') . '">move list</a>, or <a href="' . $c->uri('Dex', 'type_list') . '">type list</a> to find what you are looking for.');
     } elsif (@results == 1) {
-        $c->flash->{info_msg} = 'You entered ', $entry, ", but there is no page with that name.  This page is the only close match.";
+        $c->flash->{info_msg} = 'You entered ' . $c->vee_cleanse($entry) . ", but there is no page with that name.  This page is the only close match.";
         my $category = $results[0]{type};
         $category .= 's' unless $category eq 'pokemon';

veekun/lib/Vee/Controller/Users.pm

@@ -5 +5 @@
 use base 'Catalyst::Controller';
 
+use Vee::BBCode;
+use Vee::Utils;
 use Digest::SHA1 qw/sha1_hex/;
 use Image::Size;
 use Email::Valid;
+
+our @ContactTypes = (
+    { name => 'AIM', url => '', },
+    { name => 'ICQ', url => '', },
+    { name => 'MSN', url => '', },
+    { name => 'YIM', url => '', },
+    { name => 'LJ', url => 'http://%s.livejournal.com/', },
+    { name => 'Homepage', url => '%s', },
+    { name => 'email', url => 'mailto:%s', },
+);
 
 =head1 NAME
@@ -36 +48 @@
     remember => { type => 'checkbox', default => 1 },
 };
-
-sub pad { sprintf "%0$_[1]d", $_[0] }
 
 sub register : Local {
@@ -206 +216 @@
     
     # TODO: these are probably completely unnecessary
-    
     $s->{postrank     } = sub { Vee::Utils::postrank(shift, $c->site_opts->{post_ranks}) };
-    $s->{postwidth    } = \&Vee::Utils::post_width;
     $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) };
     
@@ -235 +243 @@
     # TODO: these are probably completely unnecessary
     $s->{postrank} = sub { Vee::Utils::postrank(shift, $c->site_opts->{post_ranks}) };
-    $s->{postwidth} = \&Vee::Utils::post_width;
     $s->{postbar_color} = sub { Vee::Utils::hsv2rgb(shift, 192, 192) };
 
@@ -254 +261 @@
 
 sub edit : Local : Args(0) {
-   my ($self, $c) = @_;
-   my $s = $c->stash;
-   my %changes;
-   my (@errors, @success);
-
-   if (!$c->user) { $c->vee_abort('You must be logged in to edit user info.'); }   
+    my ($self, $c) = @_;
+    my $s = $c->stash;
+    my %changes;
+    my (@errors, @success);
+
+    if (not $c->user) { $c->vee_abort('You must be logged in to edit user info.'); }   
+
+    $s->{page_title} = 'Edit Options for ' . $c->user->name;
+    $s->{link_name } = 'user/edit';
+    $s->{crumbs    } = [ '<a href="' . $c->uri('User') . 'list">Users</a>', 'Edit ' . $c->user->name ];
+
+    $s->{userinfo} = $c->user->obj;
+    $s->{template} = 'users/edit.tt';
+
+    return unless %{ $c->req->params };
+
+    # Check to see what has been changed, and what hasn't (this block IGNORES avatars, it assumes it has been changed)
+    for my $k (keys %{ $c->req->params }) {
+        unless (Vee::Utils::in($k => qw/submit avatardel avatarurl avatarfile/)) {
+            $changes{$k} = $c->req->params->{$k} unless $c->req->params->{$k} eq $c->user->obj->$k;
+        }
+        if ($k eq 'avatarfile' or $k eq 'avatarurl') { $changes{avatar} = $c->req->params->{$k}; }
+    }
    
-   # Check to see what has been changed, and what hasn't (this block IGNORES avatars, it assumes it has been changed)
-   for my $k (keys %{ $c->req->params }) {
-       my $obj = $c->user->obj-$k;
-       unless (($k eq "submit") or ($k eq "avatardel") or ($k eq "avatarurl") or ($k eq "avatarfile")) {
-               $changes{$k} = $c->req->params->{$k} unless (lc $c->req->params->{$k} eq lc $c->user->obj->$k);
-       }
-       if (($k eq "avatarfile") or ($k eq "avatarurl")) { $changes{avatar} = $c->req->params->{$k}; }
-   }
-   
-   if ($c->req->params->{submit}) {
-       # Setup various variables?
-       my $query = $c->req->params;
-       my $padid = pad($c->user->obj->id, 11);
-       my $user_limits = $c->site_opts->{user_limits};
-       my $avmaxbytes = $user_limits->{avatarbytes};
-       my $avmaxpixels = $user_limits->{avatarpixels};
-       my $contacts = $user_limits->{contacts};
-
-       # Working with avatars; to me, this seems oddly.. disorganized and messy. If anyone wants to recode it, please, be my guest.
-       if ($query->{avatardel}) {
-           # Compared to the rest, this is simple; delete the avatar?
-           unlink "root/images/avatars/" . $c->user->obj->avatar;
-           $changes{avatar} = '';
-           push @success, "Deleted your avatar.";
-       } elsif (exists $query->{avatarfile} or exists $query->{avatarurl}) {
-            my $av;
-            # Check which method the user is trying to use for avatar: uploaded file, or URL?
-            if (exists $query->{avatarfile}) {
-                # This is for file (obviously); very straight forward, simply uploads the file.
-                $av = $c->request->upload('avatarfile');
-                # Gets the height/width/filetype of the file
-                my ($width, $height, $type) = imgsize($av->tempname);
-                if ( my $upload = $av ) {
-                    if ($avmaxbytes * 1024 < $upload->size) { push @errors, 'Filesize for avatar is bigger than ' . $avmaxbytes . ' kibibytes.'; delete $changes{avatar}; }
-                    if ($width > $avmaxpixels or $height > $avmaxpixels) { push @errors, 'The height and/or width of your avatar is too large.'; delete $changes{avatar}; }
-                    if (lc $type ne ('png' or 'gif' or 'jpg' or 'jpeg')) { push @errors, 'Avatar is using an invalid filetype (.' . lc $type . ').'; delete $changes{avatar}; }
-                    my $target   = "root/images/avatars/$padid";
-                
-                    if ($changes{avatar}) {
-                        unless ($upload->link_to($target) || $upload->copy_to($target) ) { $c->vee_abort("Failed to copy '" . $padid . "' to '" . $target . "': " . $!); }
-                        push @success, "Updated your avatar from file $query->{avatarfile}";
-                        $changes{avatar} = $padid;
-                    }
-                }
-            } elsif (exists $query->{avatarurl}) {
-                # Check to see if the filesize of the remote avatar follows the restrictions of the max avatar size. I dunno how to explain it, really; I'm sure you who is reading this can understand?
-                my $ua = new LWP::UserAgent;
-                $ua->agent( $c->site_opts->{title} );
-                my $req = new HTTP::Request 'HEAD' => $query->{avatarurl};
-                $req->header('Accept' => 'text/html');
-                my $header = $ua->request($req);
-                unless ($header->is_success) { $c->vee_abort('Remote file not found; maybe you mistyped the URL?') }
-                $header = $header->headers;
-                $req = HTTP::Request->new(GET => $query->{avatarurl});
-                $av = $ua->request($req)->content;
-                # Do error checking
-                my ($width, $height, $type) = imgsize(\$av);
-                if ($width > $avmaxpixels or $height > $avmaxpixels) { push @errors, 'The height and/or width of your avatar is too large.'; delete $changes{avatar}; }
-                if (lc $type ne ('png' or 'gif' or 'jpg' or 'jpeg')) { push @errors, 'Avatar is using an invalid filetype (.' . lc $type . ').'; delete $changes{avatar}; }
-                if ($avmaxbytes * 1024 < $header->content_length) { push @errors, 'Filesize for avatar is bigger than ' . $avmaxbytes . ' kibibytes.'; delete $changes{avatar}; }
-                # Okay, we're good; copy the file to $padid (which is the user's id)!                
-                if ($changes{avatar}) { open AVATAR, ">root/images/avatars/" . $padid; binmode AVATAR; print AVATAR $av; close AVATAR; $changes{avatar} = $padid; }
+    # Setup various variables?
+    my $query = $c->req->params;
+    my $padid = Vee::Utils::pad($c->user->obj->id, 11);
+    my $user_limits = $c->site_opts->{user_limits};
+    my $avmaxbytes = $user_limits->{avatarbytes};
+    my $avmaxpixels = $user_limits->{avatarpixels};
+    my $contacts = $user_limits->{contacts};
+
+    # Working with avatars; to me, this seems oddly.. disorganized and messy. If anyone wants to recode it, please, be my guest.
+    if ($query->{avatardel}) {
+        # Compared to the rest, this is simple; delete the avatar?
+        unlink $c->path_to('root/images/avatars', $c->user->obj->avatar);
+        $changes{avatar} = '';
+        push @success, "Deleted your avatar.";
+
+    } elsif (exists $query->{avatarfile} or exists $query->{avatarurl}) {
+        my $av;
+
+        # Check which method the user is trying to use for avatar: uploaded file, or URL?
+        if (exists $query->{avatarfile}) {
+            # This is for file (obviously); very straight forward, simply uploads the file.
+            $av = $c->request->upload('avatarfile');
+
+            # Gets the height/width/filetype of the file
+            my ($width, $height, $type) = imgsize($av->tempname);
+            if ($avmaxbytes * 1024 < $av->size) { push @errors, 'Filesize for avatar is bigger than maximum of ' . $avmaxbytes . ' kibibytes.'; delete $changes{avatar}; }
+            if (not Vee::Utils::in(lc $type => qw/png gif jpg jpeg/)) { push @errors, 'Avatar is using an invalid filetype (' . lc $type . ').'; delete $changes{avatar}; }
+            if ($width > $avmaxpixels or $height > $avmaxpixels) { push @errors, 'The height and/or width of your avatar is too large.'; delete $changes{avatar}; }
+
+            my $target = "root/images/avatars/$padid";
+            if ($changes{avatar}) {
+                unless ($av->link_to($target) || $av->copy_to($target) ) { $c->vee_abort("Failed to copy '" . $padid . "' to '" . $target . "': " . $!); }
+                push @success, "Updated your avatar from file $query->{avatarfile}";
+                $changes{avatar} = $padid;
             }
-        }
-        # Working with text data (sigs, title, etc)
-        # Title
-        if ((!exists $c->req->params->{customtitle}) and ($c->user->obj->customtitle)) { push @success, 'Deleted your custom title.'; $changes{customtitle} = ''; }
-        if ($changes{customtitle}) {
-            if (length $query->{customtitle} >= $user_limits->{customtitle}) { push @errors, 'Custom title is too long; please make a shorter one (max is ' . $user_limits->{customtitle} . ' characters)'; delete $changes{customtitle}; }
-            if ($changes{customtitle}) { push @success, 'Updated your custom title to "' . $changes{customtitle} . '".'; }
-        }
-        # Various contacts (AIM, MSN, ICQ, etc)
-        for my $k (split(' ', $contacts)) {
-            my $join = "contact_" . lc $k;
-            if ((!exists $c->req->params->{$join}) and ($c->user->obj->$join)) { push @success, 'Deleted your ' . $k . ' contact information.'; $changes{$join} = ''; }
-            if ($changes{$join}) {
-                # Validate email (and MSN!) to RFC822
-                if ((lc $k eq 'email') or (lc $k eq 'msn')) { if (($changes{$join}) and (!Email::Valid->address($query->{$join}))) { push @errors, 'The ' . $k . ' address ' . $changes{$join} . ' is invalid.'; delete $changes{$join}; } }
-                if (exists $changes{$join} and ($k ne 'homepage')) { push @success, 'Updated your ' . $k . ' contact information to ' . $changes{$join} . '.'; }
-                elsif (exists $changes{$join} and ($k eq 'homepage')) { push @success, 'Updated your homepage to: ' . $changes{contact_homepage}; }
-                }
-        }
-        # Signature
-        if ((!exists $c->req->params->{signature}) and ($c->user->obj->signature)) { push @success, 'Deleted your signature.'; $changes{signature} = ''; }
-        if ($changes{signature}) {
-            ($changes{signature}, my @bbcode_errors) = Vee::BBCode::validate_bbcode( $changes{signature} );
-            if (@bbcode_errors) { push @errors, 'Your signature contains invalid bbcode; please go back and fix it.'; delete $changes{signature}; }
-            if (exists $changes{signature}) { push @success, 'Updated your signature.'; }
-        }
-        
-        if (@success) { $s->{success_msg} = join('<br />', @success); }
-        if (@errors) { $s->{error_msg} = (join('<br/>', @errors)); }
-        $c->user->obj->update(\%changes);
-   }
-   $s->{userinfo} = $c->user->obj;
-   $s->{template} = 'users/edit.tt';
+
+        } elsif (exists $query->{avatarurl}) {
+            # Check to see if the filesize of the remote avatar follows the restrictions of the max avatar size. I dunno how to explain it, really; I'm sure you who is reading this can understand?
+            my $ua = new LWP::UserAgent;
+            $ua->agent( $c->site_opts->{title} );
+            $ua->env_proxy;
+            $ua->protocols_allowed([ 'http', 'https' ]);
+            $ua->timeout(10);  # this is pretty low, but we don't want to keep the user waiting for too long
+
+            my $req = new HTTP::Request('HEAD' => $query->{avatarurl});
+            $req->header('Accept' => 'text/html');
+
+            my $response = $ua->request($req);
+            unless ($response->is_success) { $c->vee_abort('Remote file not found; maybe the server is down or you mistyped the URL?') }
+            my $header = $response->headers;
+            $req = HTTP::Request->new(GET => $query->{avatarurl});
+            $av = $ua->request($req)->content;
+
+            # Do error checking
+            my ($width, $height, $type) = imgsize(\$av);
+            if ($width > $avmaxpixels or $height > $avmaxpixels) { push @errors, 'The height and/or width of your avatar is too large.'; delete $changes{avatar}; }
+            if (not Vee::Utils::in(lc $type => qw/png gif jpg jpeg/)) { push @errors, 'Avatar is using an invalid filetype (.' . lc $type . ').'; delete $changes{avatar}; }
+            if ($avmaxbytes * 1024 < $header->content_length) { push @errors, 'Filesize for avatar is bigger than ' . $avmaxbytes . ' kibibytes.'; delete $changes{avatar}; }
+
+            # Okay, we're good; copy the file to $padid (which is the user's id)!                
+            if ($changes{avatar}) { open AVATAR, '>' . $c->path_to('root/images/avatars', $padid); binmode AVATAR; print AVATAR $av; close AVATAR; $changes{avatar} = $padid; }
+        }
+    }   
+
+    # Working with text data (sigs, title, etc)
+    # Title
+    if ($changes{customtitle}) {
+        if (length $query->{customtitle} >= $user_limits->{customtitle}) {
+            push @errors, 'Custom title is longer than the maximum of ' . $user_limits->{customtitle} . ' characters.';
+            delete $changes{customtitle};
+        }
+        if ($changes{customtitle}) { push @success, 'Updated your custom title to "' . $changes{customtitle} . '".'; }
+    } elsif (exists $changes{customtitle} and $c->user->customtitle) {
+        push @success, 'Deleted your custom title.';
+    }
+
+    # Various contacts (AIM, MSN, ICQ, etc)
+    for my $contact_row (@ContactTypes) {
+        my $k = $contact_row->{name};
+        my $join = "contact_" . lc $k;
+        next unless exists $changes{$join};
+        if (not $c->req->params->{$join} and $c->user->obj->$join) {
+            push @success, 'Deleted your ' . $k . ' contact information.';
+            $changes{$join} = '';
+            next;
+        }
+        if ($changes{$join}) {
+            # Validate email (and MSN!) to RFC822
+            if ((lc $k eq 'email' or lc $k eq 'msn') and not Email::Valid->address($changes{$join})) {
+                push @errors, 'The ' . $k . ' address ' . $changes{$join} . ' is invalid.';
+                delete $changes{$join};
+                next;
+            }
+            if ($k eq 'homepage') {
+                push @success, 'Updated your homepage to: ' . $changes{contact_homepage};
+            } else {
+                push @success, 'Updated your ' . $k . ' contact information to ' . $changes{$join} . '.';
+            }
+        }
+    }
+    
+    # Signature
+    if ($changes{signature}) {
+        ($changes{signature}, my @bbcode_errors) = Vee::BBCode::validate_bbcode( $changes{signature} );
+        if (@bbcode_errors) {
+            push @errors, 'Your signature contains invalid bbcode; please go back and fix it.';
+            delete $changes{signature};
+            next;
+        }
+        push @success, 'Updated your signature.';
+    } elsif (exists $changes{signature} and $c->user->signature) {
+        push @success, 'Deleted your signature.';
+    }
+    
+    $s->{success_msg} = \@success if @success;
+    $s->{error_msg} = \@errors if @errors;
+    $c->user->obj->update(\%changes);
 }
    

veekun/lib/Vee/View/TT.pm

@@ -29 +29 @@
         # forum stuff...
         post_width => \&Vee::Utils::post_width,
+        postrank => sub { Vee::Utils::postrank(shift, Vee->site_opts->{post_ranks}) },
+        postbar_color => sub { Vee::Utils::hsv2rgb(shift, 192, 192) },
 
             # forum stuff...

veekun/site_options.yml

@@ -66 +66 @@
     avatarpixels: 100
     customtitle: 30
-    contacts: AIM ICQ MSN YIM LJ Homepage email
     
 # Number of seconds before a user is considered inactive
@@ -72 +71 @@
 
 # Number of posts => rank you get
-postranks:
+post_ranks:
     0: Uninterested
     12: Lurker

veekun/templates/forum/common.tt

@@ -33 +33 @@
 [%             IF shorthand == 'email' OR shorthand == 'msn'; value = value | email_text; END %]
 [%             DEFAULT value = 'none' %]
-[%             IF url %]<a href="[% url.replace('%s', value) -%]">[% END %]<img src="/images/icons/[% shorthand %].png" alt="[% name %]: [% value %]" title="[% name %]: [% value %]"[% IF value == 'none' %] class="disabled"[% END %]/>[% IF url %]</a>[% END %]
+[%             IF url %]<a href="[% url.replace('%s', value) -%]">[% END %]<img src="/images/contact/icons/[% shorthand %].png" alt="[% name %]: [% value %]" title="[% name %]: [% value %]"[% IF value == 'none' %] class="disabled"[% END %]/>[% IF url %]</a>[% END %]
 [%         END %]
  <img src="/images/icons/pm/[% user.pmicon %].png" alt="Send private message" title="Send private message" class="disabled"/>

veekun/templates/users/edit.tt

@@ -5 +5 @@
 <form action='/users/edit' method='post' enctype="multipart/form-data">
  <h3>Contact</h3>
- <p> <label><img src="/images/icons/aim.png" alt="AIM"/> <input type='text' size='32' name='contact_aim' value='[% userinfo.contact_aim %]'/> AOL Instant Messenger </p></label>
- <p> <label><img src="/images/icons/icq.png" alt="ICQ"/> <input type='text' size='32' name='contact_icq' value='[% userinfo.contact_icq %]'/> ICQ </p></label>
- <p> <label><img src="/images/icons/msn.png" alt="MSN"/> <input type='text' size='32' name='contact_msn' value='[% userinfo.contact_msn %]'/> MSN Messenger </p></label>
- <p> <label><img src="/images/icons/yim.png" alt="YIM"/> <input type='text' size='32' name='contact_yim' value='[% userinfo.contact_yim %]'/> Yahoo! Instant Messenger </p></label>
- <p> <label><img src="/images/icons/lj.png" alt="LJ"/> <input type='text' size='32' name='contact_lj' value='[% userinfo.contact_lj %]'/> LiveJournal username </p></label>
- <p> <label><img src="/images/icons/homepage.png" alt=""/> <input type='text' size='32' name='contact_homepage' value='[% userinfo.contact_homepage %]'/> Website </p></label>
- <p> <label><img src="/images/icons/email.png" alt=""/> <input type='text' size='32' name='contact_email' value='[% userinfo.contact_email %]'/> Email address </p></label>
+ <p> <label><img src="/images/icons/contact/aim.png" alt="AIM"/> <input type='text' size='32' name='contact_aim' value='[% userinfo.contact_aim %]'/> AOL Instant Messenger </p></label>
+ <p> <label><img src="/images/icons/contact/icq.png" alt="ICQ"/> <input type='text' size='32' name='contact_icq' value='[% userinfo.contact_icq %]'/> ICQ </p></label>
+ <p> <label><img src="/images/icons/contact/msn.png" alt="MSN"/> <input type='text' size='32' name='contact_msn' value='[% userinfo.contact_msn %]'/> MSN Messenger </p></label>
+ <p> <label><img src="/images/icons/contact/yim.png" alt="YIM"/> <input type='text' size='32' name='contact_yim' value='[% userinfo.contact_yim %]'/> Yahoo! Instant Messenger </p></label>
+ <p> <label><img src="/images/icons/contact/lj.png" alt="LJ"/> <input type='text' size='32' name='contact_lj' value='[% userinfo.contact_lj %]'/> LiveJournal username </p></label>
+ <p> <label><img src="/images/icons/contact/homepage.png" alt=""/> <input type='text' size='32' name='contact_homepage' value='[% userinfo.contact_homepage %]'/> Website </p></label>
+ <p> <label><img src="/images/icons/contact/email.png" alt=""/> <input type='text' size='32' name='contact_email' value='[% userinfo.contact_email %]'/> Email address </p></label>
  <h3>Title</h3>
  <p> <label><input type='text' size='36' name='customtitle' value='[% userinfo.customtitle %]'/> Custom title</label> </p>

veekun/templates/users/info.tt

@@ -24 +24 @@
 [%     IF shorthand == 'email' OR shorthand == 'msn'; value = value | email_text; END %]
 [%     DEFAULT value = 'none' %]
-<p> [% IF url %]<a href="[% url.replace('%s', value) %]">[% END %]<img src="/images/icons/[% shorthand %].png" alt="[% name %]: [% value %]" title="[% name %]: [% value %]"[% IF value == 'none' %] class="disabled"[% END %]/> [% name %]: [%+ value %] [%+ IF url %]</a> </p>[% END %]
+<p> [% IF url %]<a href="[% url.replace('%s', value) %]">[% END %]<img src="/images/contact/icons/[% shorthand %].png" alt="[% name %]: [% value %]" title="[% name %]: [% value %]"[% IF value == 'none' %] class="disabled"[% END %]/> [% name %]: [%+ value %] [%+ IF url %]</a> </p>[% END %]
 [% END %]
 <p> <img src="/images/icons/pm/[% user.pmicon %].png" alt="Send private message" title="Send private message" class="disabled"/> Private messages: not yet </p>