Browse Source

fix registration for 1.1.8 over ice

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
72672e32f8
  1. 4
      pyweb/mumble/MumbleCtlIce.py
  2. 5
      pyweb/mumble/mmobjects.py

4
pyweb/mumble/MumbleCtlIce.py

@ -215,7 +215,9 @@ class MumbleCtlIce_118(MumbleCtlBase):
@protectDjangoErrPage
def setRegistration(self, srvid, mumbleid, name, email, password):
user = self._getIceServerObject(srvid).getRegistration(mumbleid)
from Murmur import Player
user = Player()
user.playerid = mumbleid;
user.name = name.encode( "UTF-8" )
user.email = email.encode( "UTF-8" )
user.pw = password.encode( "UTF-8" )

5
pyweb/mumble/mmobjects.py

@ -113,8 +113,7 @@ class mmChannel( object ):
def getURL( self, forUser = None ):
"""
Create an URL to connect to this channel. The URL is of the form
""" Create an URL to connect to this channel. The URL is of the form
mumble://username@host:port/parentchans/self.name
"""
userstr = "";
@ -139,7 +138,7 @@ class mmChannel( object ):
connecturl = property( getURL, doc="A convenience wrapper for getURL." );
def setDefault( self ):
"Make this the server's default channel."
""" Make this the server's default channel. """
self.server.defchan = self.chanid;
self.server.save();

Loading…
Cancel
Save