$sk = $wgUser->getSkin();
$dbr =& wfGetDB( DB_SLAVE );
$userCond = "";
+ $namespace = $wgRequest->getVal( 'namespace', '' );
+ if( $namespace != '' ) {
+ $namespace = IntVal( $namespace );
+ } else {
+ $namespace = NULL;
+ }
$nt = Title::newFromURL( $target );
if ( !$nt ) {
$wgOut->errorpage( 'notargettitle', 'notargettext' );
return;
}
- $nt->setNamespace( Namespace::getUser() );
+ $nt =& Title::makeTitle( NS_USER, $nt->getDBkey() );
$id = User::idFromName( $nt->getText() );
}
$talk = $nt->getTalkPage();
if( $talk ) {
- $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText(Namespace::getTalk(0)) ) . ')';
+ $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) ) . ')';
}
$wgOut->setSubtitle( wfMsg( 'contribsub', $ul ) );
if ( $hideminor ) {
- $cmq = 'AND cur_minor_edit=0';
- $omq = 'AND old_minor_edit=0';
- $mlink = $sk->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
- WfMsg( 'show' ), "target=" . htmlspecialchars( $nt->getPrefixedURL() ) .
- "&offset={$offset}&limit={$limit}&hideminor=0" );
+ $minorQuery = "AND rev_minor_edit=0";
+ $mlink = $sk->makeKnownLink( $wgContLang->specialPage( "Contributions" ),
+ WfMsg( "show" ), "target=" . htmlspecialchars( $nt->getPrefixedURL() ) .
+ "&offset={$offset}&limit={$limit}&hideminor=0&namespace={$namespace}" );
} else {
- $cmq = $omq = '';
+ $minorQuery = "";
$mlink = $sk->makeKnownLink( $wgContLang->specialPage( "Contributions" ),
WfMsg( 'hide' ), 'target=' . htmlspecialchars( $nt->getPrefixedURL() ) .
- "&offset={$offset}&limit={$limit}&hideminor=1" );
+ "&offset={$offset}&limit={$limit}&hideminor=1&namespace={$namespace}" );
}
-
- extract( $dbr->tableNames( 'old', 'cur' ) );
- if ( $userCond == '' ) {
- $sql = "SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit,cur_is_new,cur_user_text FROM $cur " .
- "WHERE cur_user_text='" . $dbr->strencode( $nt->getText() ) . "' {$cmq} " .
- "ORDER BY inverse_timestamp LIMIT {$querylimit}";
- $res1 = $dbr->query( $sql, $fname );
-
- $sql = "SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit,old_user_text,old_id FROM $old " .
- "WHERE old_user_text='" . $dbr->strencode( $nt->getText() ) . "' {$omq} " .
- "ORDER BY inverse_timestamp LIMIT {$querylimit}";
- $res2 = $dbr->query( $sql, $fname );
+
+ if( !is_null($namespace) ) {
+ $minorQuery .= " AND page_namespace = {$namespace}";
+ }
+
+ extract( $dbr->tableNames( 'page', 'revision' ) );
+ if ( $userCond == "" ) {
+ $condition = "rev_user_text=" . $dbr->addQuotes( $nt->getText() );
+ $index = 'usertext_timestamp';
} else {
- $sql = "SELECT cur_namespace,cur_title,cur_timestamp,cur_comment,cur_minor_edit,cur_is_new,cur_user_text FROM $cur " .
- "WHERE cur_user {$userCond} {$cmq} ORDER BY inverse_timestamp LIMIT {$querylimit}";
- $res1 = $dbr->query( $sql, $fname );
-
- $sql = "SELECT old_namespace,old_title,old_timestamp,old_comment,old_minor_edit,old_user_text,old_id FROM $old " .
- "WHERE old_user {$userCond} {$omq} ORDER BY inverse_timestamp LIMIT {$querylimit}";
- $res2 = $dbr->query( $sql, $fname );
+ $condition = "rev_user {$userCond}";
+ $index = 'user_timestamp';
}
- $nCur = $dbr->numRows( $res1 );
- $nOld = $dbr->numRows( $res2 );
+
+
+ $use_index = $dbr->useIndexClause( $index );
+ $sql = "SELECT
+ page_namespace,page_title,page_is_new,page_latest,
+ rev_id,rev_timestamp,rev_comment,rev_minor_edit,rev_user_text
+ FROM $page,$revision $use_index
+ WHERE page_id=rev_page AND $condition $minorQuery " .
+ "ORDER BY rev_timestamp DESC LIMIT {$querylimit}";
+ $res = $dbr->query( $sql, $fname );
+ $numRows = $dbr->numRows( $res );
+
+ $wgOut->addHTML( namespaceForm( $target, $hideminor, $namespace ) );
$top = wfShowingResults( $offset, $limit );
$wgOut->addHTML( "<p>{$top}\n" );
$sl = wfViewPrevNext( $offset, $limit,
- $wgContLang->specialpage( 'Contributions' ),
- "hideminor={$hideminor}&target=" . wfUrlEncode( $target ),
- ($nCur + $nOld) <= $offlimit);
+ $wgContLang->specialpage( "Contributions" ),
+ "hideminor={$hideminor}&namespace={$namespace}&target=" . wfUrlEncode( $target ),
+ ($numRows) <= $offlimit);
- $shm = wfMsg( 'showhideminor', $mlink );
+ $shm = wfMsg( "showhideminor", $mlink );
$wgOut->addHTML( "<br />{$sl} ($shm)</p>\n");
- if ( 0 == $nCur && 0 == $nOld ) {
- $wgOut->addHTML( "\n<p>" . wfMsg( 'nocontribs' ) . "</p>\n" );
+ if ( 0 == $numRows ) {
+ $wgOut->addHTML( "\n<p>" . wfMsg( "nocontribs" ) . "</p>\n" );
return;
}
- if ( 0 != $nCur ) { $obj1 = $dbr->fetchObject( $res1 ); }
- if ( 0 != $nOld ) { $obj2 = $dbr->fetchObject( $res2 ); }
$wgOut->addHTML( "<ul>\n" );
- for( $n = 0; $n < $offlimit; $n++ ) {
- if ( 0 == $nCur && 0 == $nOld ) { break; }
-
- if ( ( 0 == $nOld ) ||
- ( ( 0 != $nCur ) &&
- ( $obj1->cur_timestamp >= $obj2->old_timestamp ) ) ) {
- $ns = $obj1->cur_namespace;
- $t = $obj1->cur_title;
- $ts = $obj1->cur_timestamp;
- $comment =$obj1->cur_comment;
- $me = $obj1->cur_minor_edit;
- $isnew = $obj1->cur_is_new;
- $usertext = $obj1->cur_user_text;
-
- $obj1 = $dbr->fetchObject( $res1 );
- $topmark = true;
- $oldid = false;
- --$nCur;
- } else {
- $ns = $obj2->old_namespace;
- $t = $obj2->old_title;
- $ts = $obj2->old_timestamp;
- $comment =$obj2->old_comment;
- $me = $obj2->old_minor_edit;
- $usertext = $obj2->old_user_text;
- $oldid = $obj2->old_id;
-
- $obj2 = $dbr->fetchObject( $res2 );
- $topmark = false;
- $isnew = false;
- --$nOld;
- }
- if( $n >= $offset )
- ucListEdit( $sk, $ns, $t, $ts, $topmark, $comment, ( $me > 0), $isnew, $usertext, $oldid );
+ while( $obj = $dbr->fetchObject( $res ) ) {
+ ucListEdit( $sk,
+ $obj->page_namespace,
+ $obj->page_title,
+ $obj->rev_timestamp,
+ ($obj->rev_id == $obj->page_latest),
+ $obj->rev_comment,
+ ($obj->rev_minor_edit),
+ $obj->page_is_new,
+ $obj->rev_user_text,
+ $obj->rev_id );
}
$wgOut->addHTML( "</ul>\n" );
- # Validations
- global $wgUseValidation;
- if( $wgUseValidation ) {
- require_once( 'SpecialValidate.php' );
- $val = new Validation ;
- $val = $val->countUserValidations ( $id ) ;
- $wgOut->addHTML( wfMsg ( 'val_user_validations', $val ) );
- }
-
- $wgOut->addHTML( "<br />{$sl} ($shm)</p>\n");
+ $wgOut->addHTML( "<br />{$sl} ($shm)\n");
}
* @todo This would probably look a lot nicer in a table.
*/
function ucListEdit( $sk, $ns, $t, $ts, $topmark, $comment, $isminor, $isnew, $target, $oldid ) {
+ $fname = 'ucListEdit';
+ wfProfileIn( $fname );
+
global $wgLang, $wgOut, $wgUser, $wgRequest;
- $page = Title::makeName( $ns, $t );
- $link = $sk->makeKnownLink( $page, '' );
+ static $messages;
+ if( !isset( $messages ) ) {
+ foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
+ $messages[$msg] = wfMsg( $msg );
+ }
+ }
+
+ $page =& Title::makeTitle( $ns, $t );
+ $link = $sk->makeKnownLinkObj( $page, '' );
$difftext = $topmarktext = '';
if($topmark) {
- $topmarktext .= '<strong>' . wfMsg('uctop') . '</strong>';
+ $topmarktext .= '<strong>' . $messages['uctop'] . '</strong>';
if(!$isnew) {
- $difftext .= $sk->makeKnownLink( $page, '(' . wfMsg('diff') . ')', 'diff=0' );
+ $difftext .= $sk->makeKnownLinkObj( $page, '(' . $messages['diff'] . ')', 'diff=0' );
} else {
- $difftext .= wfMsg('newarticle');
+ $difftext .= $messages['newarticle'];
}
if( $wgUser->isAllowed('rollback') ) {
$extraRollback = $wgRequest->getBool( 'bot' ) ? '&bot=1' : '';
+ $extraRollback .= '&token=' . urlencode(
+ $wgUser->editToken( array( $page->getPrefixedText(), $target ) ) );
# $target = $wgRequest->getText( 'target' );
- $topmarktext .= ' ['. $sk->makeKnownLink( $page,
- wfMsg( 'rollbacklink' ),
- 'action=rollback&from=' . urlencode( $target ) . $extraRollback ) .']';
+ $topmarktext .= ' ['. $sk->makeKnownLinkObj( $page,
+ $messages['rollbacklink'],
+ 'action=rollback&from=' . urlencode( $target ) . $extraRollback ) .']';
}
}
if ( $oldid ) {
- $difftext= $sk->makeKnownLink( $page, '('.wfMsg('diff').')', 'diff=prev&oldid='.$oldid );
+ $difftext= $sk->makeKnownLinkObj( $page, '(' . $messages['diff'].')', 'diff=prev&oldid='.$oldid );
}
- $histlink='('.$sk->makeKnownLink($page,wfMsg('hist'),'action=history').')';
-
- if($comment) {
-
- $comment='<em>('. $sk->formatComment($comment, Title::newFromText($t) ) .')</em> ';
+ $histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')';
+ if( $comment ) {
+ $comment = '<em>(' . $sk->formatComment( $comment, $page ) . ')</em> ';
}
$d = $wgLang->timeanddate( $ts, true );
if ($isminor) {
- $mflag = '<span class="minor">'.wfMsg( 'minoreditletter' ).'</span> ';
+ $mflag = '<span class="minor">' . $messages['minoreditletter'] . '</span> ';
} else {
$mflag = '';
}
$wgOut->addHTML( "<li>{$d} {$histlink} {$difftext} {$mflag} {$link} {$comment} {$topmarktext}</li>\n" );
+ wfProfileOut( $fname );
}
/**
"{$d}", "target={$target}&days={$d}&limit={$lim}" );
return $s;
}
+
+/**
+ * Generates a form used to restrict display of contributions
+ * to a specific namespace
+ *
+ * @return none
+ * @param string $target target user to show contributions for
+ * @param string $hideminor whether minor contributions are hidden
+ * @param string $namespace currently selected namespace, NULL for show all
+ */
+function namespaceForm ( $target, $hideminor, $namespace ) {
+ global $wgContLang, $wgScript;
+
+ $namespaceselect = '<select name="namespace">';
+ $namespaceselect .= '<option value="" '.(is_null($namespace) ? ' selected="selected"' : '').'>'.wfMsg( 'all' ).'</option>';
+ $arr = $wgContLang->getNamespaces();
+ foreach( array_keys( $arr ) as $i ) {
+ if( $i < 0 ) {
+ continue;
+ }
+ $namespacename = str_replace ( "_", " ", $arr[$i] );
+ $n = ($i == 0) ? wfMsg ( 'articlenamespace' ) : $namespacename;
+ $sel = ($i === $namespace) ? ' selected="selected"' : '';
+ $namespaceselect .= "<option value='{$i}'{$sel}>{$n}</option>";
+ }
+ $namespaceselect .= '</select>';
+
+ $submitbutton = '<input type="submit" value="' . wfMsg( 'allpagessubmit' ) . '" />';
+
+ $out = "<div class='namespaceselector'><form method='get' action='{$wgScript}'>";
+ $out .= '<input type="hidden" name="title" value="'.$wgContLang->specialpage( 'Contributions' ).'" />';
+ $out .= '<input type="hidden" name="target" value="'.htmlspecialchars( $target ).'" />';
+ $out .= '<input type="hidden" name="hideminor" value="'.$hideminor.'" />';
+ $out .= wfMsg ( 'allpagesformtext2', $namespaceselect, $submitbutton );
+ $out .= '</form></div>';
+ return $out;
+}
?>
dépôts / lhc / web / wiklou.git / blobdiff