* $wgAllowExternalImagesFrom may now be an array of multiple strings.
* Introduced $wgEnableImageWhitelist to toggle the on-wiki external image
whitelist on or off.
-* $wgProxyKey has been fully deprecated (marked as such since 1.4, never
- seems to have been completed). $wgSecretKey is the official documented
- setting now.
=== New features in 1.14 ===
\$wgLanguageCode = \"{$slconf['LanguageCode']}\";
-\$wgSecretKey = \"$secretKey\";
+\$wgProxyKey = \"$secretKey\";
## Default skin: you can change the default skin. Use the internal symbolic
## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
$wgSecretKey = false;
/** big list of banned IP addresses, in the keys not the values */
$wgProxyList = array();
+/** deprecated */
+$wgProxyKey = false;
/** Number of accounts each IP address may create, 0 to disable.
* Requires memcached */
function wfProxyCheck() {
global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
global $wgMemc, $wgProxyMemcExpiry;
- global $wgSecretKey;
+ global $wgProxyKey;
if ( !$wgBlockOpenProxies ) {
return;
# Fork the processes
if ( !$skip ) {
$title = SpecialPage::getTitleFor( 'Blockme' );
- $iphash = md5( $ip . $wgSecretKey );
+ $iphash = md5( $ip . $wgProxyKey );
$url = $title->getFullURL( 'ip='.$iphash );
foreach ( $wgProxyPorts as $port ) {
wfProfileOut( $fname.'-includes' );
wfProfileIn( $fname.'-misc1' );
-# Override SecretKey with ProxyKey if a site is using the old setting
-if ( isset( $wgProxyKey ) ) {
- $wgSecretKey = $wgProxyKey;
-}
$wgIP = false; # Load on demand
# Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
* @private
*/
function setToken( $token = false ) {
- global $wgSecretKey;
+ global $wgSecretKey, $wgProxyKey;
$this->load();
if ( !$token ) {
if ( $wgSecretKey ) {
$key = $wgSecretKey;
+ } elseif ( $wgProxyKey ) {
+ $key = $wgProxyKey;
} else {
$key = microtime();
}
*
*/
function wfSpecialBlockme() {
- global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgSecretKey;
+ global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey;
$ip = wfGetIP();
- if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgSecretKey ) ) {
+ if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
$wgOut->addWikiMsg( 'proxyblocker-disabled' );
return;
}