[Fmsystem-commits] [8089] SMS: update

[Sigurd Nes]

Revision: 8089
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8089
Author:   sigurdne
Date:     2011-11-11 17:10:55 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
SMS: update

Modified Paths:
--------------
    trunk/sms/inc/class.sms.inc.php

Modified: trunk/sms/inc/class.sms.inc.php
===================================================================
--- trunk/sms/inc/class.sms.inc.php     2011-11-11 14:59:53 UTC (rev 8088)
+++ trunk/sms/inc/class.sms.inc.php     2011-11-11 17:10:55 UTC (rev 8089)
@@ -427,10 +427,11 @@
 
                                if ($uid)
                                {
+                                       $message = 
$this->db->db_addslashes($message);
                                        $db_query = "
                                        INSERT INTO phpgw_sms_tbluserinbox
                                        (in_sender,in_uid,in_msg,in_datetime)
-                                       VALUES 
('$sms_sender','$uid','$message','$sms_datetime')
+                                       VALUES 
('$sms_sender',$uid,'$message','$sms_datetime')
                                        ";
 
                                        
$this->db->query($db_query,__LINE__,__FILE__);
@@ -834,6 +835,11 @@
                // and sets the action
                function 
setsmsincomingaction($sms_datetime,$sms_sender,$target_code,$message)
                {
+                       if(!strtotime($sms_datetime))
+                       {
+                               $sms_datetime = $this->datetime_now();
+                       }
+
                        $message = utf8_encode($message);
                        $target_code = utf8_encode($target_code);
                        $ok = false;
@@ -919,7 +925,7 @@
                        }
                        if (!$ok)
                        {
-                               $message = $target_code." ".$message;
+                               $message = "{$target_code} {$message}";
                                if 
($this->insertsmstoinbox($sms_datetime,$sms_sender,"Admins",$message))
                                {
                                        $ok = true;