Remove $wgIP global, but add a hook instead.

This allows extensions to "make mediawiki ignore ips completely", as requested earlier today in #mediawiki

diff --git a/docs/hooks.txt b/docs/hooks.txt
index bbc1bed..e9c972e 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -826,6 +826,9 @@ $title: Title object of page
 $url: string value as output (out parameter, can modify)
 $query: query options passed to Title::getInternalURL()
 
+'GetIP': modify the ip of the current user (called only once)
+&$ip: string holding the ip as determined so far
+
 'GetLinkColours': modify the CSS class of an array of page links
 $linkcolour_ids: array of prefixed DB keys of the pages linked to,
        indexed by page_id.

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 60ff360..a0c48a2 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -68,15 +68,15 @@ function wfGetAgent() {
  * @return string
  */
 function wfGetIP() {
-       global $wgIP, $wgUsePrivateIPs, $wgCommandLineMode;
+       global $wgUsePrivateIPs, $wgCommandLineMode;
+       static $ip = false;
 
        # Return cached result
-       if ( !empty( $wgIP ) ) {
-               return $wgIP;
+       if ( !empty( $ip ) ) {
+               return $ip;
        }
 
        $ipchain = array();
-       $ip = false;
 
        /* collect the originating ips */
        # Client connecting to this webserver
@@ -112,12 +112,14 @@ function wfGetIP() {
                }
        }
 
+       # Allow extensions to improve our guess
+       wfRunHooks( 'GetIP', array( &$ip ) );
+
        if( !$ip ) {
                throw new MWException( "Unable to determine IP" );
        }
 
        wfDebug( "IP: $ip\n" );
-       $wgIP = $ip;
        return $ip;
 }
 

diff --git a/includes/Setup.php b/includes/Setup.php
index 002c128..b2f87e7 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -182,7 +182,6 @@ wfSuppressWarnings();
 date_default_timezone_set( date_default_timezone_get() );
 wfRestoreWarnings();
 
-$wgIP = false; # Load on demand
 # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
 $wgRequest = new WebRequest;