Commit 4b3383b4 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 31be78e2 0d0e1f43
...@@ -579,7 +579,7 @@ CLIENT_get_authorize_key = (client) -> ...@@ -579,7 +579,7 @@ CLIENT_get_authorize_key = (client) ->
if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
return client.name return client.name
else if !settings.modules.mycard.enabled and client.vpass else if !settings.modules.mycard.enabled and client.vpass
return client.vpass + ":" + client.name return client.vpass + "$" + client.name
else else
return client.ip + ":" + client.name return client.ip + ":" + client.name
......
...@@ -759,7 +759,7 @@ ...@@ -759,7 +759,7 @@
if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) { if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) {
return client.name; return client.name;
} else if (!settings.modules.mycard.enabled && client.vpass) { } else if (!settings.modules.mycard.enabled && client.vpass) {
return client.vpass + ":" + client.name; return client.vpass + "$" + client.name;
} else { } else {
return client.ip + ":" + client.name; return client.ip + ":" + client.name;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment