1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00

use the UNick

This commit is contained in:
psyc://psyced.org/~lynX 2009-03-04 11:27:19 +01:00
parent 8e4e990261
commit 6fd2423ff9
17 changed files with 52 additions and 56 deletions

View file

@ -120,7 +120,7 @@ object find_psyc_object(array(mixed) u) {
string t, r, svc, user;
object o;
user = u[UUser];
user = u[UNick];
r = u[UResource];
if (r && strlen(r)) {
#if __EFUN_DEFINED__(trim)
@ -132,13 +132,6 @@ object find_psyc_object(array(mixed) u) {
if (strlen(r)) switch(r[0]) {
case '^':
case '~':
if (user) {
// croak("_error_invalid_uniform_user_duplicate",
// "Two users in uniform not allowed here.");
// QUIT
return 0; // TODO!
}
user = r[1..];
break;
case '$':
// target wird auf serv/args gesetzt

View file

@ -988,7 +988,7 @@ protected int deliver(mixed ip, string host, string mc, string buffer, mapping c
}
#ifdef NONIX
if (strlen(u[UResource]) > 1)
cvars["_INTERNAL_nick_target"] = u[UResource][1..];
cvars["_INTERNAL_nick_target"] = u[UNick];
#endif
P3(("DEBUG: is_localhost is %O for %O of %O\n",
is_localhost(u[UHost]), u[UHost], u))