Get this more or less in line with code formatting standard.
authorBrion Vibber <brion@users.mediawiki.org>
Wed, 1 Jun 2005 05:59:43 +0000 (05:59 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Wed, 1 Jun 2005 05:59:43 +0000 (05:59 +0000)
Fix some HTML/JS injection bugs. Some aggressive escaping; some message bits should be wikified.
Some database bits fixed up for current db system; others need to be done still.

includes/SpecialValidate.php

index dd8fa13..8e9f297 100644 (file)
  * @subpackage SpecialPage
  */
 class Validation {
-       var $topicList ;
-       var $voteCache ;
-       var $rev2date ;
-       var $date2ref ;
+       var $topicList;
+       var $voteCache;
+       var $rev2date;
+       var $date2ref;
 
        # Reads all revision information of the specified article
-       function prepareRevisions ( $id ) {
-               global $wgDBprefix ;
-               $this->rev2date = array () ;
-               $this->date2rev = array () ;
-               $sql = "SELECT * FROM {$wgDBprefix}revision WHERE rev_page='{$id}'" ;
+       function prepareRevisions( $id ) {
+               global $wgDBprefix;
+               $this->rev2date = array();
+               $this->date2rev = array();
+               $sql = "SELECT * FROM {$wgDBprefix}revision WHERE rev_page='{$id}'";
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
-                       $this->rev2date[$x->rev_id] = $x ;
-                       $this->date2rev[$x->rev_timestamp] = $x ;
-               }
+                       $this->rev2date[$x->rev_id] = $x;
+                       $this->date2rev[$x->rev_timestamp] = $x;
                }
+       }
 
        # Returns a HTML link to the specified article revision
-       function getVersionLink( &$article , $revision , $text = "" ) {
-               $t = $article->getTitle() ;
-               if ( $text == "" ) $text = wfMsg("val_view_version");
-               $ret = "<a href=\"" . $t->getLocalURL ( "oldid={$revision}" ) . "\">" . $text . "</a>" ;
-               return $ret ;
+       function getVersionLink( &$article, $revision, $text = "" ) {
+               $t = $article->getTitle();
+               if( $text == "" ) $text = wfMsg("val_view_version");
+               $ret = "<a href=\"" . $t->getLocalURL( "oldid={$revision}" ) . "\">" . $text . "</a>";
+               return $ret;
        }
 
        # Returns an array containing all topics you can vote on
-       function getTopicList () {
-               global $wgDBprefix ;
-               $ret = array () ;
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=0" ;
+       function getTopicList() {
+               global $wgDBprefix;
+               $ret = array();
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=0";
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
-                       $ret[$x->val_type] = $x ;
+                       $ret[$x->val_type] = $x;
                }
-               ksort ( $ret ) ;
-               return $ret ;
+               ksort( $ret );
+               return $ret;
        }
        
        # Merges one dataset into another
-       function mergeInto ( &$source , &$dest ) {
-               $ret = false ;
-               foreach ( $source AS $x => $y ) {
-                       $doit = false ;
-                       if ( !isset ( $dest[$x] ) ) $doit = true ;
-                       else if ( $dest[$x]->value == 0 ) $doit = true ;
-                       if ( $doit ) {
-                               $dest[$x] = $y ;
-                               $ret = true ;
+       function mergeInto( &$source, &$dest ) {
+               $ret = false;
+               foreach( $source as $x => $y ) {
+                       $doit = false;
+                       if( !isset( $dest[$x] ) ) {
+                               $doit = true;
+                       } elseif( $dest[$x]->value == 0 ) {
+                               $doit = true;
                        }
+                       if( $doit ) {
+                               $dest[$x] = $y;
+                               $ret = true;
+                       }
+               }
+               if( $ret ) {
+                       ksort ( $dest );
                }
-               if ( $ret ) ksort ( $dest ) ;
-               return $ret ;
+               return $ret;
        }
 
        # Merges all votes prior to the given revision into it
-       function mergeOldRevisions ( &$article , $revision ) {
-               $tmp = $this->voteCache ;
-               krsort ( $tmp ) ;
-               $update = false ;
-               $ts = $this->getTimestamp($revision) ;
-               $data = $this->voteCache[$ts] ;
-               foreach ( $tmp AS $x => $y ) {
-                       if ( $x < $ts ) {
-                               if ( $this->mergeInto ( $y , $data ) ) $update = true ;
+       function mergeOldRevisions( &$article, $revision ) {
+               $tmp = $this->voteCache;
+               krsort( $tmp );
+               $update = false;
+               $ts = $this->getTimestamp( $revision );
+               $data = $this->voteCache[$ts];
+               foreach( $tmp as $x => $y ) {
+                       if( $x < $ts ) {
+                               if( $this->mergeInto( $y, $data ) ) {
+                                       $update = true;
+                               }
                        }
                }
-               if ( $update ) $this->setRevision ( $article , $revision , $data ) ;
+               if( $update ) {
+                       $this->setRevision( $article, $revision, $data );
+               }
        }
        
        # Clears all votes prior to the given revision
-       function clearOldRevisions ( &$article , $revision ) {
-               $tmp = $this->voteCache ;
-               $ts = $this->getTimestamp($revision);
-               foreach ( $tmp AS $x => $y ) {
-                       if ( $x < $ts ) $this->deleteRevision ( $article , $this->getRevisionNumber($x) ) ;
+       function clearOldRevisions( &$article, $revision ) {
+               $tmp = $this->voteCache;
+               $ts = $this->getTimestamp( $revision );
+               foreach( $tmp as $x => $y ) {
+                       if( $x < $ts ) {
+                               $this->deleteRevision ( $article, $this->getRevisionNumber( $x ) );
+                       }
                }
        }
        
        # Updates the votes for the given revision from the FORM data
-       function updateRevision ( &$article , $revision ) {
-               global $wgUser, $wgRequest ;
+       function updateRevision( &$article, $revision ) {
+               global $wgUser, $wgRequest;
                
-               if ( isset ( $this->voteCache[$this->getTimestamp($revision)] ) ) $data = $this->voteCache[$this->getTimestamp($revision)] ;
-               else $data = array () ;
-               $nv = $wgRequest->getArray ( "re_v_{$revision}" , array() ) ;
-               $nc = $wgRequest->getArray ( "re_c_{$revision}" , array() ) ;
+               if( isset( $this->voteCache[$this->getTimestamp( $revision )] ) ) {
+                       $data = $this->voteCache[$this->getTimestamp( $revision )];
+               } else {
+                       $data = array();
+               }
+               $nv = $wgRequest->getArray( "re_v_{$revision}", array() );
+               $nc = $wgRequest->getArray( "re_c_{$revision}", array() );
                
-               foreach ( $nv AS $x => $y ) {
-                       $data[$x]->value = $y ;
-                       $data[$x]->comment = $nc[$x] ;
+               foreach( $nv as $x => $y ) {
+                       $data[$x]->value = $y;
+                       $data[$x]->comment = $nc[$x];
                }
-               krsort ( $data ) ;
+               krsort( $data );
                
-               $this->setRevision ( $article , $revision , $data ) ;
+               $this->setRevision( $article, $revision, $data );
        }
        
        # Sets a specific revision to both cache and database
-       function setRevision ( &$article , $revision , &$data ) {
-               global $wgUser , $wgDBprefix ;
-               $this->deleteRevision ( $article , $revision ) ;
-               $this->voteCache[$this->getTimestamp($revision)] = $data ;
-               foreach ( $data AS $x => $y ) {
-                       if ( $y->value > 0 ) {
-                               $sql = "INSERT INTO {$wgDBprefix}validate (val_user,val_page,val_revision,val_type,val_value,val_comment,val_ip) VALUES ('" ;
-                               $sql .= $wgUser->getID() . "','" ;
-                               $sql .= $article->getID() . "','" ;
-                               $sql .= $revision . "','" ;
-                               $sql .= $x . "','" ;
-                               $sql .= $y->value . "','" ;
-                               $sql .= Database::strencode ( $y->comment ) . "','" ;
-                               if ( $wgUser->isAnon() ) $sql .= $wgUser->getName() ;
-                               $sql .= "')" ;
-                               $res = wfQuery( $sql, DB_WRITE );
+       function setRevision( &$article, $revision, &$data ) {
+               global $wgUser;
+               $this->deleteRevision( $article, $revision );
+               $this->voteCache[$this->getTimestamp( $revision )] = $data;
+               foreach( $data as $x => $y ) {
+                       if( $y->value > 0 ) {
+                               $ip = $wgUser->isAnon() ? $wgUser->getName() : '';
+                               $dbw =& wfGetDB( DB_MASTER );
+                               $dbw->insert( 'validate',
+                                       array(
+                                               'val_user'     => $wgUser->getId(),
+                                               'val_page'     => $article->getId(),
+                                               'val_revision' => $revision,
+                                               'val_type'     => $x,
+                                               'val_value'    => $y->value,
+                                               'val_comment'  => $y->comment,
+                                               'val_ip'       => $ip ),
+                                       'Validation::setRevision' );
                        }
                }
        }
        
        # This function returns a MySQL statement to identify the current user
-       function identifyMe ( $user = "" ) {
-               global $wgUser ;
-               if ( $user == "" ) $user = $wgUser->GetID() ;
-               if ( User::isIP ( $user ) ) {
-                       return "(val_user='0' AND val_ip='{$user}')" ;
+       function identifyMe( $user = "" ) {
+               global $wgUser;
+               if( $user == "" ) $user = $wgUser->GetID();
+               if( User::isIP( $user ) ) {
+                       return "(val_user='0' AND val_ip='{$user}')";
                } else {
-                       return "(val_user='{$user}')" ;
-               }
+                       return "(val_user='{$user}')";
                }
+       }
        
        # Deletes a specific vote set in both cache and database
-       function deleteRevision ( &$article , $revision ) {
-               global $wgUser , $wgDBprefix ;
-               $ts = $this->getTimestamp ( $revision ) ;
-               if ( !isset ( $this->voteCache[$ts] ) ) return ; # Nothing to do
-               $sql = "DELETE FROM {$wgDBprefix}validate WHERE" . $this->identifyMe() . " AND " ;
-               $sql .= " val_page='" . $article->getID() . "' AND val_revision='{$revision}'" ;
+       function deleteRevision( &$article, $revision ) {
+               global $wgUser, $wgDBprefix;
+               $ts = $this->getTimestamp( $revision );
+               if( !isset ( $this->voteCache[$ts] ) ) {
+                       return; # Nothing to do
+               }
+               $sql = "DELETE FROM {$wgDBprefix}validate WHERE" . $this->identifyMe() . " AND ";
+               $sql .= " val_page='" . $article->getID() . "' AND val_revision='{$revision}'";
                $res = wfQuery( $sql, DB_WRITE );
-               unset ( $this->voteCache[$ts] ) ;
+               unset( $this->voteCache[$ts] );
        }
        
        # Reads the entire vote list for this user for the given article
-       function getVoteList ( $id , $user = "" ) {
-               global $wgUser , $wgDBprefix ;
-               if ( $user == "" ) $user = $wgUser->GetID() ;
-               $r = array () ; # Revisions
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=" . $id . " AND " . $this->identifyMe($user) ;
+       function getVoteList( $id, $user = "" ) {
+               global $wgUser, $wgDBprefix;
+               if( $user == "" ) {
+                       $user = $wgUser->GetID();
+               }
+               $r = array() ; # Revisions
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=" . $id . " AND " . $this->identifyMe( $user );
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
-                       #$y = $x->val_revision ;
-                       $y = $this->rev2date[$x->val_revision] ;
-                       $y = $y->rev_timestamp ;
-                       if ( !isset($r[$y]) ) $r[$y] = array () ;
-                       $r[$y][$x->val_type]->value = $x->val_value ;
-                       $r[$y][$x->val_type]->comment = $x->val_comment ;
+                       #$y = $x->val_revision;
+                       $y = $this->rev2date[$x->val_revision];
+                       $y = $y->rev_timestamp;
+                       if( !isset( $r[$y] ) ) {
+                               $r[$y] = array();
+                       }
+                       $r[$y][$x->val_type]->value = $x->val_value;
+                       $r[$y][$x->val_type]->comment = $x->val_comment;
                }               
-               return $r ;
+               return $r;
        }
        
        # Reads the entire vote list for this user for all articles
-       function getAllVoteLists ( $user ) {
-               global $wgDBprefix ;
-               $r = array () ; # Revisions
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE " . $this->identifyMe ( $user ) ;
+       function getAllVoteLists( $user ) {
+               global $wgDBprefix;
+               $r = array() ; # Revisions
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE " . $this->identifyMe( $user );
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
-                       $a = $x->val_page ;
-                       $y = $x->val_revision ;
-                       if ( !isset ( $r[$a] ) ) $r[$a] = array () ;
-                       if ( !isset($r[$a][$y]) ) $r[$a][$y] = array () ;
-                       $r[$a][$y][$x->val_type] = $x ;
+                       $a = $x->val_page;
+                       $y = $x->val_revision;
+                       if( !isset( $r[$a] ) ) {
+                               $r[$a] = array();
+                       }
+                       if( !isset( $r[$a][$y] ) ) {
+                               $r[$a][$y] = array();
+                       }
+                       $r[$a][$y][$x->val_type] = $x;
                }               
-               return $r ;
+               return $r;
        }
        
        # This functions adds a topic to the database
-       function addTopic ( $topic , $limit ) {
-               global $wgDBprefix ;
-               $a = 1 ;
-               while ( isset ( $this->topicList[$a] ) ) $a++ ;
-               $sql = "INSERT INTO {$wgDBprefix}validate (val_user,val_page,val_revision,val_type,val_value,val_comment,val_ip) VALUES (" ;
-               $sql .= "'0','0','0','{$a}','{$limit}','" ;
-               $sql .= Database::strencode ( $topic ) . "','')" ;
+       function addTopic( $topic, $limit ) {
+               global $wgDBprefix;
+               $a = 1;
+               while( isset( $this->topicList[$a] ) ) {
+                       $a++;
+               }
+               $sql = "INSERT INTO {$wgDBprefix}validate (val_user,val_page,val_revision,val_type,val_value,val_comment,val_ip) VALUES (";
+               $sql .= "'0','0','0','{$a}','{$limit}','";
+               $sql .= Database::strencode( $topic ) . "','')";
                $res = wfQuery( $sql, DB_WRITE );
-               $x->val_user = $x->val_page = $x->val_revision = 0 ;
-               $x->val_type = $a ;
-               $x->val_value = $limit ;
-               $x->val_comment = $topic ;
-               $x->val_ip = "" ;
-               $this->topicList[$a] = $x ;
-               ksort ( $this->topicList ) ;
+               $x->val_user = $x->val_page = $x->val_revision = 0;
+               $x->val_type = $a;
+               $x->val_value = $limit;
+               $x->val_comment = $topic;
+               $x->val_ip = "";
+               $this->topicList[$a] = $x;
+               ksort( $this->topicList );
        }
 
        # This functions adds a topic to the database
-       function deleteTopic ( $id ) {
-               global $wgDBprefix ;
-               $sql = "DELETE FROM {$wgDBprefix}validate WHERE val_type='{$id}'" ;
-               $res = wfQuery( $sql, DB_WRITE );
-               unset ( $this->topicList[$id] ) ;
+       function deleteTopic( $id ) {
+               global $wgDBprefix;
+               $dbw =& wfGetDB( DB_MASTER );
+               $dbw->delete( 'validate',
+                       array( 'val_type' => $id ),
+                       'Validation::deleteTopic' );
+               unset( $this->topicList[$id] );
        }
        
        # This function returns a link text to the page validation statistics
-       function link2statistics ( &$article ) {
+       function link2statistics( &$article ) {
                $nt = $article->getTitle();
-               $url = htmlspecialchars( $nt->getLocalURL( "action=validate&mode=list" ) );
-               return wfMsg ( 'val_rev_stats_link', $nt->getPrefixedText(), $url );
+               $url = $nt->escapeLocalURL( "action=validate&mode=list" );
+               return wfMsg( 'val_rev_stats_link', $nt->getPrefixedText(), $url );
        }
 
        # This function returns a link text to the page validation statistics of a single revision
-       function link2revisionstatistics ( &$article , $revision ) {
+       function link2revisionstatistics( &$article, $revision ) {
                $nt = $article->getTitle();
-               $url = htmlspecialchars( $nt->getLocalURL( "action=validate&mode=details&revision={$revision}" ) );
-               return wfMsg ( 'val_revision_stats_link', $url );
+               $url = $nt->escapeLocalURL( "action=validate&mode=details&revision={$revision}" );
+               return wfMsg( 'val_revision_stats_link', $url );
        }
 
        # This function returns a link text to the user rating statistics page
-       function link2userratings ( $user , $text ) {
-               global $wgUser ;
-               if ( $user == 0 ) $user = $wgUser->GetName() ;
-               $nt = Title::newFromText ( "Special:Validate" ) ;
+       function link2userratings( $user, $text ) {
+               global $wgUser;
+               if( $user == 0 ) {
+                       $user = $wgUser->GetName();
+               }
+               $nt = Title::newFromText( "Special:Validate" );
                $url = htmlspecialchars( $nt->getLocalURL( "mode=userstats&user={$user}" ) );
-               return "<a href=\"{$url}\">{$text}</a>" ;
+               return "<a href=\"{$url}\">{$text}</a>";
        }
 
        # Returns the timestamp of a revision based on the revision number
-       function getTimestamp ( $revision ) {
-               $ts = $this->rev2date[$revision] ;
-               $ts = $ts->rev_timestamp ;
-               return $ts ;
+       function getTimestamp( $revision ) {
+               $ts = $this->rev2date[$revision];
+               $ts = $ts->rev_timestamp;
+               return $ts;
        }
 
        # Returns the revision number of a revision based on the timestamp
-       function getRevisionNumber ( $ts ) {
-               $revision = $this->date2rev[$ts] ;
-               $revision = $revision->rev_id ;
-               return $revision ;
+       function getRevisionNumber( $ts ) {
+               $revision = $this->date2rev[$ts];
+               $revision = $revision->rev_id;
+               return $revision;
        }
 
 
        # HTML generation functions from this point on
        
        # Returns the metadata string for a revision
-       function getMetadata ( $idx ) {
-               $metadata = "" ;
-               $x = $this->rev2date[$idx] ;
-               $metadata .= wfTimestamp ( TS_DB , $x->rev_timestamp ) ;
-               $metadata .= " by " ;
-               if ( $x->rev_user == 0 ) {
-                       $metadata .= $x->rev_user_text ;
+       function getMetadata( $idx ) {
+               $metadata = "";
+               $x = $this->rev2date[$idx];
+               $metadata .= wfTimestamp( TS_DB, $x->rev_timestamp );
+               $metadata .= " by ";
+               if( $x->rev_user == 0 ) {
+                       $metadata .= $x->rev_user_text;
                } else {
-                       $u = new User ;
-                       $u->setId ( $x->rev_user ) ;
-                       $u->setName ( $x->rev_user_text ) ;
-                       $nt = $u->getUserPage() ;
-                       $url = "<a href='" . $nt->getLocalUrl () . "'>" . $nt->getText() . "</a>" ;
-                       $metadata .= $url ;
-               }
-               $metadata .= " : <small>\"" . htmlspecialchars ( $x->rev_comment ) . "\"</small>" ;
-               return $metadata ;
+                       $u = new User;
+                       $u->setId( $x->rev_user );
+                       $u->setName( $x->rev_user_text );
+                       $nt = $u->getUserPage();
+                       $url = "<a href='" . $nt->getLocalUrl() . "'>" . $nt->getText() . "</a>";
+                       $metadata .= $url;
+               }
+               $metadata .= " : <small>\"" . htmlspecialchars( $x->rev_comment ) . "\"</small>";
+               return $metadata;
        }
 
        # Generates a form for a single revision
-       function getRevisionForm ( &$article , $idx , &$data , $focus = false ) {
+       function getRevisionForm( &$article, $idx, &$data, $focus = false ) {
                # Fill data with blank values
-               $ts = $idx ;
-               $revision = $this->getRevisionNumber ( $ts ) ;
-               foreach ( $this->topicList AS $x => $y ) {
-                       if ( !isset ( $data[$x] ) ) {
-                               $data[$x]->value = 0 ;
-                               $data[$x]->comment = "" ;
+               $ts = $idx;
+               $revision = $this->getRevisionNumber( $ts );
+               foreach( $this->topicList as $x => $y ) {
+                       if( !isset( $data[$x] ) ) {
+                               $data[$x]->value = 0;
+                               $data[$x]->comment = "";
                        }
                }
-               ksort ( $data ) ;               
+               ksort( $data ) ;                
        
                # Generate form
-               $ret = "<form method='post'>" ;
-               $ret .= "<table border='1' cellspacing='0' cellpadding='2'" ;
-               if ( $focus ) $ret .= " style='background-color:#00BBFF'" ;
-               $ret .= ">\n" ;
-               $head = "Revision #" . $revision ;
-               $link = " " . $this->getVersionLink ( $article , $revision ) ;
-               $metadata = $this->getMetadata ( $revision ) ;
-               $ret .= "<tr><th align='left' colspan='3'>" . $head . " ({$link}) {$metadata}</th></tr>\n" ;
-               $line = 0 ;
-               foreach ( $data AS $x => $y ) {
-                       $line = 1 - $line ;
-                       $col = $line == 1 ? "#DDDDDD" : "#EEEEEE" ;
-                       $idx = "_{$revision}[{$x}]" ;
-                       $ret .= "<tr bgcolor='{$col}'>\n" ;
-                       $ret .= "<th nowrap>" ;
-                       $ret .= $this->topicList[$x]->val_comment ;
-                       $ret .= "</th>\n" ;
+               $ret = "<form method='post'>";
+               $ret .= "<table border='1' cellspacing='0' cellpadding='2'";
+               if( $focus ) {
+                       $ret .= " style='background-color:#00BBFF'";
+               }
+               $ret .= ">\n";
+               $head = "Revision #" . $revision;
+               $link = " " . $this->getVersionLink( $article, $revision );
+               $metadata = $this->getMetadata( $revision );
+               $ret .= "<tr><th align='left' colspan='3'>" . $head . " ({$link}) {$metadata}</th></tr>\n";
+               $line = 0;
+               foreach( $data as $x => $y ) {
+                       $line = 1 - $line;
+                       $col = $line == 1 ? "#DDDDDD" : "#EEEEEE";
+                       $idx = "_{$revision}[{$x}]";
+                       $ret .= "<tr bgcolor='{$col}'>\n";
+                       $ret .= "<th nowrap>";
+                       $ret .= $this->topicList[$x]->val_comment;
+                       $ret .= "</th>\n";
                        
-                       $tlx = $this->topicList[$x] ;
-                       $vote = "" ;
-                       $max = $tlx->val_value ;
-                       for ( $a = 0 ; $a <= $max ; $a++ ) {
-                               if ( $a == 0 ) $vote .= wfMsg ( "val_noop" ) ;
-                               $vote .= "<input type='radio' name='re_v{$idx}' value='{$a}'" ;
-                               if ( $a == $y->value ) $vote .= " checked" ;
-                               $vote .= "/>" ;
-                               if ( $max == 2 && $a == 1 ) $vote .= wfMsg ( "val_no" ) . " " ;
-                               else if ( $max == 2 && $a == 2 ) $vote .= wfMsg ( "val_yes" ) ;
-                               else if ( $a != 0 ) $vote .= $a . " " ;
-                               if ( $a == 0 ) $vote .= " &nbsp; " ;
+                       $tlx = $this->topicList[$x];
+                       $vote = "";
+                       $max = $tlx->val_value;
+                       for( $a = 0 ; $a <= $max ; $a++ ) {
+                               if( $a == 0 ) {
+                                       $vote .= wfMsg ( "val_noop" );
+                               }
+                               $vote .= "<input type='radio' name='re_v{$idx}' value='{$a}'";
+                               if( $a == $y->value ) {
+                                       $vote .= " checked";
+                               }
+                               $vote .= "/>";
+                               if( $max == 2 && $a == 1 ) {
+                                       $vote .= wfMsg( "val_no" ) . " ";
+                               } elseif( $max == 2 && $a == 2 ) {
+                                       $vote .= wfMsg( "val_yes" );
+                               } elseif( $a != 0 ) {
+                                       $vote .= $a . " ";
+                               }
+                               if ( $a == 0 ) {
+                                       $vote .= " &nbsp; ";
+                               }
                        }                       
-                       $ret .= "<td nowrap valign='center'>{$vote}</td>\n" ;
+                       $ret .= "<td nowrap valign='center'>{$vote}</td>\n";
                        
-                       $ret .= "<td width='100%' align='center'><input size='50' style='width:98%' maxlength='250' type='text' name='re_c{$idx}' value='{$y->comment}'/>" ;
-                       $ret .= "</td></tr>\n" ;
-               }
-               $checked = $focus ? " checked" : "" ;
-               $ret .= "<tr><td colspan='3' valign='center'>\n" ;
-               $ret .= "<input type='checkbox' name='re_merge_{$revision}' value='1'{$checked}/>" . wfMsg( 'val_merge_old' ) . " \n" ;
-               $ret .= "<input type='checkbox' name='re_clear_{$revision}' value='1'{$checked}/>" . wfMsg( 'val_clear_old' ) . " \n" ;
-               $ret .= "<input type='submit' name='re_submit[{$revision}]' value='" . htmlspecialchars( wfMsg("ok") ) . "'/>\n" ;
-               if ( $focus ) $ret .= "<br/>\n<small>" . wfMsg ( "val_form_note" ) . "</small>" ;
-               $ret .= "</td></tr>\n" ;
-               $ret .= "</table>\n</form>\n\n" ;
-               return $ret ;
+                       $ret .= "<td width='100%' align='center'><input size='50' style='width:98%' maxlength='250' type='text' name='re_c{$idx}' value='{$y->comment}'/>";
+                       $ret .= "</td></tr>\n";
+               }
+               $checked = $focus ? " checked='checked'" : "";
+               $ret .= "<tr><td colspan='3' valign='center'>\n";
+               $ret .= "<input type='checkbox' name='re_merge_{$revision}' value='1'{$checked}/>" . htmlspecialchars( wfMsg( 'val_merge_old' ) ) . " \n";
+               $ret .= "<input type='checkbox' name='re_clear_{$revision}' value='1'{$checked}/>" . htmlspecialchars( wfMsg( 'val_clear_old' ) ) . " \n";
+               $ret .= "<input type='submit' name='re_submit[{$revision}]' value='" . htmlspecialchars( wfMsg("ok") ) . "'/>\n";
+               if( $focus ) {
+                       $ret .= "<br/>\n<small>" . htmlspecialchars( wfMsg( "val_form_note" ) ) . "</small>";
+               }
+               $ret .= "</td></tr>\n";
+               $ret .= "</table>\n</form>\n\n";
+               return $ret;
        }
        
 
        # Generates the page from the validation tab
-       function validatePageForm ( &$article , $revision ) {
-               global $wgOut, $wgRequest, $wgUser ;
+       function validatePageForm( &$article, $revision ) {
+               global $wgOut, $wgRequest, $wgUser;
                
-               $ret = "" ;
-               $this->prepareRevisions ( $article->getID() ) ;
-               $this->topicList = $this->getTopicList() ;
-               $this->voteCache = $this->getVoteList ( $article->getID() ) ;
+               $ret = "";
+               $this->prepareRevisions( $article->getID() );
+               $this->topicList = $this->getTopicList();
+               $this->voteCache = $this->getVoteList( $article->getID() );
                
                # Check for POST data
                $re = $wgRequest->getArray( 're_submit' );
-               if ( isset ( $re ) )
-                       {
-                       $id = array_keys ( $re ) ;
+               if( isset( $re ) ) {
+                       $id = array_keys( $re );
                        $id = $id[0] ; # $id is now the revision number the user clicked "OK" for
-                       $clearOldRev = $wgRequest->getVal( "re_clear_{$id}" , 0 );
-                       $mergeOldRev = $wgRequest->getVal( "re_merge_{$id}" , 0 );
-                       $this->updateRevision ( $article , $id ) ;
-                       if ( $mergeOldRev ) $this->mergeOldRevisions ( $article , $id ) ;
-                       if ( $clearOldRev ) $this->clearOldRevisions ( $article , $id ) ;
-                       $ret .= "<p><font color='red'>" . wfMsg ( 'val_revision_changes_ok' ) . "</font></p>" ;
+                       $clearOldRev = $wgRequest->getVal( "re_clear_{$id}", 0 );
+                       $mergeOldRev = $wgRequest->getVal( "re_merge_{$id}", 0 );
+                       $this->updateRevision( $article, $id );
+                       if( $mergeOldRev ) {
+                               $this->mergeOldRevisions( $article, $id );
                        }
+                       if( $clearOldRev ) {
+                               $this->clearOldRevisions( $article, $id );
+                       }
+                       $ret .= "<p><font color='red'>" . htmlspecialchars( wfMsg( 'val_revision_changes_ok' ) ) . "</font></p>";
+               }
                
                # Make sure the requested revision exists
-               $ts = $this->rev2date[$revision]->rev_timestamp ;
-               if ( !isset ( $this->voteCache[$ts] ) ) $this->voteCache[$ts] = array () ;
+               $ts = $this->rev2date[$revision]->rev_timestamp;
+               if( !isset( $this->voteCache[$ts] ) ) {
+                       $this->voteCache[$ts] = array();
+               }
                
                # Sort revisions list, newest first
-               krsort ( $this->voteCache ) ;
+               krsort( $this->voteCache );
                
                # Output
                $title = $article->getTitle();
-               $title = $title->getPrefixedText() ;
-               $wgOut->setPageTitle ( wfMsg ( 'val_rev_for' ) . $title ) ;
-               foreach ( $this->voteCache AS $x => $y )
-                       {
-                       $ret .= $this->getRevisionForm ( $article , $x , $y , $x == $ts ) ;
-                       $ret .= "<br/>\n" ;
-                       }
-               $ret .= $this->link2statistics ( $article ) ;
-               $ret .= "<p>" . $this->link2userratings ( $wgUser->GetID() , wfMsg('val_show_my_ratings') ) . "</p>" ;
+               $title = $title->getPrefixedText();
+               $wgOut->setPageTitle( wfMsg( 'val_rev_for' ) . $title );
+               foreach( $this->voteCache as $x => $y ) {
+                       $ret .= $this->getRevisionForm( $article, $x, $y, $x == $ts );
+                       $ret .= "<br/>\n";
+               }
+               $ret .= $this->link2statistics( $article );
+               $ret .= "<p>" . $this->link2userratings( $wgUser->getID(), wfMsg( 'val_show_my_ratings' ) ) . "</p>";
                return $ret ;   
        }
        
        # This function performs the "management" mode on Special:Validate
-       function manageTopics () {
-               global $wgRequest ;
-               $this->topicList = $this->getTopicList() ;
+       function manageTopics() {
+               global $wgRequest;
+               $this->topicList = $this->getTopicList();
                
-               $iamsure = $wgRequest->getVal ( "iamsure" , "0" ) == 1 ;
+               $iamsure = $wgRequest->getVal( "iamsure", "0" ) == 1;
                
-               if ( $iamsure && $wgRequest->getVal ( "m_add" , "--" ) != "--" ) {
-                       $new_topic = $wgRequest->getVal ( "m_topic" ) ;
-                       $new_limit = $wgRequest->getVal ( "m_limit" ) ;
-                       if ( $new_topic != "" && $new_limit > 1 )
-                               $this->addTopic ( $new_topic , $new_limit ) ;
+               if( $iamsure && $wgRequest->getVal( "m_add", "--" ) != "--" ) {
+                       $new_topic = $wgRequest->getVal( "m_topic" );
+                       $new_limit = $wgRequest->getVal( "m_limit" );
+                       if( $new_topic != "" && $new_limit > 1 ) {
+                               $this->addTopic( $new_topic, $new_limit );
+                       }
                }
 
-               $da = $wgRequest->getArray ( "m_del" ) ;
-               if ( $iamsure && isset ( $da ) && count ( $da ) > 0 ) {
-                       $id = array_keys ( $da ) ;
-                       $id = array_shift ( $id ) ;
-                       $this->deleteTopic ( $id ) ;
+               $da = $wgRequest->getArray( "m_del" );
+               if( $iamsure && isset( $da ) && count( $da ) > 0 ) {
+                       $id = array_keys( $da );
+                       $id = array_shift( $id );
+                       $this->deleteTopic( $id );
                }
                
-               $r = "<p>" . wfMsg ( 'val_warning' ) . "</p>\n" ;
-               $r .= "<form method='post'>\n" ;
-               $r .= "<table border='1' cellspacing='0' cellpadding='2'>\n" ;
-               $r .= "<tr>" . wfMsg ( 'val_list_header' ) . "</tr>\n" ;
-               foreach ( $this->topicList AS $x => $y ) {
-                       $r .= "<tr>\n" ;
-                       $r .= "<th>" . $y->val_type . "</th>\n" ;
-                       $r .= "<td>{$y->val_comment}</td>\n" ;
-                       $r .= "<td>1 .. <b>{$y->val_value}</b></td>\n" ;
-                       $r .= "<td><input type='submit' name='m_del[{$x}]' value='" . wfMsg ( 'val_del' ) . "'/></td>\n" ;
-                       $r .= "</tr>\n" ;
-               }
-               $r .= "<tr>\n" ;
-               $r .= "<td/>\n" ;
-               $r .= "<td><input type='text' name='m_topic' value=''/></td>\n" ;
-               $r .= "<td><input type='text' name='m_limit' value=''/></td>\n" ;
-               $r .= "<td><input type='submit' name='m_add' value='" . wfMsg ( 'val_add' ) . "'/></td>\n" ;
-               $r .= "</tr>\n" ;
-               $r .= "</table>\n" ;
-               $r .= "<input type='checkbox' name='iamsure' value='1'/>" . wfMsg ( 'val_iamsure' ) . "\n" ;
-               $r .= "</form>\n" ;
-               return $r ;
+               # FIXME: Wikitext this
+               $r = "<p>" . htmlspecialchars( wfMsg( 'val_warning' ) ) . "</p>\n";
+               
+               $r .= "<form method='post'>\n";
+               $r .= "<table border='1' cellspacing='0' cellpadding='2'>\n";
+               $r .= "<tr>" . wfMsg( 'val_list_header' ) . "</tr>\n";
+               foreach( $this->topicList as $x => $y ) {
+                       $r .= "<tr>\n";
+                       $r .= "<th>" . htmlspecialchars( $y->val_type ) . "</th>\n";
+                       $r .= "<td>" . htmlspecialchars( $y->val_comment ) . "</td>\n";
+                       $r .= "<td>1 .. <b>" . intval( $y->val_value ) . "</b></td>\n";
+                       $r .= "<td><input type='submit' name='m_del[" . intval( $x ) . "]' value='" . htmlspecialchars( wfMsg( 'val_del' ) ) . "'/></td>\n";
+                       $r .= "</tr>\n";
+               }
+               $r .= "<tr>\n";
+               $r .= "<td/>\n";
+               $r .= "<td><input type='text' name='m_topic' value=''/></td>\n";
+               $r .= "<td><input type='text' name='m_limit' value=''/></td>\n";
+               $r .= "<td><input type='submit' name='m_add' value='" . htmlspecialchars( wfMsg( 'val_add' ) ) . "'/></td>\n";
+               $r .= "</tr>\n";
+               $r .= "</table>\n";
+               $r .= "<input type='checkbox' name='iamsure' value='1'/>" . htmlspecialchars( wfMsg( 'val_iamsure' ) ) . "\n";
+               $r .= "</form>\n";
+               return $r;
        }
        
        # Generates a user ID for both logged-in users and anons; $x is an object from an SQL query
-       function make_user_id ( &$x ) {
-               if ( $x->val_user == 0 ) return $x->val_ip ;
-               else return $x->val_user ;
+       function make_user_id( &$x ) {
+               if( $x->val_user == 0 ) {
+                       return $x->val_ip;
+               } else {
+                       return $x->val_user;
                }
+       }
 
-       function showDetails ( &$article , $revision ) {
-               global $wgDBprefix , $wgOut, $wgUser ;
-               $this->prepareRevisions ( $article->getID() ) ;
-               $this->topicList = $this->getTopicList() ;
+       function showDetails( &$article, $revision ) {
+               global $wgDBprefix, $wgOut, $wgUser;
+               $this->prepareRevisions( $article->getID() );
+               $this->topicList = $this->getTopicList();
 
-               $title = $article->getTitle() ;
-               $wgOut->setPageTitle ( str_replace ( '$1' , $title->getPrefixedText() , wfMsg ( 'val_validation_of' ) ) ) ;
+               $title = $article->getTitle();
+               $wgOut->setPageTitle( str_replace( '$1', $title->getPrefixedText(), wfMsg( 'val_validation_of' ) ) );
                
                # Collecting statistic data
-               $id = $article->getID() ;
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page='{$id}' AND val_revision='{$revision}'" ;
+               $id = $article->getID();
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page='{$id}' AND val_revision='{$revision}'";
                $res = wfQuery( $sql, DB_READ );
-               $data = array () ;
-               $users = array () ;
-               $topics = array () ;
+               $data = array();
+               $users = array();
+               $topics = array();
                while( $x = wfFetchObject( $res ) ) {
-                       $data[$this->make_user_id($x)][$x->val_type] = $x ;
-                       $users[$this->make_user_id($x)] = true ;
-                       $topics[$x->val_type] = true ;
+                       $data[$this->make_user_id($x)][$x->val_type] = $x;
+                       $users[$this->make_user_id($x)] = true;
+                       $topics[$x->val_type] = true;
                }
                
                # Sorting lists of topics and users
-               ksort ( $users ) ;
-               ksort ( $topics ) ;
+               ksort( $users );
+               ksort( $topics );
                
-               $ts = $this->getTimestamp ( $revision ) ;
-               $url = $this->getVersionLink ( $article , $revision , wfTimestamp ( TS_DB , $ts ) ) ;
+               $ts = $this->getTimestamp( $revision );
+               $url = $this->getVersionLink( $article, $revision, wfTimestamp( TS_DB, $ts ) );
 
                # Table headers
                $ret = "" ;                     
-               $ret .= "<p><b>" . str_replace ( '$1' , $url , wfMsg ( 'val_revision_of' ) ) . "</b></p>\n" ;
-               $ret .= "<table border='1' cellspacing='0' cellpadding='2'>\n" ;
-               $ret .= "<tr><th/>" ;
+               $ret .= "<p><b>" . str_replace( '$1', $url, wfMsg( 'val_revision_of' ) ) . "</b></p>\n";
+               $ret .= "<table border='1' cellspacing='0' cellpadding='2'>\n";
+               $ret .= "<tr><th/>";
                
-               foreach ( $topics AS $t => $dummy ) {
-                       $ret .= "<th>" . $this->topicList[$t]->val_comment . "</th>" ;
-                       }
-               $ret .= "</tr>\n" ;
+               foreach( $topics as $t => $dummy ) {
+                       $ret .= "<th>" . htmlspecialchars( $this->topicList[$t]->val_comment ) . "</th>";
+               }
+               $ret .= "</tr>\n";
 
                # Table data
-               foreach ( $users AS $u => $dummy ) { # Every row a user
-                       $ret .= "<tr>" ;
-                       $ret .= "<th align='left'>" ;
-                       if ( !User::IsIP ( $u ) ) { # Logged-in user rating
-                               $ret .= $this->link2userratings ( $u , User::whoIs ( $u ) ) ;
+               foreach( $users as $u => $dummy ) { # Every row a user
+                       $ret .= "<tr>";
+                       $ret .= "<th align='left'>";
+                       if( !User::IsIP( $u ) ) { # Logged-in user rating
+                               $ret .= $this->link2userratings( $u, User::whoIs( $u ) );
                        } else { # Anon rating
-                               $ret .= $this->link2userratings ( $u , $u ) ;
+                               $ret .= $this->link2userratings( $u, $u );
                        }
-                       $ret .= "</th>" ;
-                       foreach ( $topics AS $t => $dummy ) { # Every column a topic
-                               if ( !isset ( $data[$u][$t] ) ) $ret .= "<td/>" ;
-                               else {
-                                       $ret .= "<td valign='center'>" ;
-                                       $ret .= $data[$u][$t]->val_value ;
-                                       if ( $data[$u][$t]->val_comment != "" )
-                                               $ret .= " <small>(" . $data[$u][$t]->val_comment . ")</small>" ;
-                                       $ret .= "</td>" ;
+                       $ret .= "</th>";
+                       foreach( $topics as $t => $dummy ) { # Every column a topic
+                               if( !isset( $data[$u][$t] ) ) {
+                                       $ret .= "<td/>";
+                               } else {
+                                       $ret .= "<td valign='center'>";
+                                       $ret .= $data[$u][$t]->val_value;
+                                       if( $data[$u][$t]->val_comment != "" ) {
+                                               $ret .= " <small>(" . htmlspecialchars( $data[$u][$t]->val_comment ) . ")</small>";
+                                       }
+                                       $ret .= "</td>";
                                }
                        }
-                       $ret .= "</tr>" ;
-                       }
-               $ret .= "</table>" ;
-               $ret .= "<p>" . $this->link2statistics ( $article ) . "</p>" ;
-               $ret .= "<p>" . $this->link2userratings ( $wgUser->GetID() , wfMsg('val_show_my_ratings') ) . "</p>" ;
-               
-               return $ret ;
+                       $ret .= "</tr>";
                }
+               $ret .= "</table>";
+               $ret .= "<p>" . $this->link2statistics( $article ) . "</p>";
+               $ret .= "<p>" . $this->link2userratings( $wgUser->GetID(), wfMsg( 'val_show_my_ratings' ) ) . "</p>";
+               
+               return $ret;
+       }
        
-       function showList ( &$article ) {
-               global $wgDBprefix , $wgOut, $wgUser;
-               $this->prepareRevisions ( $article->getID() ) ;
-               $this->topicList = $this->getTopicList() ;
+       function showList( &$article ) {
+               global $wgDBprefix, $wgOut, $wgUser;
+               $this->prepareRevisions( $article->getID() );
+               $this->topicList = $this->getTopicList();
 
-               $title = $article->getTitle() ;
-               $wgOut->setPageTitle ( str_replace ( '$1' , $title->getPrefixedText() , wfMsg ( 'val_validation_of' ) ) ) ;
+               $title = $article->getTitle();
+               $wgOut->setPageTitle( str_replace( '$1', $title->getPrefixedText(), wfMsg( 'val_validation_of' ) ) );
                
                # Collecting statistic data
-               $id = $article->getID() ;
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page='{$id}'" ;
+               $id = $article->getID();
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page='{$id}'";
                $res = wfQuery( $sql, DB_READ );
-               $data = array () ;
+               $data = array();
                while( $x = wfFetchObject( $res ) ) {
-                       $idx = $this->getTimestamp ( $x->val_revision ) ;
-                       if ( !isset ( $data[$idx] ) )
-                               $data[$idx] = array () ;
-                       if ( !isset ( $data[$idx][$x->val_type] ) ) {
-                               $data[$idx][$x->val_type]->count = 0 ;
-                               $data[$idx][$x->val_type]->sum = 0 ;
+                       $idx = $this->getTimestamp( $x->val_revision );
+                       if( !isset( $data[$idx] ) ) {
+                               $data[$idx] = array();
                        }
-                       $data[$idx][$x->val_type]->count++ ;
-                       $data[$idx][$x->val_type]->sum += $x->val_value ;
+                       if( !isset( $data[$idx][$x->val_type] ) ) {
+                               $data[$idx][$x->val_type]->count = 0;
+                               $data[$idx][$x->val_type]->sum = 0;
+                       }
+                       $data[$idx][$x->val_type]->count++;
+                       $data[$idx][$x->val_type]->sum += $x->val_value;
                }
                
-               krsort ( $data ) ;
+               krsort( $data );
                
-               $ret = "" ;
-               $ret .= "<table border='1' cellspacing='0' cellpadding='2'>\n" ;
-               $ret .= "<tr><th>" . wfMsg("val_revision") . "</th>" ;
-               foreach ( $this->topicList AS $x => $y )
-                       $ret .= "<th>{$y->val_comment}</th>" ;
-               $ret .= "</tr>\n" ;
-               foreach ( $data AS $ts => $y ) {
-                       $revision = $this->getRevisionNumber ( $ts ) ;
-                       $url = $this->getVersionLink ( $article , $revision , wfTimestamp ( TS_DB , $ts ) ) ;
-                       $detailsurl = $this->link2revisionstatistics ( $article , $revision ) ;
-                       $ret .= "<tr><td>{$url} {$detailsurl}</td>" ;
-                       foreach ( $this->topicList AS $topicID => $dummy ) {
-                               if ( isset ( $y[$topicID] ) ) {
-                                       $z = $y[$topicID] ;
-                                       if ( $z->count == 0 ) $a = 0 ;
-                                       else $a = $z->sum / $z->count ;
-                                       $ret .= sprintf ( "<td><b>%1.1f</b> (%d)</td>" , $a , $z->count ) ;
-                               } else $ret .= "<td/>" ;
+               $ret = "";
+               $ret .= "<table border='1' cellspacing='0' cellpadding='2'>\n";
+               $ret .= "<tr><th>" . htmlspecialchars( wfMsg( "val_revision" ) ) . "</th>";
+               foreach( $this->topicList as $x => $y ) {
+                       $ret .= "<th>" . htmlspecialchars( $y->val_comment ) . "</th>";
+               }
+               $ret .= "</tr>\n";
+               foreach( $data as $ts => $y ) {
+                       $revision = $this->getRevisionNumber( $ts );
+                       $url = $this->getVersionLink( $article, $revision, wfTimestamp( TS_DB, $ts ) );
+                       $detailsurl = $this->link2revisionstatistics( $article, $revision );
+                       $ret .= "<tr><td>{$url} {$detailsurl}</td>";
+                       foreach( $this->topicList as $topicID => $dummy ) {
+                               if( isset( $y[$topicID] ) ) {
+                                       $z = $y[$topicID];
+                                       if( $z->count == 0 ) {
+                                               $a = 0;
+                                       } else {
+                                               $a = $z->sum / $z->count;
+                                       }
+                                       $ret .= sprintf( "<td><b>%1.1f</b> (%d)</td>", $a, $z->count );
+                               } else {
+                                       $ret .= "<td></td>";
                                }
-                       $ret .= "</tr>\n" ;
+                       }
+                       $ret .= "</tr>\n";
                }
-               $ret .= "</table>\n" ;
-               $ret .= "<p>" . $this->link2userratings ( $wgUser->GetID() , wfMsg('val_show_my_ratings') ) . "</p>" ;
-               return $ret ;
+               $ret .= "</table>\n";
+               $ret .= "<p>" . $this->link2userratings( $wgUser->getID(), wfMsg( 'val_show_my_ratings' ) ) . "</p>";
+               return $ret;
        }
        
-       function getRatingText ( $value , $max ) {
-               if ( $max == 2 && $value == 1 ) $ret = wfMsg ( "val_no" ) . " " ;
-               else if ( $max == 2 && $value == 2 ) $ret = wfMsg ( "val_yes" ) ;
-               else if ( $value != 0 ) $ret = wfMsg ( "val_of" , $value , $max ) . " " ;
-               else $ret = "" ;
-               return $ret ;
+       function getRatingText( $value, $max ) {
+               if( $max == 2 && $value == 1 ) {
+                       $ret = wfMsg ( "val_no" ) . " ";
+               } elseif( $max == 2 && $value == 2 ) {
+                       $ret = wfMsg( "val_yes" );
+               } elseif( $value != 0 ) {
+                       $ret = wfMsg( "val_of", $value, $max ) . " ";
+               } else {
+                       $ret = "";
+               }
+               return $ret;
        }
 
-       function showUserStats ( $user ) {
-               global $wgDBprefix , $wgOut, $wgUser ;
-               $this->topicList = $this->getTopicList() ;
-               $data = $this->getAllVoteLists ( $user ) ;
+       function showUserStats( $user ) {
+               global $wgDBprefix, $wgOut, $wgUser;
+               $this->topicList = $this->getTopicList();
+               $data = $this->getAllVoteLists( $user );
                
-               if ( $user == $wgUser->getID() ) $wgOut->setPageTitle ( wfMsg ( 'val_my_stats_title' ) ) ;
-               elseif ( ! User::IsIP ( $user ) ) $wgOut->setPageTitle ( wfMsg ( 'val_user_stats_title' , User::whoIs ( $user ) ) ) ;
-               else $wgOut->setPageTitle ( wfMsg ( 'val_user_stats_title' , $user ) ) ;
+               if( $user == $wgUser->getID() ) {
+                       $wgOut->setPageTitle ( wfMsg ( 'val_my_stats_title' ) );
+               } elseif( !User::IsIP( $user ) ) {
+                       $wgOut->setPageTitle( wfMsg( 'val_user_stats_title', User::whoIs( $user ) ) );
+               } else {
+                       $wgOut->setPageTitle( wfMsg( 'val_user_stats_title', $user ) );
+               }
                
-               $ret = "" ;
-               $ret .= "<table border='1' cellspacing='0' cellpadding='2'>\n" ;
+               $ret = "<table border='1' cellspacing='0' cellpadding='2'>\n";
                
-               foreach ( $data AS $articleid => $revisions ) {
-                       $title = Title::newFromID ( $articleid ) ;
-                       $ret .= "<tr><th align='left' colspan='4'><a href=\"" . $title->getLocalURL() . "\">" . $title->getPrefixedText() . "</a></th></tr>" ;
-                       krsort ( $revisions ) ;
-                       foreach ( $revisions AS $revid => $revision ) {
-                               $url = $title->getLocalURL ( "oldid={$revid}" ) ;
-                               $ret .= "<tr><th align='left'><a href=\"{$url}\">" . wfMsg ( 'val_revision_number' , $revid ) . "</a></th>" ;
-                               ksort ( $revision ) ;
-                               $initial = true ;
-                               foreach ( $revision AS $topic => $rating ) {
-                                       if ( !$initial ) $ret .= "<tr><td/>" ;
-                                       $initial = false ;
-                                       $ret .= "<td>" . $this->topicList[$topic]->val_comment . "</td>" ;
-                                       $ret .= "<td>" . $this->getRatingText ( $rating->val_value , $this->topicList[$topic]->val_value ) . "</td>" ;
-                                       $ret .= "<td>" . htmlentities ( $rating->val_comment ) . "</td>" ;
-                                       $ret .= "</tr>" ;
+               foreach( $data as $articleid => $revisions ) {
+                       $title = Title::newFromID( $articleid );
+                       $ret .= "<tr><th align='left' colspan='4'><a href=\"" . $title->escapeLocalURL() . "\">" . $title->getEscapedText() . "</a></th></tr>";
+                       krsort( $revisions );
+                       foreach( $revisions as $revid => $revision ) {
+                               $url = $title->getLocalURL( "oldid={$revid}" );
+                               $ret .= "<tr><th align='left'><a href=\"{$url}\">" . wfMsg( 'val_revision_number', $revid ) . "</a></th>";
+                               ksort( $revision );
+                               $initial = true;
+                               foreach( $revision as $topic => $rating ) {
+                                       if( !$initial ) {
+                                               $ret .= "<tr><td/>";
+                                       }
+                                       $initial = false;
+                                       $ret .= "<td>" . htmlspecialchars( $this->topicList[$topic]->val_comment ) . "</td>";
+                                       $ret .= "<td>" . $this->getRatingText( $rating->val_value, $this->topicList[$topic]->val_value ) . "</td>";
+                                       $ret .= "<td>" . htmlspecialchars( $rating->val_comment ) . "</td>";
+                                       $ret .= "</tr>";
                                }
                        }
-                       $ret .= "</tr>" ;
+                       $ret .= "</tr>";
                }
-               $ret .= "</table>" ;
+               $ret .= "</table>";
                
-               return $ret ;
-               }
+               return $ret;
+       }
 
 }
 
@@ -627,32 +702,32 @@ function wfSpecialValidate( $page = '' ) {
 
 /*
        # Can do?
-       if ( ! $wgUser->isAllowed('change_validation') ) {
+       if( ! $wgUser->isAllowed('change_validation') ) {
                $wgOut->sysopRequired();
                return;
        }
 */     
 
-       $mode = $wgRequest->getVal ( "mode" ) ;
-       $skin = $wgUser->getSkin() ;
+       $mode = $wgRequest->getVal( "mode" );
+       $skin = $wgUser->getSkin();
 
        
-       if ( $mode == "manage" ) {
-               $v = new Validation ;
-               $html = $v->manageTopics () ;
-       } else if ( $mode == "userstats" ) {
-               $v = new Validation ;
-               $user = $wgRequest->getVal ( "user" ) ;
-               $html = $v->showUserStats ( $user ) ;
+       if( $mode == "manage" ) {
+               $v = new Validation();
+               $html = $v->manageTopics();
+       } elseif( $mode == "userstats" ) {
+               $v = new Validation();
+               $user = $wgRequest->getVal( "user" );
+               $html = $v->showUserStats( $user );
        } else {
-               $html = "$mode" ;
-               $html .= "<ul>\n" ;
+               $html = "$mode";
+               $html .= "<ul>\n";
 
-               $t = Title::newFromText ( "Special:Validate" ) ;
-               $url = $t->getLocalURL ( "mode=manage" ) ;
-               $html .= "<li><a href=\"" . $url . "\">Manage</a></li>\n" ;
+               $t = Title::newFromText( "Special:Validate" );
+               $url = $t->escapeLocalURL( "mode=manage" );
+               $html .= "<li><a href=\"" . $url . "\">Manage</a></li>\n";
 
-               $html .= "</ul>\n" ;
+               $html .= "</ul>\n";
        }
 
        $wgOut->addHTML( $html );