Rename 'SpecialContribSubEnd' hook to more appropriate 'ContributionsToolLinks',...

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

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index b5715c6..d245144 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -22,6 +22,8 @@ class ContribsPager extends IndexPager {
                
                $this->year = ($year > 0 && $year < 10000) ? $year : false;
                $this->month = ($month > 0 && $month < 13) ? $month : false;
+               $this->getDateCond();
+               
                $this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
        }
 
@@ -33,7 +35,7 @@ class ContribsPager extends IndexPager {
 
        function getQueryInfo() {
                list( $index, $userCond ) = $this->getUserCond();
-               $conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond(), $this->GetDateCond() );
+               $conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond() );
 
                return array(
                        'tables' => array( 'page', 'revision' ),
@@ -70,36 +72,30 @@ class ContribsPager extends IndexPager {
        }
        
        function getDateCond() {
-               $condition = array();
-               
                if ( $this->year || $this->month ) {
                        // Assume this year if only a month is given
                        if ( $this->year ) {
                                $year_start = $this->year;
                        } else {
                                $year_start = substr( wfTimestampNow(), 0, 4 );
+                               $thisMonth = gmdate( 'n' );
+                               if( $this->month > $thisMonth ) {
+                                       // Future contributions aren't supposed to happen. :)
+                                       $year_start--;
+                               }
                        }
                        
                        if ( $this->month ) {
-                               $month_start = str_pad($this->month, 2, '0', STR_PAD_LEFT);
                                $month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
                                $year_end = $year_start;
                        } else {
-                               $month_start = 0;
                                $month_end = 0;
                                $year_end = $year_start + 1;
                        }
-                       
-                       $ts_start = str_pad($year_start . $month_start, 14, '0' );
                        $ts_end = str_pad($year_end . $month_end, 14, '0' );
-                       
-                       $condition[] = "rev_timestamp >= $ts_start";
-                       # If just given the year 9999, we need not enforce an upper bound
-                       if( strlen($year_end) <= 4 )
-                               $condition[] = "rev_timestamp < $ts_end";
+
+                       $this->mOffset = $ts_end;
                }
-               
-               return $condition;
        }
 
        function getIndexField() {
@@ -273,16 +269,22 @@ function wfSpecialContributions( $par = null ) {
                $options['bot'] = '1';
        }
        
-       if ( ( $month = $wgRequest->getVal( 'month', null ) ) !== null && $month !== '' ) {
+       $skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
+       # Offset overrides year/month selection
+       if ( ( $month = $wgRequest->getIntOrNull( 'month' ) ) !== null && $month !== -1 ) {
                $options['month'] = intval( $month );
        } else {
                $options['month'] = '';
        }
-       
-       if ( ( $year = $wgRequest->getVal( 'year', null ) ) !== null && $year !== '' ) {
+       if ( ( $year = $wgRequest->getIntOrNull( 'year' ) ) !== null ) {
                $options['year'] = intval( $year );
-       } else if( $month ) {
-               $options['year'] = intval( substr( wfTimestampNow(), 0, 4 ) );          
+       } else if( $options['month'] ) {
+               $thisMonth = intval( gmdate( 'n' ) );
+               $thisYear = intval( gmdate( 'Y' ) );
+               if( intval( $options['month'] ) > $thisMonth ) {
+                       $thisYear--;
+               }
+               $options['year'] = $thisYear;
        } else {
                $options['year'] = '';
        }
@@ -290,6 +292,13 @@ function wfSpecialContributions( $par = null ) {
        wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
 
        $wgOut->addHTML( contributionsForm( $options ) );
+       # Show original selected options, don't apply them so as to allow paging
+       $_GET['year'] = ''; // hack for Pager
+       $_GET['month'] = ''; // hack for Pager
+       if( $skip ) {
+               $options['year'] = '';
+               $options['month'] = '';
+       }
 
        $pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
        if ( !$pager->getNumRows() ) {
@@ -352,6 +361,9 @@ function contributionsSub( $nt, $id ) {
                }
                # Other logs link
                $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+
+               wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
+
                $links = implode( ' | ', $tools );
        }
 
@@ -403,7 +415,7 @@ function contributionsForm( $options ) {
        $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
 
        foreach ( $options as $name => $value ) {
-               if ( in_array( $name, array( 'namespace', 'target', 'contribs' ) ) ) {
+               if ( in_array( $name, array( 'namespace', 'target', 'contribs', 'year', 'month' ) ) ) {
                        continue;
                }
                $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
@@ -420,13 +432,15 @@ function contributionsForm( $options ) {
                Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
                Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) . ' '.
                Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
-               xml::monthSelector( $options['month'], -1 ) .
+               Xml::monthSelector( $options['month'], -1 ) . ' '.
                Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-               Xml::closeElement( 'p' ) .
-               '</fieldset>' .
+               Xml::closeElement( 'p' );
+       
+       $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
+       if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
+               $f .= "<p>{$explain}</p>";
+               
+       $f .= '</fieldset>' .
                Xml::closeElement( 'form' );
        return $f;
 }
-
-
-?>