dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
/**
*
<?php
/**
*
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
*/
/**
*
*/
*/
/**
*
*/
-function wfSpecialBlockme()
-{
- global $wgBlockOpenProxies, $wgOut, $wgProxyKey;
+function wfSpecialBlockme() {
+ global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey;
- $ip =
ProxyTools::g
etIP();
+ $ip =
wfG
etIP();
- if
( !$wgBlockOpenProxies || $_REQUEST['ip']
!= md5( $ip . $wgProxyKey ) ) {
- $wgOut->addWiki
Text( wfMsg( "disabled" )
);
+ if
( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' )
!= md5( $ip . $wgProxyKey ) ) {
+ $wgOut->addWiki
Msg( 'proxyblocker-disabled'
);
return;
}
$blockerName = wfMsg( "proxyblocker" );
$reason = wfMsg( "proxyblockreason" );
return;
}
$blockerName = wfMsg( "proxyblocker" );
$reason = wfMsg( "proxyblockreason" );
- $success = wfMsg( "proxyblocksuccess" );
$u = User::newFromName( $blockerName );
$id = $u->idForName();
$u = User::newFromName( $blockerName );
$id = $u->idForName();
@@
-36,6
+33,5
@@
function wfSpecialBlockme()
$block = new Block( $ip, 0, $id, $reason, wfTimestampNow() );
$block->insert();
$block = new Block( $ip, 0, $id, $reason, wfTimestampNow() );
$block->insert();
- $wgOut->addWiki
Text( $success
);
+ $wgOut->addWiki
Msg( "proxyblocksuccess"
);
}
}
-?>