Revised design of Special:Userlogin

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

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index 83f026f..b54a9a3 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -1,6 +1,21 @@
 <?php
 /**
- * Functions for dealing with proxies
+ * Functions for dealing with proxies.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
  */
@@ -13,6 +28,7 @@
  * @return string
  */
 function wfGetForwardedFor() {
+       wfDeprecated( __METHOD__, '1.19' );
        global $wgRequest;
        return $wgRequest->getHeader( 'X-Forwarded-For' );
 }
@@ -25,7 +41,7 @@ function wfGetForwardedFor() {
  * @return string
  */
 function wfGetAgent() {
-       wfDeprecated( __FUNCTION__ );
+       wfDeprecated( __METHOD__, '1.18' );
        global $wgRequest;
        return $wgRequest->getHeader( 'User-Agent' );
 }
@@ -38,23 +54,34 @@ function wfGetAgent() {
  * @return string
  */
 function wfGetIP() {
+       wfDeprecated( __METHOD__, '1.19' );
        global $wgRequest;
        return $wgRequest->getIP();
 }
 
 /**
- * Checks if an IP is a trusted proxy providor
- * Useful to tell if X-Fowarded-For data is possibly bogus
- * Squid cache servers for the site and AOL are whitelisted
+ * Checks if an IP is a trusted proxy provider.
+ * Useful to tell if X-Forwarded-For data is possibly bogus.
+ * Squid cache servers for the site are whitelisted.
+ *
  * @param $ip String
  * @return bool
  */
 function wfIsTrustedProxy( $ip ) {
-       global $wgSquidServers, $wgSquidServersNoPurge;
+       $trusted = wfIsConfiguredProxy( $ip );
+       wfRunHooks( 'IsTrustedProxy', array( &$ip, &$trusted ) );
+       return $trusted;
+}
 
+/**
+ * Checks if an IP matches a proxy we've configured.
+ * @param $ip String
+ * @return bool
+ */
+function wfIsConfiguredProxy( $ip ) {
+       global $wgSquidServers, $wgSquidServersNoPurge;
        $trusted = in_array( $ip, $wgSquidServers ) ||
                in_array( $ip, $wgSquidServersNoPurge );
-       wfRunHooks( 'IsTrustedProxy', array( &$ip, &$trusted ) );
        return $trusted;
 }
 
@@ -82,7 +109,7 @@ function wfProxyCheck() {
        if ( !$skip ) {
                $title = SpecialPage::getTitleFor( 'Blockme' );
                $iphash = md5( $ip . $wgProxyKey );
-               $url = $title->getFullURL( 'ip='.$iphash );
+               $url = wfExpandUrl( $title->getFullURL( 'ip=' . $iphash ), PROTO_HTTP );
 
                foreach ( $wgProxyPorts as $port ) {
                        $params = implode( ' ', array(