X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialIpblocklist.php;h=492f78db26c9d6c45f22974087ac75af71e6617e;hb=bdc10a03f312b31ad37e162f5704fbba169d1f88;hp=87d9e390388c114a812223d23a66e48dc85389b4;hpb=bfc788180a6a84677a73fc2ef0853f3217723c3d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 87d9e39038..492f78db26 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -6,7 +6,7 @@
  */
 
 /**
- *
+ * @todo document
  */
 function wfSpecialIpblocklist() {
 	global $wgUser, $wgOut, $wgRequest;
@@ -20,8 +20,9 @@ function wfSpecialIpblocklist() {
 	if ( "success" == $action ) {
 		$msg = wfMsg( "ipusuccess", htmlspecialchars( $ip ) );
 		$ipu->showList( $msg );
-	} else if ( "submit" == $action && $wgRequest->wasPosted() ) {
-		if ( ! $wgUser->isSysop() ) {
+	} else if ( "submit" == $action && $wgRequest->wasPosted() &&
+		$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
+		if ( ! $wgUser->isAllowed('block') ) {
 			$wgOut->sysopRequired();
 			return;
 		}
@@ -63,6 +64,7 @@ class IPUnblockForm {
 			$wgOut->setSubtitle( wfMsg( "formerror" ) );
 			$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
 		}
+		$token = htmlspecialchars( $wgUser->editToken() );
 		
 		$wgOut->addHTML( "
 <form id=\"unblockip\" method=\"post\" action=\"{$action}\">
@@ -86,6 +88,7 @@ class IPUnblockForm {
 			</td>
 		</tr>
 	</table>
+	<input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
 	}
@@ -141,7 +144,7 @@ function wfAddRow( $block, $tag ) {
 	$addr = $block->mAuto ? "#{$block->mId}" : $block->mAddress;
 
 	$name = User::whoIs( $block->mBy );
-	$ulink = $sk->makeKnownLink( $wgContLang->getNsText( Namespace::getUser() ). ":{$name}", $name );
+	$ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
 	$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
 	
 	if ( $block->mExpiry === "" ) {
@@ -161,17 +164,14 @@ function wfAddRow( $block, $tag ) {
 		$wgOut->addHTML( " ({$clink})" );
 	}
 
-	if ( $wgUser->isSysop() ) {
+	if ( $wgUser->isAllowed('block') ) {
 		$titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
 		$ublink = "<a href=\"" . 
 		  $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
 		  wfMsg( "unblocklink" ) . "</a>";
 		$wgOut->addHTML( " ({$ublink})" );
 	}
-	if ( "" != $block->mReason ) {
-		$wgOut->addHTML( " <em>(" . htmlspecialchars( $block->mReason ) .
-		  ")</em>" );
-	}
+	$wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
 	$wgOut->addHTML( "</li>\n" );
 }