From 2c2755ea57a67e850ca9cbc8d0d6b94bcf2b993b Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 15 Dec 2009 00:44:53 +0100 Subject: [PATCH] apparently, people CAN register without an email address, so check each registration field individually. fixes #45 --- pyweb/mumble/MumbleCtlIce.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py index 731eeec..6f97bce 100644 --- a/pyweb/mumble/MumbleCtlIce.py +++ b/pyweb/mumble/MumbleCtlIce.py @@ -316,10 +316,11 @@ class MumbleCtlIce_120(MumbleCtlIce_118): def getRegistration(self, srvid, mumbleid): from Murmur import UserInfo reg = self._getIceServerObject( srvid ).getRegistration( mumbleid ) - user = { - 'name': reg[UserInfo.UserName], - 'email': reg[UserInfo.UserEmail], - }; + user = {}; + if UserInfo.UserName in reg: + user['name'] = reg[UserInfo.UserName]; + if UserInfo.UserEmail in reg: + user['email'] = reg[UserInfo.UserEmail]; if UserInfo.UserComment in reg: user['comment'] = reg[UserInfo.UserComment]; if UserInfo.UserHash in reg: