remove obfuscate option and add rememberchannel. fixes #105

pyweb/mumble/forms.py

@@ -110,8 +110,6 @@ class MumbleForm( PropertyModelForm ):
     passwd  = forms.CharField( required=False, help_text=_(
         "Password required to join. Leave empty for public servers.") )
     supw    = forms.CharField( required=False, widget=forms.PasswordInput )
-    obfsc   = forms.BooleanField( required=False, help_text=_(
-        "If on, IP adresses of the clients are not logged.") )
     player  = forms.CharField( required=False )
     channel = forms.CharField( required=False )
     defchan = forms.TypedChoiceField( choices=(), coerce=int, required=False )
@@ -119,6 +117,9 @@ class MumbleForm( PropertyModelForm ):
     certreq = forms.BooleanField( required=False )
     textlen = forms.IntegerField( required=False )
     html    = forms.BooleanField( required=False )
+    rememchn= forms.BooleanField( required=False, help_text=_(
+        "Remember the channel users were in when they quit, and automatically move them to "
+        "that channel when they join.") )
 
     def __init__( self, *args, **kwargs ):
         PropertyModelForm.__init__( self, *args, **kwargs )

pyweb/mumble/models.py

@@ -215,11 +215,11 @@ class Mumble( models.Model ):
     textlen = mk_config_property( "textmessagelength",      ugettext_noop("Maximum length of text messages") )
     usersperchannel = mk_config_property( "usersperchannel",ugettext_noop("Users per channel"),  get_coerce=int )
 
-    obfsc   = mk_config_bool_property( "obfuscate",         ugettext_noop("IP Obfuscation") )
     certreq = mk_config_bool_property( "certrequired",      ugettext_noop("Require Certificate") )
     html    = mk_config_bool_property( "allowhtml",         ugettext_noop("Allow HTML to be used in messages") )
     bonjour = mk_config_bool_property( "bonjour",           ugettext_noop("Publish this server via Bonjour") )
     autoboot= mk_config_bool_property( "boot",              ugettext_noop("Boot Server when Murmur starts") )
+    rememchn= mk_config_bool_property( "rememberchannel",   ugettext_noop("Remember last channel") )
 
     def get_absolute_url( self ):
         from views import show