From cd724523d697bdbaa2c86d222f81ff660d05d51e Mon Sep 17 00:00:00 2001 From: Magnus Manske Date: Fri, 18 Mar 2005 15:02:27 +0000 Subject: [PATCH] The return of the validation feature (caveat: new table scheme!) --- includes/Article.php | 6 - includes/SpecialValidate.php | 748 +++++++++++++++++++++++++++++++++++ languages/Language.php | 4 +- 3 files changed, 751 insertions(+), 7 deletions(-) create mode 100644 includes/SpecialValidate.php diff --git a/includes/Article.php b/includes/Article.php index b93144979d..527a2d5587 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1252,12 +1252,6 @@ class Article { $v = new Validation ; $t = $v->validatePageForm ( $this , $revision ) ; -/* $a = $v->getTopicList () ; - $t = "" ; - foreach ( $a AS $x => $y ) { - $t .= $x . " : " . $y->val_comment . " (1-" . $y->val_value . ")
" ; - } - $t .= "Revision {$revision}" ;*/ $wgOut->addHTML ( $t ) ; } diff --git a/includes/SpecialValidate.php b/includes/SpecialValidate.php new file mode 100644 index 0000000000..3441c306aa --- /dev/null +++ b/includes/SpecialValidate.php @@ -0,0 +1,748 @@ + +# http://www.mediawiki.org/ +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# http://www.gnu.org/copyleft/gpl.html + +/** + * + * @package MediaWiki + * @subpackage SpecialPage + */ + +/** + * + * @package MediaWiki + * @subpackage SpecialPage + */ +class Validation { + + function find_this_version( $article_title , &$article_time , &$id , &$tab ) { +/* $id = ""; + $tab = ""; + $sql = "SELECT cur_id,cur_timestamp FROM cur WHERE cur_namespace=".NS_MAIN." AND cur_title='" . wfStrencode( $article_title ) . "'"; + $res = wfQuery( $sql, DB_READ ); + if( $s = wfFetchObject( $res ) ) { + if ( $article_time == "" ) { + # No timestamp = current version + $article_time = $s->cur_timestamp; + } elseif ( $article_time == $s->cur_timestamp ) { + # Means current version + $tab = "cur"; + $id = $s->cur_id; + } + } + + if ( $id == "" ) { + $sql = "SELECT old_id FROM old WHERE old_namespace=".NS_MAIN." AND old_title='" . wfStrencode( $article_title ) . + "' AND old_timestamp='" . wfStrencode( $article_time ) . "'"; + $res = wfQuery( $sql, DB_READ ); + if( $s = wfFetchObject( $res ) ) { + $tab = "old"; + $id = $s->old_id; + } + }*/ + } + + function get_prev_data( $user_id , $article_title , $article_timestamp = "" ) { + $ret = array (); +/* $sql = "SELECT * FROM validate WHERE val_user='" . wfStrencode( $user_id ) . + "' AND val_title='" . wfStrencode( $article_title ) . "'"; + if ( $article_timestamp != "" ) { + $sql .= " AND val_timestamp='" . wfStrencode( $article_timestamp ) . "'"; + } + $res = wfQuery( $sql, DB_READ ); + while( $s = wfFetchObject( $res ) ) { + $ret[$s->val_timestamp][$s->val_type] = $s; + }*/ + return $ret; + } + + function validate_form( $article_title = "" ) { +/* global $wgOut, $wgLang, $wgUser, $wgArticle, $wgRequest; + + if ( $wgUser->getID() == 0 ) { + # Anon + $wgOut->addHTML( htmlspecialchars( wfMsg( 'val_no_anon_validation' ) ) . + $this->getPageStatistics ( $article_title ) ) ; + return; + } + + $validationtypes = $wgLang->getValidationTypes(); + if ( $article_title == "" ) { + $article_title = $wgRequest->getVal( 'article_title' ); + $heading = "

" . htmlspecialchars( $article_title ) . "

\n"; + } else { + $heading = ""; + } + $article_time = ""; + $article_time = $wgRequest->getVal( 'timestamp' ); + $article = Title::newFromText( $article_title ); + if( is_null( $article ) ) { + $wgOut->errorpage( "badtitle", "badtitletext" ); + return; + } + + # Now we get all the "votes" for the different versions of this article for this user + $val = $this->get_prev_data( $wgUser->getID() , $article_title ); + + # No votes for this version, initial data + if( !isset( $val[$article_time] ) ) { + if( $article_time == "" ) { + $res = wfQuery( "select cur_timestamp FROM cur WHERE cur_title='" . + wfStrencode( $article_title ) . "' AND cur_namespace=".NS_MAIN, DB_READ ); + if( $s = wfFetchObject( $res ) ) { + $article_time = $s->cur_timestamp; + } + } + $val[$article_time] = array(); + } + + # Newest versions first + krsort( $val ); + + # User has clicked "Doit" before, so evaluate form + if( $wgRequest->wasPosted() ) { + $oldtime = StrVal( $wgRequest->getVal( 'oldtime' ) ); + if( !isset ( $val[$oldtime] ) ) { + $val[$oldtime] = array(); + } + + # Reading postdata + $postrad = array(); + $poscomment = array(); + for( $idx = 0 ; $idx < count( $validationtypes) ; $idx++ ) { + $postrad[$idx] = $wgRequest->getVal( "rad{$idx}" ); + $postcomment[$idx] = $wgRequest->getText( "comment{$idx}" ); + } + + # Merge others into this one + if( $wgRequest->getCheck( 'merge_other' ) ) { + foreach( $val as $time => $stuff ) { + if( $time != $article_time ) { + for( $idx = 0; $idx < count( $validationtypes ); $idx++ ) { + $rad = $postrad[$idx]; + if( isset ( $stuff[$idx] ) && $stuff[$idx]->val_value != -1 && $rad == -1 ) { + $postrad[$idx] = $stuff[$idx]->val_value; + $postcomment[$idx] = $stuff[$idx]->val_comment; + } + } + } + } + } + + # Clear all others + if( $wgRequest->getCheck( 'clear_other' ) ) { + $sql = "DELETE FROM validate WHERE val_title='" . wfStrencode( $article_title ) . + "' AND val_timestamp<>'" . wfStrencode( $oldtime ) . "' AND val_user='"; + $sql .= wfStrencode( $wgUser->getID() ) . "'"; + wfQuery( $sql, DB_WRITE ); + $val2 = $val[$oldtime]; # Only version left + $val = array(); # So clear others + $val[$oldtime] = $val2; + } + + # Delete old "votes" for this version + $sql = "DELETE FROM validate WHERE val_title='" . wfStrencode( $article_title ) . + "' AND val_timestamp='" . wfStrencode( $oldtime ) . "' AND val_user='"; + $sql .= wfStrencode( $wgUser->getID() ) . "'"; + wfQuery( $sql, DB_WRITE ); + + # Incorporate changes + for( $idx = 0; $idx < count( $validationtypes ); $idx++ ) { + $comment = $postcomment[$idx] ; + $rad = $postrad[$idx] ; + if ( !isset( $val[$oldtime][$idx] ) ) { + $val[$oldtime][$idx] = ""; + } + $val[$oldtime][$idx]->val_value = $rad; + $val[$oldtime][$idx]->val_comment = $comment; + if( $rad != -1 ) { + # Store it in the database + $sql = "INSERT INTO validate (val_user,val_title,val_timestamp,val_type,val_value,val_comment) " . + "VALUES ( '" . wfStrencode( $wgUser->getID() ) . "','" . + wfStrencode( $article_title ) . "','" . + wfStrencode( $oldtime ) . "','" . + wfStrencode( $idx ) . "','" . + wfStrencode( $rad ) . "','" . + wfStrencode( $comment ) . "')"; + wfQuery( $sql, DB_WRITE ); + } + } + $wgArticle->showArticle( "Juhuu", wfMsg( 'val_validated' ) ); + return; # Show article instead of validation page + } + + # Generating HTML + $html = ""; + + $skin = $wgUser->getSkin(); + $staturl = $skin->makeSpecialURL( "validate" , "mode=stat_page&article_title=" . urlencode( $article_title ) ); + $listurl = $skin->makeSpecialURL( "validate" , "mode=list_page" ); + $html .= "" . wfMsg('val_stat_link_text') . " \n"; + $html .= "" . wfMsg('val_article_lists') . "
\n"; + $html .= "" . wfMsg('val_form_note') . "
\n"; + + # Generating data tables + $tabsep = ""; + $topstyle = "style='border-top:2px solid black'"; + foreach( $val as $time => $stuff ) { + $tablestyle = "cellspacing='0' cellpadding='2'"; + if ( $article_time == $time ) { + $tablestyle .=" style='border: 2px solid red'"; + } + $html .= "

" . wfMsg( 'val_version_of', gmdate( "F d, Y H:i:s", wfTimestamp( TW_UNIX, $time ) ) ); + $this->find_this_version ( $article_title , $time , $table_id , $table_name ); + if( $table_name == "cur" ) { + $html .= " (" . wfMsg( 'val_this_is_current_version' ) . ")"; + } + $html .= "

\n" ; + $html .= "
\n" ; + $html .= "" ; + $html .= "\n" ; + $html .= wfMsg( 'val_table_header', $tabsep ); + for( $idx = 0; $idx < count( $validationtypes ); $idx++ ) { + $x = explode( "|" , $validationtypes[$idx] , 4 ); + if( isset ( $stuff[$idx] ) ) { + $choice = $stuff[$idx]->val_value; + } else { + $choice = -1; + } + if( isset( $stuff[$idx] ) ) { + $comment = $stuff[$idx]->val_comment; + } else { + $comment = ""; + } + $html .= "{$tabsep}" + . ""; + $html .= "\n"; + } + $html .= ""; + $html .= "
{$x[0]}{$x[1]}" ; + for( $cnt = 0 ; $cnt < $x[3] ; $cnt++) { + $html .= "{$tabsep}"; + $html .= "
"; + + # link to version + $title = Title::newFromDBkey( $article_title ); + if ( $table_name == "cur" ) { + $link_version = $title->getLocalURL( "" ); + } else { + $link_version = $title->getLocalURL( "oldid={$table_id}" ); + } + $link_version = "" . wfMsg ( 'val_view_version' ) . ""; + $html .= $link_version; + $html .= ""; + $html .= ""; + $html .= wfMsg( 'val_merge_old' ); + $html .= "
"; + $html .= wfMsg( 'val_clear_old', $skin->makeKnownLinkObj( $article ) ); + $html .= "
\n"; + } + + $html .= "

" . wfMsg( 'preview' ) . "

"; + $wgOut->addHTML( $html ); + $wgOut->addWikiText( $wgArticle->getContent( true ) );*/ + } + + function getData( $user = -1 , $title = "" , $type = -1 ) { +/* $ret = array(); + $sql = array(); + if( $user != -1 ) { + $sql[] = "val_user='" . wfStrencode( $user ) . "'"; + } + if( $type != -1 ) { + $sql[] = "val_type='" . wfStrencode( $type ) . "'"; + } + if( $title != "" ) { + $sql[] = "val_title='" . wfStrencode( $title ) . "'"; + } + $sql = implode( " AND " , $sql ); + if( $sql != "" ) { + $sql = " WHERE " . $sql; + } + $sql = "SELECT * FROM validate" . $sql; + $res = wfQuery( $sql, DB_READ ); + while( $s = wfFetchObject( $res ) ) { + $ret["{$s->val_title}"]["{$s->val_timestamp}"]["{$s->val_type}"][] = $s; + } + return $ret;*/ + } + + # Show statistics for the different versions of a single article + function getPageStatistics( $article_title = "" ) { +/* global $wgLang, $wgUser, $wgOut, $wgRequest; + $validationtypes = $wgLang->getValidationTypes(); + if( $article_title == "" ) { + $article_title = $wgRequest->getVal( 'article_title' ); + } + $d = $this->getData( -1 , $article_title , -1 ); + if( count ( $d ) ) { + $d = array_shift ( $d ) ; + } else { + $d = array(); + } + krsort( $d ); + + # Getting table data (cur_id, old_id etc.) for each version + $table_id = array(); + $table_name = array(); + foreach( $d as $version => $data ) { + $this->find_this_version( $article_title, $version, $table_id[$version], $table_name[$version] ); + } + + # Generating HTML + $title = Title::newFromDBkey( $article_title ); + $wgOut->setPageTitle( wfMsg( 'val_page_validation_statistics' , $title->getPrefixedText() ) ); + $html = ""; + $skin = $wgUser->getSkin(); + $listurl = $skin->makeSpecialURL( "validate" , "mode=list_page" ); + $html .= "" . wfMsg( 'val_article_lists' ) . "

\n"; + + $html .= "\n"; + $html .= ""; + foreach( $validationtypes as $idx => $title ) { + $title = explode ( "|" , $title ); + $html .= ""; + } + $html .= ""; + $html .= "\n"; + foreach( $d as $version => $data ) { + # Preamble for this version + $title = Title::newFromDBkey( $article_title ); + $version_date = $wgLang->timeanddate( $version ); + $version_validate_link = $title->escapeLocalURL( "action=validate×tamp={$version}" ); + $version_validate_link = "" . wfMsg('val_validate_version') . ""; + if( $table_name[$version] == 'cur' ) { + $version_view_link = $title->escapeLocalURL( "" ); + } else { + $version_view_link = $title->escapeLocalURL( "oldid={$table_id[$version]}" ); + } + $version_view_link = "" . wfMsg('val_view_version') . ""; + $html .= ""; + $html .= ""; + + # Individual data + $vmax = array(); + $vcur = array(); + $users = array(); + foreach( $data as $type => $x2 ) { + if ( !isset ( $vcur[$type] ) ) $vcur[$type] = 0 ; + if ( !isset ( $vmax[$type] ) ) $vmax[$type] = 0 ; + if ( !isset ( $users[$type] ) ) $users[$type] = 0 ; + foreach( $x2 as $user => $x ) { + $vcur[$type] += $x->val_value; + $temp = explode( "|" , $validationtypes[$type] ); + $vmax[$type] += $temp[3] - 1; + $users[$type] += 1; + } + } + + $total_count = 0; + $total_percent = 0; + foreach( $validationtypes as $idx => $title ) { + if( isset ( $vcur[$idx] ) ) { + $average = 100 * $vcur[$idx] / $vmax[$idx] ; + $total_count += 1; + $total_percent += $average; + if( $users[$idx] > 1 ) { + $msgid = "val_percent"; + } else { + $msgid = "val_percent_single"; + } + $html .= ""; + } + + if( $total_count > 0 ) { + $total = $total_percent / $total_count; + $total = number_format( $total , 2 ) . " %"; + } else { + $total = ""; + } + $html .= ""; + + $html .= ""; + } + $html .= "
" . wfMsg('val_version') . "{$title[0]}" . wfMsg('val_total') . "
{$version_date}
{$version_view_link}
{$version_validate_link}		" . + wfMsg( $msgid, number_format( $average, 2 ) , + $vcur[$idx] , $vmax[$idx] , $users[$idx] ); + } else { + $html .= ""; + $html .= "(" . wfMsg ( "val_noop" ) . ")"; + } + $html .= "{$total}
\n"; + return $html ;*/ + } + + function countUserValidations( $userid ) { +/* $sql = "SELECT count(DISTINCT val_title) AS num FROM validate WHERE val_user=" . IntVal( $userid ); + $res = wfQuery( $sql, DB_READ ); + if ( $s = wfFetchObject( $res ) ) { + $num = $s->num; + } else { + $num = 0; + } + return $num;*/ + } + + function getArticleList() { +/* global $wgLang, $wgOut; + $validationtypes = $wgLang->getValidationTypes(); + $wgOut->setPageTitle( wfMsg( 'val_article_lists' ) ); + $html = ""; + + # Choices + $choice = array (); + $maxw = 0; + foreach( $validationtypes as $idx => $data ) { + $x = explode( "|" , $data , 4 ); + if( $x[3] > $maxw ) { + $maxw = $x[3]; + } + } + foreach( $validationtypes as $idx => $data ) { + $choice[$idx] = array(); + for( $a = 0 ; $a < $maxw ; $a++ ) { + $var = "cb_{$idx}_{$a}"; + if( isset ( $_POST[$var] ) ) $choice[$idx][$a] = $_POST[$var] ; # Selected + else if ( !isset ( $_POST["doit"] ) ) $choice[$idx][$a] = 1 ; # First time + else $choice[$idx][$a] = 0 ; # De-selected + } + } + + # The form + $html .= "
\n"; + $html .= "" ; + foreach( $validationtypes as $idx => $data ) { + $x = explode ( "|" , $data , 4 ); + + $html .= ""; + $html .= ""; + $html .= ""; + + for( $a = 0; $a < $maxw; $a++ ) { + if( $a < $x[3] ) { + $td = "\n"; + $html .= ""; + $html .= "
{$x[0]}{$x[1]}
\n"; + $html .= "
\n"; + + # The query + $articles = array(); + $sql = "SELECT DISTINCT val_title,val_timestamp,val_type,avg(val_value) AS avg FROM validate GROUP BY val_title,val_timestamp,val_type"; + $res = wfQuery( $sql, DB_READ ); + while( $s = wfFetchObject( $res ) ) { + $articles[$s->val_title][$s->val_timestamp][$s->val_type] = $s; + } + + # The list + $html .= "\n"; + return $html;*/ + } + + # 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 = "getLocalURL ( "oldid={$revision}" ) . "\">" . $text . "" ; + return $ret ; + } + + # Returns an array containing all topics you can vote on + function getTopicList () { + $ret = array () ; + $sql = "SELECT * FROM validate WHERE val_user=0" ; + $res = wfQuery( $sql, DB_READ ); + while( $x = wfFetchObject( $res ) ) { + $ret[$x->val_type] = $x ; + } + ksort ( $ret ) ; + return $ret ; + } + + # Generates a form for a single revision + function getRevisionForm ( &$article , $revision , &$data , $focus = false ) { + # Fill data with blank values + foreach ( $this->topicList AS $x => $y ) { + if ( !isset ( $data[$x] ) ) { + $data[$x]->value = 0 ; + $data[$x]->comment = "" ; + } + } + ksort ( $data ) ; + + # Generate form + $ret = "
" ; + $ret .= "getVersionLink ( $article , $revision ) ; + $ret .= "\n" ; + $line = 0 ; + foreach ( $data AS $x => $y ) { + $line = 1 - $line ; + $col = $line == 1 ? "#DDDDDD" : "#EEEEEE" ; + $idx = "_{$revision}[{$x}]" ; + $ret .= "\n" ; + $ret .= "\n" ; + + $tlx = $this->topicList[$x] ; + $vote = "" ; + $max = $tlx->val_value ; + for ( $a = 0 ; $a <= $max ; $a++ ) { + if ( $a == 0 ) $vote .= wfMsg ( "val_noop" ) ; + $vote .= "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 .= "   " ; + } + $ret .= "\n" ; + + $ret .= "\n" ; + } + $checked = $focus ? " checked" : "" ; + $ret .= "\n" ; + $ret .= "
" . $head . " ({$link})
" ; + $ret .= $this->topicList[$x]->val_comment ; + $ret .= "{$vote}" ; + $ret .= "
\n" ; + $ret .= "" . wfMsg( 'val_merge_old' ) . " \n" ; + $ret .= "" . wfMsg( 'val_clear_old' ) . " \n" ; + $ret .= "\n" ; + if ( $focus ) $ret .= "
\n" . wfMsg ( "val_form_note" ) . "" ; + $ret .= "
\n
\n\n" ; + 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 ; + } + } + if ( $ret ) ksort ( $dest ) ; + return $ret ; + } + + # Merges all votes prior to the given revision into it + function mergeOldRevisions ( &$article , $revision ) { + $tmp = $this->voteCache ; + krsort ( $tmp ) ; + $update = false ; + $data = $this->voteCache[$revision] ; + foreach ( $tmp AS $x => $y ) { + if ( $x < $revision ) { + if ( $this->mergeInto ( $y , $data ) ) $update = true ; + } + } + if ( $update ) $this->setRevision ( $article , $revision , $data ) ; + } + + # Clears all votes prior to the given revision + function clearOldRevisions ( &$article , $revision ) { + $tmp = $this->voteCache ; + foreach ( $tmp AS $x => $y ) { + if ( $x < $revision ) $this->deleteRevision ( $article , $x ) ; + } + } + + # Updates the votes for the given revision from the FORM data + function updateRevision ( &$article , $revision ) { + global $wgUser, $wgRequest ; + + if ( isset ( $this->voteCache[$revision] ) ) $data = $this->voteCache[$revision] ; + else $data = array () ; + $nv = $wgRequest->getArray ( "re_v_{$revision}" , array() ) ; + $nc = $wgRequest->getArray ( "re_c_{$revision}" , array() ) ; + + foreach ( $nv AS $x => $y ) { +# if ( $y > 0 ) { + $data[$x]->value = $y ; + $data[$x]->comment = $nc[$x] ; +# } + } + krsort ( $data ) ; + + $this->setRevision ( $article , $revision , $data ) ; + } + + # Sets a specific revision to both cache and database + function setRevision ( &$article , $revision , &$data ) { + global $wgUser ; + $this->deleteRevision ( $article , $revision ) ; + $this->voteCache[$revision] = $data ; + foreach ( $data AS $x => $y ) { + if ( $y->value > 0 ) { + $sql = "INSERT INTO validate (val_user,val_page,val_revision,val_type,val_value,val_comment) VALUES ('" ; + $sql .= $wgUser->getID() . "','" ; + $sql .= $article->getID() . "','" ; + $sql .= $revision . "','" ; + $sql .= $x . "','" ; + $sql .= $y->value . "','" ; + $sql .= Database::strencode ( $y->comment ) . "')" ; + $res = wfQuery( $sql, DB_WRITE ); + } + } + } + + # Deletes a specific vote set in both cache and database + function deleteRevision ( &$article , $revision ) { + global $wgUser ; + if ( !isset ( $this->voteCache[$revision] ) ) return ; # Nothing to do + $sql = "DELETE FROM validate WHERE val_user='" . $wgUser->GetID() . "' AND " ; + $sql .= " val_page='" . $article->getID() . "' AND val_revision='{$revision}'" ; + $res = wfQuery( $sql, DB_WRITE ); + unset ( $this->voteCache[$revision] ) ; + } + + # Reads the entire vote list for this user for the given article + function getVoteList ( $id ) { + global $wgUser ; + $r = array () ; # Revisions + $sql = "SELECT * FROM validate WHERE val_page=" . $id . " AND val_user=" . $wgUser->getID() ; + $res = wfQuery( $sql, DB_READ ); + while( $x = wfFetchObject( $res ) ) { + if ( !isset($r[$x->val_revision]) ) $r[$x->val_revision] = array () ; + $r[$x->val_revision][$x->val_type]->value = $x->val_value ; + $r[$x->val_revision][$x->val_type]->comment = $x->val_comment ; + } + return $r ; + } + + # Generates the page from the validation tab + function validatePageForm ( &$article , $revision ) { + global $wgOut, $wgRequest ; + + $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 ) ; + $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 ) ; + } + + # Make sure the requested revision exists + if ( !isset ( $this->voteCache[$revision] ) ) $this->voteCache[$revision] = array () ; + + # Sort revisions list, newest first + krsort ( $this->voteCache ) ; + + # Output + $ret = "" ; + $title = $article->getTitle(); + $title = $title->getPrefixedText() ; + $wgOut->setPageTitle ( "Revisions for " . $title ) ; + foreach ( $this->voteCache AS $x => $y ) + { + $ret .= $this->getRevisionForm ( $article , $x , $y , $x == $revision ) ; + $ret .= "
\n" ; + } + return $ret ; + } + +} + +/** + * constructor + */ +function wfSpecialValidate( $page = '' ) { + global $wgOut, $wgRequest, $wgUseValidation; + + if( !$wgUseValidation ) { + $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" ); + return; + } + + $mode = $wgRequest->getVal( 'mode', 'form' ); + $v = new Validation; + $html = "" ; + if( $mode == "stat_page" ) { + $html = $v->getPageStatistics(); + } else if( $mode == "list_page" ) { + $html = $v->getArticleList(); + } + + $wgOut->addHTML( $html ); +} + +?> diff --git a/languages/Language.php b/languages/Language.php index 7b5fe18cfa..06ab035574 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -1458,7 +1458,9 @@ Type the name of the user in the box and press the button to make the user an ad 'makesysop' => 'Make a user into a sysop', # Validation -'val_clear_old' => 'Clear my other validation data for $1', +'val_yes' => 'Yes', +'val_no' => 'No', +'val_clear_old' => 'Clear my older validation data', 'val_merge_old' => 'Use my previous assessment where selected \'No opinion\'', 'val_form_note' => 'Hint: Merging your data means that for the article revision you select, all options where you have specified no opinion -- 2.20.1