War on cruft: commentBlock() usage, use a styled <span> for comments instead of mix...

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

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index b2f535b..cd57458 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -1,7 +1,14 @@
 <?php
-
-function wfSpecialIpblocklist()
-{
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
+function wfSpecialIpblocklist() {
        global $wgUser, $wgOut, $wgRequest;
        
        $ip = $wgRequest->getVal( 'wpUnblockAddress', $wgRequest->getVal( 'ip' ) );
@@ -11,10 +18,11 @@ function wfSpecialIpblocklist()
        $ipu = new IPUnblockForm( $ip, $reason );
 
        if ( "success" == $action ) {
-               $msg = wfMsg( "ipusuccess", $ip );
+               $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;
                }
@@ -26,6 +34,11 @@ function wfSpecialIpblocklist()
        }
 }
 
+/**
+ * 
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class IPUnblockForm {
        var $ip, $reason;
        
@@ -51,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}\">
@@ -74,12 +88,12 @@ class IPUnblockForm {
                        </td>
                </tr>
        </table>
+       <input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
        }
        
-       function doSubmit()
-       {
+       function doSubmit() {
                global $wgOut, $wgUser, $wgLang;
 
                $block = new Block();
@@ -96,9 +110,8 @@ class IPUnblockForm {
                $block->delete();
 
                # Make log entry
-               $log = new LogPage( wfMsg( "blocklogpage" ), wfMsg( "blocklogtext" ) );
-               $action = wfMsg( "unblocklogentry", $this->ip );
-               $log->addEntry( $action, $this->reason );
+               $log = new LogPage( 'block' );
+               $log->addEntry( 'unblock', Title::makeTitle( NS_USER, $this->ip ), $this->reason );
 
                # Report to the user
                $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
@@ -106,8 +119,7 @@ class IPUnblockForm {
                $wgOut->redirect( $success );
        }
 
-       function showList( $msg )
-       {
+       function showList( $msg ) {
                global $wgOut;
                
                $wgOut->setPagetitle( wfMsg( "ipblocklist" ) );
@@ -120,9 +132,11 @@ class IPUnblockForm {
        }
 }
 
-# Callback function to output a block
+/**
+ * Callback function to output a block
+ */
 function wfAddRow( $block, $tag ) {
-       global $wgOut, $wgUser, $wgLang;
+       global $wgOut, $wgUser, $wgLang, $wgContLang;
 
        $sk = $wgUser->getSkin();
 
@@ -130,7 +144,7 @@ function wfAddRow( $block, $tag ) {
        $addr = $block->mAuto ? "#{$block->mId}" : $block->mAddress;
 
        $name = User::whoIs( $block->mBy );
-       $ulink = $sk->makeKnownLink( $wgLang->getNsText( Namespace::getUser() ). ":{$name}", $name );
+       $ulink = $sk->makeKnownLinkObj( Title::makeTitle( NS_USER, $name ), $name );
        $formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
        
        if ( $block->mExpiry === "" ) {
@@ -150,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" );
 }