Forgot to commit the change to showhideminor. Also removing commented-out strings.

[lhc/web/wiklou.git] / includes / PageHistory.php

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index cca1d66..13c1b44 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -7,7 +7,7 @@
 class PageHistory {
        var $mArticle, $mTitle, $mSkin;
        var $lastline, $lastdate;
-       
+       var $linesonpage;
        function PageHistory( $article ) {
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
@@ -54,36 +54,61 @@ class PageHistory {
                
                $namespace = $this->mTitle->getNamespace();
                $title = $this->mTitle->getText();
+               
+               $db =& wfGetDB( DB_SLAVE );
+               $use_index = $db->useIndexClause( 'name_title_timestamp' );
+               $oldtable = $db->tableName( 'old' );
+
                $sql = "SELECT old_id,old_user," .
                  "old_comment,old_user_text,old_timestamp,old_minor_edit ".
-                 "FROM old USE INDEX (name_title_timestamp) " .
+                 "FROM $oldtable $use_index " .
                  "WHERE old_namespace={$namespace} AND " .
-                 "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
-                 "ORDER BY inverse_timestamp LIMIT $rawoffset, $limitplus";
-               $res = wfQuery( $sql, DB_READ, $fname );
+                 "old_title='" . $db->strencode( $this->mTitle->getDBkey() ) . "' " .
+                 "ORDER BY inverse_timestamp".wfLimitResult($limitplus,$rawoffset);
+               $res = $db->query( $sql, $fname );
+
+               $revs = $db->numRows( $res );
+               
+               if( $revs < $limitplus ) // the sql above tries to fetch one extra
+                       $this->linesonpage = $revs;
+               else
+                       $this->linesonpage = $revs - 1;
 
-               $revs = wfNumRows( $res );
                $atend = ($revs < $limitplus);
                
                $this->mSkin = $wgUser->getSkin();
                $numbar = wfViewPrevNext(
                        $offset, $limit,
                        $this->mTitle->getPrefixedText(),
-                       "action=history" );
+                       "action=history", $atend );
                $s = $numbar;
+               if($this->linesonpage > 0) {
+                       $submitpart1 = '<input class="historysubmit" type="submit" accesskey="'.wfMsg('accesskey-compareselectedversions').
+                       '" title="'.wfMsg('tooltip-compareselectedversions').'" value="'.wfMsg('compareselectedversions').'"';
+                       $this->submitbuttonhtml1 = $submitpart1 . ' />';
+                       $this->submitbuttonhtml2 = $submitpart1 . ' id="historysubmit" />';
+               }
                $s .= $this->beginHistoryList();
-
-               if( $offset == 0 )
-               $s .= $this->historyLine( $this->mArticle->getTimestamp(), $this->mArticle->getUser(),
-                 $this->mArticle->getUserText(), $namespace,
-                 $title, 0, $this->mArticle->getComment(),
-                 ( $this->mArticle->getMinorEdit() > 0 ) );
-
-               while ( $line = wfFetchObject( $res ) ) {
-                       $s .= $this->historyLine( $line->old_timestamp, $line->old_user,
-                         $line->old_user_text, $namespace,
-                         $title, $line->old_id,
-                         $line->old_comment, ( $line->old_minor_edit > 0 ) );
+               $counter = 1;
+               if( $offset == 0 ){
+                       $this->linesonpage++;
+                       $s .= $this->historyLine( 
+                               $this->mArticle->getTimestamp(), 
+                               $this->mArticle->getUser(),
+                               $this->mArticle->getUserText(), $namespace,
+                               $title, 0, $this->mArticle->getComment(),
+                               ( $this->mArticle->getMinorEdit() > 0 ),
+                               $counter++
+                       );
+               }
+               while ( $line = $db->fetchObject( $res ) ) {
+                       $s .= $this->historyLine( 
+                               $line->old_timestamp, $line->old_user,
+                               $line->old_user_text, $namespace,
+                               $title, $line->old_id,
+                               $line->old_comment, ( $line->old_minor_edit > 0 ),
+                               $counter++
+                       );
                }
                $s .= $this->endHistoryList( !$atend );
                $s .= $numbar;
@@ -93,8 +118,13 @@ class PageHistory {
 
        function beginHistoryList()
        {
+               global $wgTitle;
                $this->lastdate = $this->lastline = "";
-               $s = "\n<p>" . wfMsg( "histlegend" ) . "\n<ul>";
+               $s = "\n<p>" . wfMsg( "histlegend" ).'</p>'; 
+               $s .="\n<form action=\"" . $wgTitle->escapeLocalURL( '-' ) . "\" method=\"get\">";
+               $s .= "<input type=\"hidden\" name=\"title\" value=\"".wfEscapeHTML($wgTitle->getPrefixedDbKey())."\"/>\n";
+               $s .= !empty($this->submitbuttonhtml1) ? $this->submitbuttonhtml1."\n":'';
+               $s .= "" . "\n<ul id=\"pagehistory\" >";
                return $s;
        }
 
@@ -103,11 +133,13 @@ class PageHistory {
                $last = wfMsg( "last" );
 
                $s = $skip ? "" : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
-               $s .= "</ul>\n";
+               $s .= "</ul>";
+               $s .= !empty($this->submitbuttonhtml2) ? $this->submitbuttonhtml2."\n":'';
+               $s .= "</form>\n";
                return $s;
        }
 
-       function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor )
+       function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '' )
        {
                global $wgLang;
 
@@ -118,7 +150,7 @@ class PageHistory {
 
                if ( $oid && $this->lastline ) {
                        $ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLink(
-                         $artname, $last, "diff=\\1&oldid={$oid}" ), $this->lastline );
+                         $artname, $last, "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"' ), $this->lastline );
                } else {
                        $ret = "";
                }
@@ -133,10 +165,10 @@ class PageHistory {
 
                if ( 0 == $u ) {
                        $ul = $this->mSkin->makeKnownLink( $wgLang->specialPage( "Contributions" ),
-                               $ut, "target=" . $ut );
+                               htmlspecialchars( $ut ), "target=" . urlencode( $ut ) );
                } else { 
                        $ul = $this->mSkin->makeLink( $wgLang->getNsText(
-                               Namespace::getUser() ) . ":{$ut}", $ut );
+                               Namespace::getUser() ) . ":{$ut}", htmlspecialchars( $ut ) );
                }
 
                $s = "<li>";
@@ -146,16 +178,28 @@ class PageHistory {
                } else {
                        $curlink = $cur;
                }
-               $s .= "({$curlink}) (!OLDID!{$oid}!) . .";
-
-               $M = wfMsg( "minoreditletter" );
-               if ( $isminor ) {
-                       $s .= " <strong>{$M}</strong>";
+               $arbitrary = "";
+               if( $this->linesonpage > 1) {
+                       # XXX: move title texts to javascript
+                       $checkmark = "";
+                       if ( !$oid ) {
+                               $arbitrary = '<input type="radio" style="visibility:hidden" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'" />';
+                               $checkmark = ' checked="checked"';
+                       } else {
+                               if( $counter == 2 ) $checkmark = ' checked="checked"';
+                               $arbitrary = '<input type="radio" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'"'.$checkmark.' />';
+                               $checkmark = '';
+                       }
+                       $arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.wfMsg('selectnewerversionfordiff').'"'.$checkmark.' />';
                }
-               $s .= " {$link} . . {$ul}";
+               $s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='user'>{$ul}</span>";
+               $s .= $isminor ? ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>': '' ;
+               
 
                if ( "" != $c && "*" != $c ) {
-                       $s .= " <em>(" . wfEscapeHTML($c) . ")</em>";
+
+                       $c = $this->mSkin->formatcomment($c);
+                       $s .= " <em>(" . $c . ")</em>";
                }
                $s .= "</li>\n";