| Index: trunk/phase3/includes/ProxyTools.php |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | function wfProxyCheck() { |
| 140 | 140 | global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath; |
| 141 | 141 | global $wgMemc, $wgProxyMemcExpiry; |
| 142 | | - global $wgProxyKey; |
| | 142 | + global $wgSecretKey; |
| 143 | 143 | |
| 144 | 144 | if ( !$wgBlockOpenProxies ) { |
| 145 | 145 | return; |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | # Fork the processes |
| 156 | 156 | if ( !$skip ) { |
| 157 | 157 | $title = SpecialPage::getTitleFor( 'Blockme' ); |
| 158 | | - $iphash = md5( $ip . $wgProxyKey ); |
| | 158 | + $iphash = md5( $ip . $wgSecretKey ); |
| 159 | 159 | $url = $title->getFullURL( 'ip='.$iphash ); |
| 160 | 160 | |
| 161 | 161 | foreach ( $wgProxyPorts as $port ) { |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1650,13 +1650,11 @@ |
| 1651 | 1651 | * @private |
| 1652 | 1652 | */ |
| 1653 | 1653 | function setToken( $token = false ) { |
| 1654 | | - global $wgSecretKey, $wgProxyKey; |
| | 1654 | + global $wgSecretKey; |
| 1655 | 1655 | $this->load(); |
| 1656 | 1656 | if ( !$token ) { |
| 1657 | 1657 | if ( $wgSecretKey ) { |
| 1658 | 1658 | $key = $wgSecretKey; |
| 1659 | | - } elseif ( $wgProxyKey ) { |
| 1660 | | - $key = $wgProxyKey; |
| 1661 | 1659 | } else { |
| 1662 | 1660 | $key = microtime(); |
| 1663 | 1661 | } |
| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -150,6 +150,10 @@ |
| 151 | 151 | wfProfileOut( $fname.'-includes' ); |
| 152 | 152 | wfProfileIn( $fname.'-misc1' ); |
| 153 | 153 | |
| | 154 | +# Override SecretKey with ProxyKey if a site is using the old setting |
| | 155 | +if ( isset( $wgProxyKey ) ) { |
| | 156 | + $wgSecretKey = $wgProxyKey; |
| | 157 | +} |
| 154 | 158 | |
| 155 | 159 | $wgIP = false; # Load on demand |
| 156 | 160 | # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1357,8 +1357,6 @@ |
| 1358 | 1358 | $wgSecretKey = false; |
| 1359 | 1359 | /** big list of banned IP addresses, in the keys not the values */ |
| 1360 | 1360 | $wgProxyList = array(); |
| 1361 | | -/** deprecated */ |
| 1362 | | -$wgProxyKey = false; |
| 1363 | 1361 | |
| 1364 | 1362 | /** Number of accounts each IP address may create, 0 to disable. |
| 1365 | 1363 | * Requires memcached */ |
| Index: trunk/phase3/includes/specials/SpecialBlockme.php |
| — | — | @@ -8,11 +8,11 @@ |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | 11 | function wfSpecialBlockme() { |
| 12 | | - global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey; |
| | 12 | + global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgSecretKey; |
| 13 | 13 | |
| 14 | 14 | $ip = wfGetIP(); |
| 15 | 15 | |
| 16 | | - if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) { |
| | 16 | + if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgSecretKey ) ) { |
| 17 | 17 | $wgOut->addWikiMsg( 'proxyblocker-disabled' ); |
| 18 | 18 | return; |
| 19 | 19 | } |
| Index: trunk/phase3/config/index.php |
| — | — | @@ -1706,7 +1706,7 @@ |
| 1707 | 1707 | |
| 1708 | 1708 | \$wgLanguageCode = \"{$slconf['LanguageCode']}\"; |
| 1709 | 1709 | |
| 1710 | | -\$wgProxyKey = \"$secretKey\"; |
| | 1710 | +\$wgSecretKey = \"$secretKey\"; |
| 1711 | 1711 | |
| 1712 | 1712 | ## Default skin: you can change the default skin. Use the internal symbolic |
| 1713 | 1713 | ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook': |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -46,6 +46,9 @@ |
| 47 | 47 | * $wgAllowExternalImagesFrom may now be an array of multiple strings. |
| 48 | 48 | * Introduced $wgEnableImageWhitelist to toggle the on-wiki external image |
| 49 | 49 | whitelist on or off. |
| | 50 | +* $wgProxyKey has been fully deprecated (marked as such since 1.4, never |
| | 51 | + seems to have been completed). $wgSecretKey is the official documented |
| | 52 | + setting now. |
| 50 | 53 | |
| 51 | 54 | === New features in 1.14 === |
| 52 | 55 | |