--- a/iro/joblist.py Thu Nov 03 22:47:30 2011 +0100
+++ b/iro/joblist.py Fri Nov 18 22:36:50 2011 +0100
@@ -12,7 +12,7 @@
#along with this program; if not, see <http://www.gnu.org/licenses/>.
from anbieter import content
-import md5, os, time
+import hashlib, os, time
import logging
logger=logging.getLogger("iro.joblist");
@@ -31,42 +31,42 @@
def __getitem__(self,key):
return self.jobs[key]
- def __registerJob__(self, job):
+ def __registerJob__(self, job, user):
id = self._createID()
if self.dbconn:
job.setAcounting(self.manager.Acounting(id,self.dbconn))
- job.setId(id)
+ job.setId(id, user)
self.jobs[id]=job
self.queue.put(job)
return id
- def newSMS(self, message, recipients, provider="default"):
+ def newSMS(self, message, recipients, provider="default", user=None):
'''
creates a new SMS
'''
job=self.manager.SMSJob(self.providerlist, provider,message, content.SMS(message),recipients)
- return self.__registerJob__(job)
+ return self.__registerJob__(job,user)
- def newFAX(self,subject, fax,recipients,provider="default"):
+ def newFAX(self,subject, fax,recipients,provider="default",user=None):
'''
creates a new Fax
'''
job=self.manager.FaxJob(self.providerlist, provider,subject, content.FAX(subject,'' ,fax),recipients)
- return self.__registerJob__(job)
+ return self.__registerJob__(job,user)
- def newMail(self, subject, body, recipients, frm, provider="default"):
+ def newMail(self, subject, body, recipients, frm, provider="default",user=None):
'''
creates a new Mail
'''
job=self.manager.MailJob(self.providerlist, provider,subject, content.Mail(subject, body, frm),recipients)
- return self.__registerJob__(job)
+ return self.__registerJob__(job,user)
def _createID(self):
'''
creats a random hash id
'''
while True:
- m = md5.new()
+ m = hashlib.sha1()
m.update(str(time.time()))
m.update(os.urandom(10))
if not self.jobs.has_key(m.hexdigest):