iro/user.py
changeset 69 67ecea2d9b67
parent 67 d1912509f375
child 70 a9ee0fe847a8
--- a/iro/user.py	Thu Nov 03 22:47:30 2011 +0100
+++ b/iro/user.py	Fri Nov 18 22:36:50 2011 +0100
@@ -31,9 +31,10 @@
     '''
     class for a xmlrpc user
     '''
-    def __init__(self,jobqueue):
+    def __init__(self, name, jobqueue):
         self.jobqueue=jobqueue
         self.jobs={}
+        self.name=name
         self.features=["mail", "sms", "fax", ]
 
     def status(self,id=None,detailed=False):
@@ -82,7 +83,7 @@
         '''
         if not "sms" in self.features:
             raise NotSupportedFeature("sms")
-        id = self.jobqueue.newSMS(message,recipients,provider)
+        id = self.jobqueue.newSMS(message,recipients,provider,user=self)
         self.jobs[id]=self.jobqueue[id]
         return id
     
@@ -94,7 +95,12 @@
         logger.debug("startFAX(%s,%s,%s,%s)"%(subject, fax, recipients, provider))
         if not "fax" in self.features:
             raise NotSupportedFeature("fax")
-        id = self.jobqueue.newFAX(subject, fax,recipients,provider)
+        
+        if type(fax) != list:
+            fax=[fax]
+        f=[i.data for i in fax]
+
+        id = self.jobqueue.newFAX(subject, f,recipients,provider,user=self)
         self.jobs[id]=self.jobqueue[id]
         return id
 
@@ -102,7 +108,7 @@
         if not "mail" in self.features:
             raise NotSupportedFeature("mail")
         logger.debug("startMail(%s,%s,%s,%s,%s)"%(subject, body, recipients, frm, provider))
-        id = self.jobqueue.newMail(subject, body, recipients, frm,  provider)
+        id = self.jobqueue.newMail(subject, body, recipients, frm,  provider,user=self)
         self.jobs[id]=self.jobqueue[id]
         return id    
        
@@ -119,6 +125,6 @@
         return self.jobqueue.providerlist.getDefault(name)["name"]
         
 class Admin(User):
-    def __init__(self,jobqueue):
-        User.__init__(self, jobqueue)
+    def __init__(self, name, jobqueue):
+        User.__init__(self, name, jobqueue)
         self.jobs=jobqueue.jobs