[Fmsystem-commits] [9949] sms: more on pswin

[Sigurd Nes]

Revision: 9949
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9949
Author:   sigurdne
Date:     2012-08-31 09:41:01 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
sms: more on pswin

Modified Paths:
--------------
    trunk/sms/inc/class.sms.inc.php
    trunk/sms/inc/plugin/gateway/pswin/get.php

Modified: trunk/sms/inc/class.sms.inc.php
===================================================================
--- trunk/sms/inc/class.sms.inc.php     2012-08-31 09:06:16 UTC (rev 9948)
+++ trunk/sms/inc/class.sms.inc.php     2012-08-31 09:41:01 UTC (rev 9949)
@@ -420,6 +420,14 @@
                        {
                        //      $db_query = "SELECT uid,email,mobile FROM 
phpgw_sms_tblUser WHERE username='$target_user'";
                                $uid = 
$GLOBALS['phpgw']->accounts->name2id($target_user);
+                               if(!$uid)
+                               {
+                                       //Try lowercase
+                                       if($target_user == 'Admins')
+                                       {
+                                               $uid = 
$GLOBALS['phpgw']->accounts->name2id('admins');
+                                       }
+                               }
                        //      $GLOBALS['phpgw']->preferences->account_id = 
$uid;
                        //      $GLOBALS['phpgw']->preferences->read();
                                $mobile = 
$GLOBALS['phpgw_info']['user']['preferences']['sms']['cellphone'];
@@ -427,13 +435,10 @@
 
                                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')
-                                       ";
+                                       $message = 
$this->db->db_addslashes(ucfirst(strtolower($message)));
 
+                                       $db_query = "INSERT INTO 
phpgw_sms_tbluserinbox (in_sender,in_uid,in_msg,in_datetime) VALUES 
('$sms_sender',$uid,'$message','$sms_datetime')";
+
                                        
$this->db->query($db_query,__LINE__,__FILE__);
 
                                        if ($cek_ok = 
$this->db->get_last_insert_id(phpgw_sms_tbluserinbox,'in_id'))

Modified: trunk/sms/inc/plugin/gateway/pswin/get.php
===================================================================
--- trunk/sms/inc/plugin/gateway/pswin/get.php  2012-08-31 09:06:16 UTC (rev 
9948)
+++ trunk/sms/inc/plugin/gateway/pswin/get.php  2012-08-31 09:41:01 UTC (rev 
9949)
@@ -57,7 +57,7 @@
                                }
                                
                            $array_target_code = explode(' ',$message);
-//_debug_array($array_target_code);
+
                            $target_code = 
strtoupper(trim($array_target_code[0]));
 
                            $message = $array_target_code[1];
@@ -67,9 +67,10 @@
                                        $message .= " {$array_target_code[$i]}";
                            }
                                
-                               $sms_datetime   = $entry['entry_date'];
+                               $sms_datetime   = 
date($GLOBALS['phpgw']->db->datetime_format(),$entry['entry_date']);
                                $sms_sender             = 
$entry['data']->m->SenderNumber;
 /*
+_debug_array($array_target_code);
 _debug_array($sms_datetime);
 _debug_array($sms_sender);
 _debug_array($target_code);
@@ -93,7 +94,7 @@
 
                        $options=array();
                        $options['soap_version']        = SOAP_1_2;
-                       $options['location']            = 
'http://localhost/~sn5607/savannah_trunk/sms/inc/plugin/gateway/pswin/soap.php?domain=bbb';//$this->pswin_param['receive_url'];
+                       $options['location']            = 
$this->pswin_param['receive_url'];
                        $options['uri']                         = 
"http://localhost/~sn5607/savannah_trunk/sms/inc/plugin/gateway/pswin/soap.php";;
                        $options['trace']                       = 1;
                //      $options['proxy_host']          = 
$this->pswin_param['proxy_host'];
@@ -124,7 +125,5 @@
                        $result = $ReturnValue->ReceiveSMSMessageResult;
 
                        _debug_array($result);
-
-
                }
        }