ignore case when checking for mhf_alex or mhf_steve

This commit is contained in:
jomo 2016-01-20 00:12:53 +01:00
parent 5b1ad851ef
commit b9f6a21942
3 changed files with 9 additions and 6 deletions

View File

@ -7,7 +7,8 @@ var url = require("url");
function handle_default(img_status, userId, size, def, req, err, callback) { function handle_default(img_status, userId, size, def, req, err, callback) {
def = def || skins.default_skin(userId); def = def || skins.default_skin(userId);
if (def !== "steve" && def !== "mhf_steve" && def !== "alex" && def !== "mhf_alex") { var defname = def.toLowerCase();
if (defname !== "steve" && defname !== "mhf_steve" && defname !== "alex" && defname !== "mhf_alex") {
if (helpers.id_valid(def)) { if (helpers.id_valid(def)) {
// clean up the old URL to match new image // clean up the old URL to match new image
var parsed = req.url; var parsed = req.url;
@ -29,7 +30,7 @@ function handle_default(img_status, userId, size, def, req, err, callback) {
} }
} else { } else {
// handle steve and alex // handle steve and alex
def = def.toLowerCase(); def = defname;
if (def.substr(0, 4) !== "mhf_") { if (def.substr(0, 4) !== "mhf_") {
def = "mhf_" + def; def = "mhf_" + def;
} }

View File

@ -12,7 +12,8 @@ var fs = require("fs");
// overlay is query param // overlay is query param
function handle_default(rid, scale, overlay, body, img_status, userId, size, def, req, err, callback) { function handle_default(rid, scale, overlay, body, img_status, userId, size, def, req, err, callback) {
def = def || skins.default_skin(userId); def = def || skins.default_skin(userId);
if (def !== "steve" && def !== "mhf_steve" && def !== "alex" && def !== "mhf_alex") { var defname = def.toLowerCase();
if (defname !== "steve" && defname !== "mhf_steve" && defname !== "alex" && defname !== "mhf_alex") {
if (helpers.id_valid(def)) { if (helpers.id_valid(def)) {
// clean up the old URL to match new image // clean up the old URL to match new image
var parsed = req.url; var parsed = req.url;
@ -34,7 +35,7 @@ function handle_default(rid, scale, overlay, body, img_status, userId, size, def
} }
} else { } else {
// handle steve and alex // handle steve and alex
def = def.toLowerCase(); def = defname;
if (def.substr(0, 4) !== "mhf_") { if (def.substr(0, 4) !== "mhf_") {
def = "mhf_" + def; def = "mhf_" + def;
} }

View File

@ -8,7 +8,8 @@ var url = require("url");
function handle_default(img_status, userId, def, req, err, callback) { function handle_default(img_status, userId, def, req, err, callback) {
def = def || skins.default_skin(userId); def = def || skins.default_skin(userId);
if (def !== "steve" && def !== "mhf_steve" && def !== "alex" && def !== "mhf_alex") { var defname = def.toLowerCase();
if (defname !== "steve" && defname !== "mhf_steve" && defname !== "alex" && defname !== "mhf_alex") {
if (helpers.id_valid(def)) { if (helpers.id_valid(def)) {
// clean up the old URL to match new image // clean up the old URL to match new image
var parsed = req.url; var parsed = req.url;
@ -30,7 +31,7 @@ function handle_default(img_status, userId, def, req, err, callback) {
} }
} else { } else {
// handle steve and alex // handle steve and alex
def = def.toLowerCase(); def = defname;
if (def.substr(0, 4) !== "mhf_") { if (def.substr(0, 4) !== "mhf_") {
def = "mhf_" + def; def = "mhf_" + def;
} }