Making INNER JOIN implicit

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

diff --git a/includes/SpecialBlockme.php b/includes/SpecialBlockme.php
index c3524e4..da68805 100644 (file)
--- a/includes/SpecialBlockme.php
+++ b/includes/SpecialBlockme.php
@@ -1,27 +1,24 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  *
  */
-function wfSpecialBlockme()
-{
-       global $wgBlockOpenProxies, $wgOut, $wgProxyKey;
+function wfSpecialBlockme() {
+       global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey;
 
-       $ip = ProxyTools::getIP();
+       $ip = wfGetIP();
 
-       if ( !$wgBlockOpenProxies || $_REQUEST['ip'] != md5( $ip . $wgProxyKey ) ) {
-               $wgOut->addWikiText( wfMsg( "disabled" ) );
+       if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
+               $wgOut->addWikiMsg( 'proxyblocker-disabled' );
                return;
        }
 
        $blockerName = wfMsg( "proxyblocker" );
        $reason = wfMsg( "proxyblockreason" );
-       $success = wfMsg( "proxyblocksuccess" );
 
        $u = User::newFromName( $blockerName );
        $id = $u->idForName();
@@ -36,6 +33,5 @@ function wfSpecialBlockme()
        $block = new Block( $ip, 0, $id, $reason, wfTimestampNow() );
        $block->insert();
 
-       $wgOut->addWikiText( $success );
+       $wgOut->addWikiMsg( "proxyblocksuccess" );
 }
-?>