aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Ahinu2007-06-03 22:09:30 +0000
committerGravatar Ahinu2007-06-03 22:09:30 +0000
commitaf394b1077b4f4736daa5ed6b4ab9dd720e204fc (patch)
tree17312acc2c8df9786bad33aa397563fb023601e0 /src/modules
parent*AUTOMATICALLY* updated KVI_SOURCES_DATE variable (diff)
downloadKVIrc-af394b1077b4f4736daa5ed6b4ab9dd720e204fc.tar.gz
KVIrc-af394b1077b4f4736daa5ed6b4ab9dd720e204fc.tar.bz2
KVIrc-af394b1077b4f4736daa5ed6b4ab9dd720e204fc.zip
Quick (and temporary) fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@594 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/reguser/libkvireguser.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 01427867e..e51f35e76 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -882,7 +882,8 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETERS_END(c)
KviIrcMask mask(szMask);
- KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+//FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+ KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
if(u) c->returnValue()->setString(u->name());
return true;
}
@@ -1128,15 +1129,16 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
{
- QString szName;
+ QString szMask;
QString szProperty;
KVSM_PARAMETERS_BEGIN(c)
- KVSM_PARAMETER("user_name",KVS_PT_STRING,0,szName)
+ KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty)
KVSM_PARAMETERS_END(c)
- KviIrcMask mask(szName);
- KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+ KviIrcMask mask(szMask);
+//FIXME: it crashes kvirc KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+ KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
if(u)
{
QString tmp;