Article validation code (automatic version merging)

diff --git a/includes/SpecialValidate.php b/includes/SpecialValidate.php
index e0e72fa..4ec0869 100644 (file)
--- a/includes/SpecialValidate.php
+++ b/includes/SpecialValidate.php
@@ -94,7 +94,38 @@ class Validation
                        {
                        $oldtime = $_POST['oldtime'] ;
                        if ( !isset ( $val["{$oldtime}"] ) ) $val["{$oldtime}"] = array () ;
-                       if ( isset ( $_POST['clear_other'] ) && $_POST['clear_other'] == 1 ) # Clear all others
+                       
+                       # Reading postdata
+                       $postrad = array () ;
+                       $poscomment = array () ;
+                       for ( $idx = 0 ; $idx < count ( $validationtypes) ; $idx++ )    
+                               {
+                               $postrad[$idx] = $_POST["rad{$idx}"] ;
+                               $postcomment[$idx] = $_POST["comment{$idx}"] ;
+                               }
+                       
+                       # Merge others into this one
+                       if ( isset ( $_POST['merge_other'] ) && $_POST['merge_other'] == 1 )
+                               {
+                               foreach ( $val AS $time => $stuff )
+                                       {
+                                       if ( $time <> $article_time )
+                                               {
+                                               for ( $idx = 0 ; $idx < count ( $validationtypes) ; $idx++ )
+                                                       {
+                                                       $rad = $postrad[$idx] ;
+                                                       if ( isset ( $stuff[$idx] ) AND $stuff[$idx]->val_value != -1 AND $rad == -1 )
+                                                               {
+                                                               $postrad[$idx] = $stuff[$idx]->val_value ;
+                                                               $postcomment[$idx] = $stuff[$idx]->val_comment ;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       
+                       # Clear all others
+                       if ( isset ( $_POST['clear_other'] ) && $_POST['clear_other'] == 1 )
                                {
                                $sql = "DELETE FROM validate WHERE val_title='{$article_title}' AND val_timestamp<>'{$oldtime}' AND val_user='" ;
                                $sql .= $wgUser->getID() . "'" ;
@@ -103,17 +134,18 @@ class Validation
                                $val = array () ; # So clear others
                                $val["{$oldtime}"] = $val2 ;
                                }
-       
+
                        # Delete old "votes" for this version
                        $sql = "DELETE FROM validate WHERE val_title='{$article_title}' AND val_timestamp='{$oldtime}' AND val_user='" ;
                        $sql .= $wgUser->getID() . "'" ;
                        wfQuery( $sql, DB_WRITE );
        
+                       # Incorporate changes
                        for ( $idx = 0 ; $idx < count ( $validationtypes) ; $idx++ ) # Changes
                                {
-                               $comment = $_POST["comment{$idx}"] ;
+                               $comment = $postcomment[$idx] ;
                                $comment_sql = str_replace ( "'" , "\'" , $comment ) ;
-                               $rad = $_POST["rad{$idx}"] ;
+                               $rad = $postrad[$idx] ;
                                if ( !isset ( $val["{$oldtime}"][$idx] ) ) $val["{$oldtime}"][$idx] = "" ;
                                $val["{$oldtime}"][$idx]->val_value = $rad ;
                                $val["{$oldtime}"][$idx]->val_comment = $comment ;
@@ -132,8 +164,10 @@ class Validation
                
                $skin = $wgUser->getSkin() ;
                $staturl = $skin->makeSpecialURL ( "validate" , "mode=stat_page&article_title={$article_title}" ) ;
-               $html .= "<a href=\"{$staturl}\">" . wfMsg('val_stat_link_text') . "</a>" ;
+               $html .= "<a href=\"{$staturl}\">" . wfMsg('val_stat_link_text') . "</a><br>\n" ;
+               $html .= "<small>" . wfMsg('val_form_note') . "</small><br>\n" ;
                
+               # Generating data tables
                $tabsep = "<td width=0px style='border-left:2px solid black;'></td>" ;
                $topstyle = "style='border-top:2px solid black'" ;
                foreach ( $val AS $time => $stuff )
@@ -166,9 +200,12 @@ class Validation
                                $html .= "<td><input type=text name='comment{$idx}' value='{$comment}'></td>" ;
                                $html .= "</tr>\n" ;
                                }
-                       $html .= "<tr><td {$topstyle} colspan=2></td><td {$topstyle} colspan=3><input type=checkbox name=clear_other value=1 checked>" ;
+                       $html .= "<tr><td {$topstyle} colspan=2></td><td {$topstyle} colspan=3>" ;
+                       $html .= "<input type=checkbox name=merge_other value=1 checked>" ;
+                       $html .= wfMsg ( 'val_merge_old' );
+                       $html .= "<br><input type=checkbox name=clear_other value=1 checked>" ;
                        $html .= wfMsg ( 'val_clear_old', $skin->makeKnownLinkObj( $article ) );
-                       $html .= "</td><td {$topstyle} align=right><input type=submit name=doit value='" . wfMsg("ok") . "'></td>" ;
+                       $html .= "</td><td {$topstyle} align=right valign=center><input type=submit name=doit value='" . wfMsg("ok") . "'></td>" ;
                        $html .= "<td {$topstyle} colspan=2></td></tr></table></form>\n" ;
                        }
                return $html ;

diff --git a/languages/Language.php b/languages/Language.php
index 3343edf..a53c9b6 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1260,6 +1260,11 @@ Type the name of the user in the box and press the button to make the user an ad
 
 # Validation
 'val_clear_old' => 'Clear my other validation data for $1',
+'val_merge_old' => 'Merge my other validation data into this version',
+'val_form_note' => '<b>Hint :</b> Merging your data means that, for the version you hit <i>OK</i> for, all options you have selected <i>no opinion</i> 
+will be set to the value and comment of the most recent version you have expressed an opinion for. For example, if you want to change a single option 
+on a new version, but also keep your other setting for this article in this version, just select what you intend to <i>change</i>, and merging will 
+fill up the other options with your prior settings.',
 'val_noop' => 'No opinion',
 'val_percent' => '<b>$1%</b><br>($2 of $3 points by $4 users)',
 'val_percent_single' => '<b>$1%</b><br>($2 of $3 points by one user)',