Refactors the check if a particular IP is in the list of configured squid servers...

diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index bdab3be..aa4ce44 100644 (file)
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -53,11 +53,20 @@ function wfGetIP() {
  * @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;
 }