nur benutzernamen übermitteln
authorSandro Knauß <knauss@netzguerilla.net>
Fri, 18 Nov 2011 22:47:25 +0100
changeset 70 a9ee0fe847a8
parent 69 67ecea2d9b67
child 71 0f3063b5e96b
nur benutzernamen übermitteln
iro/acounting.py
iro/user.py
--- a/iro/acounting.py	Fri Nov 18 22:36:50 2011 +0100
+++ b/iro/acounting.py	Fri Nov 18 22:47:25 2011 +0100
@@ -13,7 +13,7 @@
         self.id=id
         if user:
             self.connect()
-            self.cursor.execute ("INSERT INTO %s (id,user) VALUES ('%s','%s')" % (self.connection['overview'], self.id,user.name))
+            self.cursor.execute ("INSERT INTO %s (id,user) VALUES ('%s','%s')" % (self.connection['overview'], self.id, user))
             self.disconnect()
 
 
--- a/iro/user.py	Fri Nov 18 22:36:50 2011 +0100
+++ b/iro/user.py	Fri Nov 18 22:47:25 2011 +0100
@@ -83,7 +83,7 @@
         '''
         if not "sms" in self.features:
             raise NotSupportedFeature("sms")
-        id = self.jobqueue.newSMS(message,recipients,provider,user=self)
+        id = self.jobqueue.newSMS(message,recipients,provider,user=self.name)
         self.jobs[id]=self.jobqueue[id]
         return id
     
@@ -100,7 +100,7 @@
             fax=[fax]
         f=[i.data for i in fax]
 
-        id = self.jobqueue.newFAX(subject, f,recipients,provider,user=self)
+        id = self.jobqueue.newFAX(subject, f,recipients,provider,user=self.name)
         self.jobs[id]=self.jobqueue[id]
         return id
 
@@ -108,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,user=self)
+        id = self.jobqueue.newMail(subject, body, recipients, frm,  provider,user=self.name)
         self.jobs[id]=self.jobqueue[id]
         return id