Changeset 576 for trunk/packages

Timestamp:

Jun 2, 2008, 11:45:44 PM (16 years ago)

Author:

ecprice

Message:

Fix a couple more bugs

Location:

trunk/packages/sipb-xen-www/code

Files:

• main.py (modified) (2 diffs)
• validation.py (modified) (1 diff)

trunk/packages/sipb-xen-www/code/main.py

@@ -161 +161 @@
         err = None
     state.clear() #Changed global state
-    d = getListDict(username)
+    d = getListDict(username, state)
     d['err'] = err
     if err:
@@ -336 +336 @@
     if back == 'list':
         state.clear() #Changed global state
-        d = getListDict(username)
+        d = getListDict(username, state)
         d['result'] = result
         return templates.list(searchList=[d])

trunk/packages/sipb-xen-www/code/validation.py

@@ -242 +242 @@
 
 def testContact(user, contact, machine=None):
-    if contact in (None, machine.contact):
+    if contact is None or (machine is not None and contact == machine.contact):
         return None
     if not re.match("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$", contact, re.I):