20150427.6
This commit is contained in:
parent
70038cff73
commit
54f430572c
4 changed files with 20 additions and 11 deletions
|
@ -13,7 +13,8 @@
|
|||
"20150427.2",
|
||||
"20150427.3",
|
||||
"20150427.4",
|
||||
"20150427.5"
|
||||
"20150427.5",
|
||||
"20150427.6"
|
||||
|
||||
]
|
||||
|
||||
|
@ -758,6 +759,19 @@
|
|||
"change": "Redid avatar serving script."
|
||||
}
|
||||
|
||||
],
|
||||
|
||||
"20150427.6": [
|
||||
|
||||
{
|
||||
"type": "FIX",
|
||||
"change": "Hide abyss'd users."
|
||||
},
|
||||
{
|
||||
"type": "REM",
|
||||
"change": "Remove origin check on CloudFlare country header."
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
}
|
||||
|
|
|
@ -407,15 +407,10 @@ class Main {
|
|||
// Get country code from CloudFlare header (which just returns EU if not found)
|
||||
public static function getCountryCode() {
|
||||
|
||||
// Check if remote IP is a CloudFlare IP
|
||||
if(self::checkCFIP($_SERVER['REMOTE_ADDR'])) {
|
||||
|
||||
// Check if the required header is set and return it
|
||||
if(isset($_SERVER['HTTP_CF_IPCOUNTRY']))
|
||||
return $_SERVER['HTTP_CF_IPCOUNTRY'];
|
||||
|
||||
}
|
||||
|
||||
// Return EU as a fallback
|
||||
return 'EU';
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
namespace Sakura;
|
||||
|
||||
// Define Sakura version
|
||||
define('SAKURA_VERSION', '20150427.5');
|
||||
define('SAKURA_VERSION', '20150427.6');
|
||||
define('SAKURA_VLABEL', 'Heliotrope');
|
||||
define('SAKURA_VTYPE', 'Development');
|
||||
define('SAKURA_COLOUR', '#DF73FF');
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% include 'global/header.tpl' %}
|
||||
{% if profile.notset or profile.user.id == 0 %}
|
||||
{% if profile.notset or profile.user.id == 0 or profile.user.password_algo == 'nologin' %}
|
||||
<div class="content standalone" style="padding: 20px;">
|
||||
<h1>The requested user does not exist!</h1>
|
||||
There are a few possible reasons for this:
|
||||
|
|
Reference in a new issue