ChronosXYZ/psyced
1
0
Fork 0
mirror of https://github.com/ChronosX88/psyced.git synced 2024-11-08 19:41:00 +00:00
Code Issues Projects Releases Wiki Activity

_error_status_person_connected

Browse Source
This commit is contained in:
psyc://psyced.org/~lynX 2011-01-19 15:37:08 +01:00
parent ffe58ced2c
commit 6b8e138eb4
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/default/de/plain.textdb
View File

@ -692,7 +692,7 @@ _error_status_place_chosen
|Du bist bereits in einem Raum. |Du bist bereits in einem Raum.
_error_status_person_connected _error_status_person_connected
|Tut mir Leid, aber %O ist schon da. Wählen Sie bitte einen anderen Namen. |Tut mir Leid, aber [_nick] ist schon da. Wählen Sie bitte einen anderen Namen.
_error_status_person_display_none _error_status_person_display_none
|Das geht nicht. Du musst zuerst aufhören [_nick_target] zu ignorieren. |Das geht nicht. Du musst zuerst aufhören [_nick_target] zu ignorieren.

2
world/default/en/plain.textdb
View File

@ -635,7 +635,7 @@ _error_rejected_query_location
|You're currently not permitted to request the location. |You're currently not permitted to request the location.
_error_status_person_connected _error_status_person_connected
|This person is already connected. |Sorry. [_nick] is already connected. Please pick a different name.
_failure_filter_strangers _failure_filter_strangers
|[_nick] has not enabled messages from strangers. |[_nick] has not enabled messages from strangers.

4
world/net/common.c
View File

@ -43,9 +43,7 @@ connect(nick, pw) {
return; return;
} }
if (user->online() && user->vQuery("ip") != query_ip_number()) { if (user->online() && user->vQuery("ip") != query_ip_number()) {
w("_error_status_person_connected", w("_error_status_person_connected", 0,
"Sorry. [_nick] is already here.\
Please pick a different name.",
([ "_nick": nick ]) ); ([ "_nick": nick ]) );
return; return;
} }

4
world/net/library.i
View File

@ -874,6 +874,10 @@ varargs mixed sendmsg(mixed target, string mc, mixed data, vamapping vars,
register_target(target, o); register_target(target, o);
o -> msg(source, mc, data, vars); o -> msg(source, mc, data, vars);
return 3; return 3;
#endif
#ifdef RTMP_PATH
case "rtmp":
return 0; // unreachable
#endif #endif
} }
if (schemes[u[UScheme]]) if (schemes[u[UScheme]])

4
world/net/person.c
View File

@ -1037,6 +1037,7 @@ case "_request_location":
return 0; return 0;
case "_request_link": case "_request_link":
case "_set_password": case "_set_password":
PT(("_request_link for %O\n", ME))
// TODO: shouldn't we use some kind of observer pattern on the // TODO: shouldn't we use some kind of observer pattern on the
// current_interactive to become aware of disconnects? // current_interactive to become aware of disconnects?
// at least if the current interactive is not a server2server // at least if the current interactive is not a server2server
@ -1067,7 +1068,8 @@ case "_set_password":
// we are a newbie. reject the // we are a newbie. reject the
// kick-out request. // kick-out request.
sendmsg(source, sendmsg(source,
"_error_status_person_connected"); "_error_status_person_connected", 0,
([ "_nick": MYNICK ]));
return 0; return 0;
} }
// we are a legitimate new client. // we are a legitimate new client.

3
world/net/server.c
View File

@ -164,8 +164,7 @@ authChecked(int result, ni, try, elm) {
&& user->vQuery("ip") != query_ip_number() && user->vQuery("ip") != query_ip_number()
#endif #endif
) { ) {
pr("_error_status_person_connected", w("_error_status_person_connected", 0, ([ "_nick": nick ]) );
"Sorry. %O is already connected.\n", nick);
QUIT QUIT
} }
#endif #endif