From 6ec7990c90d53b022e43363a39e471b5b7db990b Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sun, 2 May 2010 12:42:16 +0200 Subject: [PATCH] support multiple addresses to be entered in the address field --- pyweb/mumble/models.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py index e83fcc9..0c2608c 100644 --- a/pyweb/mumble/models.py +++ b/pyweb/mumble/models.py @@ -276,8 +276,12 @@ class Mumble( models.Model ): self.ctl.setConf( self.srvid, 'registername', self.name ); - if self.addr and self.addr != '0.0.0.0': - self.ctl.setConf( self.srvid, 'host', get_ipv46_str_by_name(self.addr) ); + if self.addr: + if " " in self.addr: + # user gave multiple addresses, don't mess with that + self.ctl.setConf( self.srvid, 'host', self.addr ); + else: + self.ctl.setConf( self.srvid, 'host', get_ipv46_str_by_name(self.addr) ); else: self.ctl.setConf( self.srvid, 'host', '' ); @@ -502,6 +506,8 @@ class Mumble( models.Model ): return self.display; else: daddr = self.display; + elif " " in self.addr: + daddr = self.addr.split(" ")[0]; else: daddr = self.addr;