Validation feature update; someone please update the DB updater!

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3726dd7..1a90c38 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -530,6 +530,7 @@ $wgDisableLangConversion = false;
 
 # Use article validation feature; turned off by default
 $wgUseValidation = false;
+$wgValidationForAnons = true ;
 
 # Whether to use zhdaemon to perform Chinese text processing
 # zhdaemon is under developement, so normally you don't want to

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index a205ce6..19c45d9 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -518,7 +518,7 @@ class SkinTemplate extends Skin {
         * @access private
         */
        function buildContentActionUrls () {
-               global $wgContLang, $wgUseValidation, $wgDBprefix;
+               global $wgContLang, $wgUseValidation, $wgDBprefix, $wgValidationForAnons;
                $fname = 'SkinTemplate::buildContentActionUrls';
                wfProfileIn( $fname );
                
@@ -641,7 +641,9 @@ class SkinTemplate extends Skin {
                                                'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
                                        );
                                }
+                       }
 
+                       if( $wgUser->isLoggedIn() || $wgValidationForAnons ) { # and $action != 'submit' ) {
                                # Validate tab. TODO: add validation to logged-in user rights 
                                if($wgUseValidation && ( $action == "" || $action=='view' ) ){ # && $wgUser->isAllowed('validate')){
                                        if ( $oldid ) $oid = IntVal( $oldid ) ; # Use the oldid

diff --git a/includes/SpecialValidate.php b/includes/SpecialValidate.php
index 540d3fa..dd8fa13 100644 (file)
--- a/includes/SpecialValidate.php
+++ b/includes/SpecialValidate.php
@@ -59,7 +59,7 @@ class Validation {
        function getTopicList () {
                global $wgDBprefix ;
                $ret = array () ;
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_user=0" ;
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=0" ;
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
                        $ret[$x->val_type] = $x ;
@@ -133,34 +133,48 @@ class Validation {
                $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) VALUES ('" ;
+                               $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 ) . "')" ;
+                               $sql .= Database::strencode ( $y->comment ) . "','" ;
+                               if ( $wgUser->isAnon() ) $sql .= $wgUser->getName() ;
+                               $sql .= "')" ;
                                $res = wfQuery( $sql, DB_WRITE );
                        }
                }
        }
        
+       # 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}')" ;
+               } else {
+                       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 val_user='" . $wgUser->GetID() . "' AND " ;
+               $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] ) ;
        }
        
        # Reads the entire vote list for this user for the given article
-       function getVoteList ( $id ) {
+       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 val_user=" . $wgUser->getID() ;
+               $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 ;
@@ -177,7 +191,7 @@ class Validation {
        function getAllVoteLists ( $user ) {
                global $wgDBprefix ;
                $r = array () ; # Revisions
-               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_user=" . $user ;
+               $sql = "SELECT * FROM {$wgDBprefix}validate WHERE " . $this->identifyMe ( $user ) ;
                $res = wfQuery( $sql, DB_READ );
                while( $x = wfFetchObject( $res ) ) {
                        $a = $x->val_page ;
@@ -194,14 +208,15 @@ class Validation {
                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) VALUES (" ;
+               $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 ) . "')" ;
+               $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 ) ;
        }
@@ -230,6 +245,8 @@ class Validation {
 
        # 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" ) ;
                $url = htmlspecialchars( $nt->getLocalURL( "mode=userstats&user={$user}" ) );
                return "<a href=\"{$url}\">{$text}</a>" ;
@@ -422,6 +439,12 @@ class Validation {
                $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 showDetails ( &$article , $revision ) {
                global $wgDBprefix , $wgOut, $wgUser ;
@@ -439,8 +462,8 @@ class Validation {
                $users = array () ;
                $topics = array () ;
                while( $x = wfFetchObject( $res ) ) {
-                       $data[$x->val_user][$x->val_type] = $x ;
-                       $users[$x->val_user] = true ;
+                       $data[$this->make_user_id($x)][$x->val_type] = $x ;
+                       $users[$this->make_user_id($x)] = true ;
                        $topics[$x->val_type] = true ;
                }
                
@@ -465,7 +488,13 @@ class Validation {
                # Table data
                foreach ( $users AS $u => $dummy ) { # Every row a user
                        $ret .= "<tr>" ;
-                       $ret .= "<th>" . str_replace ( "$1" , $u , wfMsg ( 'val_details_th_user') ) . "</th>" ;
+                       $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 .= "</th>" ;
                        foreach ( $topics AS $t => $dummy ) { # Every column a topic
                                if ( !isset ( $data[$u][$t] ) ) $ret .= "<td/>" ;
                                else {
@@ -486,7 +515,7 @@ class Validation {
                }
        
        function showList ( &$article ) {
-               global $wgDBprefix , $wgOut;
+               global $wgDBprefix , $wgOut, $wgUser;
                $this->prepareRevisions ( $article->getID() ) ;
                $this->topicList = $this->getTopicList() ;
 
@@ -552,6 +581,7 @@ class Validation {
                $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 ) ) ;
                
                $ret = "" ;
@@ -612,8 +642,7 @@ function wfSpecialValidate( $page = '' ) {
                $html = $v->manageTopics () ;
        } else if ( $mode == "userstats" ) {
                $v = new Validation ;
-               $user = $wgUser->GetID() ;
-               #$user = $wgRequest->getVal ( "user" ) ; # Uncomment this to allow all user statistics to be public
+               $user = $wgRequest->getVal ( "user" ) ;
                $html = $v->showUserStats ( $user ) ;
        } else {
                $html = "$mode" ;

diff --git a/languages/Language.php b/languages/Language.php
index cec149d..39a9629 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1492,7 +1492,7 @@ Type the name of the user in the box and press the button to make the user an ad
 'val_of' => '$1 of $2',
 'val_revision' => 'Revision',
 'val_time' => 'Time',
-'val_user_stats_title' => 'Validation overview of user #$1',
+'val_user_stats_title' => 'Validation overview of user $1',
 'val_my_stats_title' => 'My validation overview',
 'val_list_header' => '<th>#</th><th>Topic</th><th>Range</th><th>Action</th>',
 'val_add' => 'Add',
@@ -1501,7 +1501,7 @@ Type the name of the user in the box and press the button to make the user an ad
 'val_revision_number' => 'Revision #$1',
 'val_warning' => '<b>Never, <i>ever</i>, change something here without <i>explicit</i> community consensus!</b>',
 'val_rev_for' => 'Revisions for ',
-'val_details_th_user' => 'User #$1',
+'val_details_th_user' => 'User $1',
 'val_validation_of' => 'Validation of "$1"',
 'val_revision_of' => 'Revision of $1',
 'val_revision_changes_ok' => 'Your ratings have been stored!',

diff --git a/maintenance/archives/patch-validate.sql b/maintenance/archives/patch-validate.sql
index 2a48b58..3fa7e84 100644 (file)
--- a/maintenance/archives/patch-validate.sql
+++ b/maintenance/archives/patch-validate.sql
@@ -8,5 +8,6 @@ CREATE TABLE /*$wgDBprefix*/validate (
   `val_type` int(11) unsigned NOT NULL default '0',
   `val_value` int(11) default '0',
   `val_comment` varchar(255) NOT NULL default '',
+  `val_ip` varchar(20) NOT NULL default '',
   KEY `val_user` (`val_user`,`val_revision`)
 ) TYPE=InnoDB;