fix sms sending

wcs/qommon/sms.py

@@ -128,11 +128,15 @@ class OxydSMS:
             elif number.startswith('0'):
                 # local prefix, remove 0 and add default country code
                 number = self.default_country_code + number[1:]
+            params = urllib.urlencode({
+                'id': self.user,
+                'pass': self.password,
+                'num': number,
+                'sms': text,
+                'flash': '0'
+                })
             try:
-                r = urllib2.urlopen('http://sms.oxyd.fr/send.php?id=%s&pass=%s&num=%s&sms=%s&flash=0' % (
-                        self.user, self.password,
-                        number,
-                        text))
+                r = urllib2.urlopen('http://sms.oxyd.fr/send.php', params)
             except Exception, e:
                 # XXX: add proper handling of errors
                 raise errors.SMSError('urlopen oxyd.fr failed : %s' % e)

wcs/workflows.py

@@ -1093,8 +1093,9 @@ class SendSMSWorkflowStatusItem(WorkflowStatusItem):
 
         sms_cfg = get_cfg('sms', {})
         sender = sms_cfg.get('sender', 'AuQuotidien')[:11]
+        mode = sms_cfg.get('mode', 'none')
         try:
-            SMS.get_sms_class().send([self.compute(x) for x in self.to], sms_body[:160], sender)
+            SMS.get_sms_class(mode).send(sender, [self.compute(x) for x in self.to], sms_body[:160])
         except qommon.errors.SMSError, e:
             get_logger().error(e)