flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

20150427.6

Browse source
This commit is contained in:
flash 2015-04-27 17:04:27 +00:00
parent 70038cff73
commit 54f430572c
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
_sakura/changelog.json
View file

@ -13,7 +13,8 @@
"20150427.2", "20150427.2",
"20150427.3", "20150427.3",
"20150427.4", "20150427.4",
"20150427.5" "20150427.5",
"20150427.6"
] ]
@ -758,6 +759,19 @@
"change": "Redid avatar serving script." "change": "Redid avatar serving script."
} }
],
"20150427.6": [
{
"type": "FIX",
"change": "Hide abyss'd users."
},
{
"type": "REM",
"change": "Remove origin check on CloudFlare country header."
}
] ]
} }

11
_sakura/components/Main.php
View file

@ -407,14 +407,9 @@ class Main {
// Get country code from CloudFlare header (which just returns EU if not found) // Get country code from CloudFlare header (which just returns EU if not found)
public static function getCountryCode() { public static function getCountryCode() {
// Check if remote IP is a CloudFlare IP // Check if the required header is set and return it
if(self::checkCFIP($_SERVER['REMOTE_ADDR'])) { if(isset($_SERVER['HTTP_CF_IPCOUNTRY']))
return $_SERVER['HTTP_CF_IPCOUNTRY'];
// 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 as a fallback
return 'EU'; return 'EU';

2
_sakura/sakura.php
View file

@ -8,7 +8,7 @@
namespace Sakura; namespace Sakura;
// Define Sakura version // Define Sakura version
define('SAKURA_VERSION', '20150427.5'); define('SAKURA_VERSION', '20150427.6');
define('SAKURA_VLABEL', 'Heliotrope'); define('SAKURA_VLABEL', 'Heliotrope');
define('SAKURA_VTYPE', 'Development'); define('SAKURA_VTYPE', 'Development');
define('SAKURA_COLOUR', '#DF73FF'); define('SAKURA_COLOUR', '#DF73FF');

2
_sakura/templates/yuuno/main/profile.tpl
View file

@ -1,5 +1,5 @@
{% include 'global/header.tpl' %} {% 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;"> <div class="content standalone" style="padding: 20px;">
<h1>The requested user does not exist!</h1> <h1>The requested user does not exist!</h1>
There are a few possible reasons for this: There are a few possible reasons for this: