phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] sms inc/class.bosms.inc.php inc/class.sms.inc.p...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] sms inc/class.bosms.inc.php inc/class.sms.inc.p...
Date: Wed, 17 May 2006 20:23:25 +0000

CVSROOT:        /sources/phpgroupware
Module name:    sms
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/17 20:23:25

Modified files:
        inc            : class.bosms.inc.php class.sms.inc.php 
                         class.uisms.inc.php 
        inc/plugin/gateway/gnokii: fn.php 
        setup          : tables_current.inc.php 
Added files:
        inc            : class.sosms.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.bosms.inc.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.sms.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.sosms.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.uisms.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/plugin/gateway/gnokii/fn.php.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/setup/tables_current.inc.php.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: sms/inc/class.bosms.inc.php
diff -u sms/inc/class.bosms.inc.php:1.2 sms/inc/class.bosms.inc.php:1.3
--- sms/inc/class.bosms.inc.php:1.2     Tue May 16 19:45:49 2006
+++ sms/inc/class.bosms.inc.php Wed May 17 20:23:25 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage place
-       * @version $Id: class.bosms.inc.php,v 1.2 2006/05/16 19:45:49 sigurdne 
Exp $
+       * @version $Id: class.bosms.inc.php,v 1.3 2006/05/17 20:23:25 sigurdne 
Exp $
        */
 
        /**
@@ -38,7 +38,7 @@
                function bosms($session=False)
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
-                       $this->so               = 
CreateObject($this->currentapp.'.sms');
+                       $this->sms              = 
CreateObject($this->currentapp.'.sms');
        //              $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
 
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
@@ -162,41 +162,19 @@
                                        $unicode = "1";
                                }
                                
-                               list($ok,$to) = 
$this->so->websend2pv($username,$sms_to,$message,$sms_type,$unicode);
+                               list($ok,$to) = 
$this->sms->websend2pv($username,$sms_to,$message,$sms_type,$unicode);
                                for ($i=0;$i<count($ok);$i++)
                                {
                                        if ($ok[$i])
                                        {
+                                               
$receipt['message'][]=array('msg'=>lang('Your SMS for %1 has been delivered to 
queue',$to[$i] ));
                                                $error_string .= "Your SMS for 
`".$to[$i]."` has been delivered to queue<br>";
                                        }
                                        else
                                        {
-                                               $error_string .= "Fail to sent 
SMS to `".$to[$i]."`<br>";
+                                               
$receipt['message'][]=array('msg'=>lang('Fail to sent SMS to %1',$to[$i] ));
                                        }
                                }
-                               
-       //                      header("Location: 
menu.php?inc=send_sms&op=sendsmstopv&message=".urlencode($message)."&err=".urlencode($error_string));
-                       }
-                       else
-                       {
-       //                      header("Location: 
menu.php?inc=send_sms&op=sendsmstopv&message=".urlencode($message)."&err=".urlencode("You
 must select receiver and your message should not be empty"));
-                       }
-
-                       if ($action=='edit')
-                       {
-                               if ($values['place_id'] != '')
-                               {
-
-                                       $receipt = $this->so->edit($values);
-                               }
-                               else
-                               {
-                                       
$receipt['error'][]=array('msg'=>lang('Error'));
-                               }
-                       }
-                       else
-                       {
-                               $receipt = $this->so->add($values);
                        }
 
                        return $receipt;
Index: sms/inc/class.sms.inc.php
diff -u sms/inc/class.sms.inc.php:1.3 sms/inc/class.sms.inc.php:1.4
--- sms/inc/class.sms.inc.php:1.3       Tue May 16 19:45:49 2006
+++ sms/inc/class.sms.inc.php   Wed May 17 20:23:25 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: class.sms.inc.php,v 1.3 2006/05/16 19:45:49 sigurdne 
Exp $
+       * @version $Id: class.sms.inc.php,v 1.4 2006/05/17 20:23:25 sigurdne 
Exp $
        */
 
        /**
@@ -36,18 +36,18 @@
 
        if (file_exists($apps_path[inc] . SEP . 'plugin' . SEP . 'gateway' . 
SEP . $GLOBALS['phpgw_info']['sms_config']['gateway_module']. "/fn.php"))
        {
-           include_once($apps_path[inc] . SEP . 'plugin' . SEP . 'gateway' . 
SEP. $GLOBALS['phpgw_info']['sms_config']['gateway_module']. "/fn.php");
+               include_once($apps_path[inc] . SEP . 'plugin' . SEP . 'gateway' 
. SEP. $GLOBALS['phpgw_info']['sms_config']['gateway_module']. "/fn.php");
        }
        else
        {
-           if (!$GLOBALS['phpgw_info']['sms_config']['gateway_module'])
-           {
+               if (!$GLOBALS['phpgw_info']['sms_config']['gateway_module'])
+               {
                die ("ERROR: Gateway module '" . 
$GLOBALS['phpgw_info']['sms_config']['gateway_module'] . "' does not exists - 
please contact system administrator");
-           }
-           else
-           {
+               }
+               else
+               {
                die("ERROR: No selected gateway module available - please 
contact system administrator");
-           }
+               }
        }
 
        class sms_
@@ -102,445 +102,453 @@
                                        break;
                        }
 
-                       $this->datetime_now = date($this->datetime_format, 
time());
+                       $this->datetime_now     = date($this->datetimeformat, 
time());
                        $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
-
                }
 
                function validatelogin($username,$password)
                {
-                   $db_query = "SELECT password FROM phpgw_sms_tblUser WHERE 
username='$username'";
-                   $db_result = dba_query($db_query);
-                   $db_row = dba_fetch_array($db_result);
-                   $res_password = trim($db_row[password]);
-                   if ($password && $res_password && 
($password==$res_password))
-                   {
+                       $db_query = "SELECT password FROM phpgw_sms_tblUser 
WHERE username='$username'";
+                       $db_result = dba_query($db_query);
+                       $db_row = dba_fetch_array($db_result);
+                       $res_password = trim($db_row[password]);
+                       if ($password && $res_password && 
($password==$res_password))
+                       {
                        $ticket = md5(mktime().$username);
                        return $ticket;
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        return 0;
-                   }
+                       }
                }
                
                function 
valid($var_ticket="",$var_username="",$var_multilogin_id="")
                {
-                   $ticket = $_COOKIE[vc1];
-                   $username = $_COOKIE[vc2];
-                   $multilogin_id = $_COOKIE[vc3];
-                   if ($var_ticket && $var_username && $var_multilogin_id)
-                   {
+                       $ticket = $_COOKIE[vc1];
+                       $username = $_COOKIE[vc2];
+                       $multilogin_id = $_COOKIE[vc3];
+                       if ($var_ticket && $var_username && $var_multilogin_id)
+                       {
                        $ticket = $var_ticket;
                        $username = $var_username;
                        $multilogin_id = $var_multilogin_id;
-                   }
-                   if ($this->apps_config['multilogin'])
-                   {
+                       }
+                       if ($this->apps_config['multilogin'])
+                       {
                        $db_query = "SELECT password FROM phpgw_sms_tblUser 
WHERE username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        if ($multilogin_id && md5($username.$db_row[password]) 
&& ($multilogin_id==md5($username.$db_row[password])))
                        {
-                           return 1;
+                               return 1;
                        }
                        else
                        {
-                           return 0;    
+                               return 0;       
                        }
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        $db_query = "SELECT ticket FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        if ($ticket && $db_row[ticket] && 
($ticket==$db_row[ticket]))
                        {
-                           return 1;
+                               return 1;
                        }
                        else
                        {
-                           return 0;    
+                               return 0;       
+                       }
                        }
-                   }
                }
                
                function 
isadmin($var_ticket="",$var_username="",$var_multilogin_id="")
                {
-                   $ticket = $_COOKIE[vc1];
-                   $username = $_COOKIE[vc2];
-                   $multilogin_id = $_COOKIE[vc3];
-                   if ($var_ticket && $var_username && $var_multilogin_id)
-                   {
+/*
+                       $ticket = $_COOKIE[vc1];
+                       $username = $_COOKIE[vc2];
+                       $multilogin_id = $_COOKIE[vc3];
+                       if ($var_ticket && $var_username && $var_multilogin_id)
+                       {
                        $ticket = $var_ticket;
                        $username = $var_username;
                        $multilogin_id = $var_multilogin_id;
-                   }
-                   if ($this->apps_config['multilogin'])
-                   {
+                       }
+                       if ($this->apps_config['multilogin'])
+                       {
                        $db_query = "SELECT status,password FROM 
phpgw_sms_tblUser WHERE username='$username' AND ticket='$ticket'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        if ($db_row[status] && ($db_row[status]==2) && 
($multilogin_id==md5($username.$db_row[password])))
                        {
-                           return 1;
+                               return 1;
                        }
                        else
                        {
-                           return 0;    
+                               return 0;       
                        }
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        $db_query = "SELECT status FROM phpgw_sms_tblUser WHERE 
username='$username' AND ticket='$ticket'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        if ($db_row[status] && ($db_row[status]==1))
                        {
-                           return 1;
+                               return 1;
                        }
                        else
                        {
-                           return 0;    
+                               return 0;       
+                       }
                        }
-                   }
+*/
+               
+                       return $GLOBALS['phpgw']->acl->check($location = 'run', 
$required = 1, $appname = 'admin');
                }
                
                function forcelogout()
                {
-                   setcookie("vc1");
-                   setcookie("vc2");
-                   setcookie("vc3");
-                   header("Location: goodbye.php");
-                   die();
+                       setcookie("vc1");
+                       setcookie("vc2");
+                       setcookie("vc3");
+                       header("Location: goodbye.php");
+                       die();
                }
                
                function gpid2gpname($gpid)
                {
-                   if ($gpid)
-                   {
+                       if ($gpid)
+                       {
                        $db_query = "SELECT gp_name FROM 
phpgw_sms_tblUserGroupPhonebook WHERE gpid='$gpid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $gp_name = $db_row[gp_name];
-                   }
-                   return $gp_name;
+                       }
+                       return $gp_name;
                }
                
                function gpid2gpcode($gpid)
                {
-                   if ($gpid)
-                   {
+                       if ($gpid)
+                       {
                        $db_query = "SELECT gp_code FROM 
phpgw_sms_tblUserGroupPhonebook WHERE gpid='$gpid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $gp_code = $db_row[gp_code];
-                   }
-                   return $gp_code;
+                       }
+                       return $gp_code;
                }
                
                function gpcode2gpname($uid,$gp_code)
                {
-                   if ($uid && $gp_code)
-                   {
+                       if ($uid && $gp_code)
+                       {
                        $db_query = "SELECT gp_name FROM 
phpgw_sms_tblUserGroupPhonebook WHERE uid='$uid' AND gp_code='$gp_code'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $gp_name = $db_row[gp_name];
-                   }
-                   return $gp_name;
+                       }
+                       return $gp_name;
                }
                
                function gpcode2gpid($uid,$gp_code)
                {
-                   if ($uid && $gp_code)
-                   {
+                       if ($uid && $gp_code)
+                       {
                        $db_query = "SELECT gpid FROM 
phpgw_sms_tblUserGroupPhonebook WHERE uid='$uid' AND gp_code='$gp_code'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $gpid = $db_row[gpid];
-                   }
-                   return $gpid;
+                       }
+                       return $gpid;
                }
                
                function uid2username($uid)
                {
-                   if ($uid)
-                   {
+                       if ($uid)
+                       {
                        $db_query = "SELECT username FROM phpgw_sms_tblUser 
WHERE uid='$uid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $username = $db_row[username];
-                   }
-                   return $username;
+                       }
+                       return $username;
                }
                
                function username2uid($username)
                {
-                   if ($username)
-                   {
-                       $db_query = "SELECT uid FROM phpgw_sms_tblUser WHERE 
username='$username'";
-                       $db_result = dba_query($db_query);
-                       $db_row = dba_fetch_array($db_result);
-                       $uid = $db_row[uid];
-                   }
-                   return $uid;
+                       if ($username)
+                       {
+//                     $db_query = "SELECT uid FROM phpgw_sms_tblUser WHERE 
username='$username'";
+//                     $db_result = dba_query($db_query);
+//                     $db_row = dba_fetch_array($db_result);
+//                     $uid = $db_row[uid];
+                               $uid = 
$GLOBALS['phpgw']->accounts->name2id($username);
+                       }
+
+                       return $uid;
                }
                
                function username2mobile($username)
                {
                   /* if ($username)
-                   {
+                       {
                        $db_query = "SELECT mobile FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $mobile = $db_row[mobile];
-                   }
+                       }
                */      
                        
-                       $GLOBALS['phpgw']->preferences->account_id = 
$this->account;
-                       $GLOBALS['phpgw']->preferences->read_repository();
+               //      $GLOBALS['phpgw']->preferences->account_id = 
$this->account;
+               //      $GLOBALS['phpgw']->preferences->read_repository();
                        $mobile = 
$GLOBALS['phpgw_info']['user']['preferences']['sms']['cellphone'];
-                   return $mobile;
+                       return $mobile;
                }
                
                function username2sender($username)
                {
-                   if ($username)
-                   {
+       /*              if ($username)
+                       {
                        $db_query = "SELECT sender FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $sender = $db_row[sender];
-                   }
-                   return $sender;
+                       }
+       */
+       //              $sender = $GLOBALS['phpgw_info']['user']['fullname'];
+                       
+                       $sender = ' -' . 
$GLOBALS['phpgw_info']['user']['account_lid'];
+                       return $sender;
                }
                
                function username2email($username)
                {
-                   if ($username)
-                   {
+                       if ($username)
+                       {
                        $db_query = "SELECT email FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $email = $db_row[email];
-                   }
-                   return $email;
+                       }
+                       return $email;
                }
                
                function username2name($username)
                {
-                   if ($username)
-                   {
+       /*              if ($username)
+                       {
                        $db_query = "SELECT name FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $name = $db_row[name];
-                   }
-                   return $name;
+                       }
+       */              
+                       $name = $GLOBALS['phpgw_info']['user']['fullname'];
+                       return $name;
                }
                
                function username2status($username)
                {
-                   if ($username)
-                   {
+                       if ($username)
+                       {
                        $db_query = "SELECT status FROM phpgw_sms_tblUser WHERE 
username='$username'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $status = $db_row[status];
-                   }
-                   return $status;
+                       }
+                       return $status;
                }
                
                function pid2pnum($pid)
                {
-                   global $username;
-                   if ($pid)
-                   {
+                       global $username;
+                       if ($pid)
+                       {
                        $uid = username2uid($username);
                        $db_query = "SELECT p_num FROM 
phpgw_sms_tblUserPhonebook WHERE pid='$pid' AND uid='$uid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $p_num = $db_row[p_num];
-                   }
-                   return $p_num;
+                       }
+                       return $p_num;
                }
                
                function pnum2pdesc($p_num)
                {
-                   global $username;
-                   if ($p_num)
-                   {
+                       global $username;
+                       if ($p_num)
+                       {
                        $uid = username2uid($username);
                        $db_query = "SELECT p_desc FROM 
phpgw_sms_tblUserPhonebook WHERE p_num='$p_num' AND uid='$uid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $p_desc = $db_row[p_desc];
-                   }
-                   return $p_desc;
+                       }
+                       return $p_desc;
                }
                
                function pnum2pemail($p_num)
                {
-                   global $username;
-                   if ($p_num)
-                   {
+                       global $username;
+                       if ($p_num)
+                       {
                        $uid = username2uid($username);
                        $db_query = "SELECT p_email FROM 
phpgw_sms_tblUserPhonebook WHERE p_num='$p_num' AND uid='$uid'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
                        $p_email = $db_row[p_email];
-                   }
-                   return $p_email;
+                       }
+                       return $p_email;
                }
                
                /*
                function 
sendmail($mail_from,$mail_to,$mail_subject="",$mail_body="")
                {
-                   if (!class_exists(mime_mail)) 
-                   { 
+                       if (!class_exists(mime_mail)) 
+                       { 
                        include_once 
"$this->apps_path[libs]/gpl/mime_mail.inc.php"; 
-                   }
-                   $mail               = new mime_mail;
-                   $mail->from         = $mail_from;
-                   $mail->to           = $mail_to;
-                   $mail->subject      = $mail_subject;
-                   $mail->body         = $mail_body;
-                   if ($mail->send()) 
-                   { 
+                       }
+                       $mail           = new mime_mail;
+                       $mail->from             = $mail_from;
+                       $mail->to                  = $mail_to;
+                       $mail->subject    = $mail_subject;
+                       $mail->body              = $mail_body;
+                       if ($mail->send()) 
+                       { 
                        $err = true; 
-                   } 
-                   else 
-                   { 
+                       } 
+                       else 
+                       { 
                        $err = false; 
-                   }
-                   unset ($mail);
-                   return $err;
+                       }
+                       unset ($mail);
+                       return $err;
                }
                */
                function 
sendmail($mail_from,$mail_to,$mail_subject="",$mail_body="")
                {
-                   if (!class_exists(email_message_class))
-                   {
+                       if (!class_exists(email_message_class))
+                       {
                        include_once 
$this->apps_path[libs]."/gpl/mimemessage/email_message.php";
-                   }
-                   if (!class_exists(smtp_message_class))
-                   {
+                       }
+                       if (!class_exists(smtp_message_class))
+                       {
                        include_once 
$this->apps_path[libs]."/gpl/mimemessage/smtp_message.php";
-                   }
-                   if (!class_exists(smtp_class))
-                   {
+                       }
+                       if (!class_exists(smtp_class))
+                       {
                        include_once 
$this->apps_path[libs]."/gpl/mimemessage/smtp/smtp.php";
-                   }
+                       }
                
-                   $from_name                  = $mail_from_name;
-                   $from_address               = $mail_from;
-                   $reply_name                 = $from_name;
-                   $reply_address              = $from_address;
-                   $error_delivery_name        = $from_name;
-                   $error_delivery_address     = $from_address;
-                   $to_name                    = $mail_to_name;
-                   $to_address                 = $mail_to;
-                   $cc_name                    = $mail_cc_name;
-                   $cc_address                 = $mail_cc;
-                   $bcc_name                   = $mail_bcc_name;
-                   $bcc_address                = $mail_bcc;
-                   $subject                    = $mail_subject;
-                   $text_message               = $mail_body;
-               
-                   $email_message = new smtp_message_class;
-                   $email_message->localhost           = "localhost";
-                   $email_message->smtp_realm          = _SMTP_RELM_;
-                   $email_message->smtp_user           = _SMTP_USER_;
-                   $email_message->smtp_password       = _SMTP_PASS_;
-                   $email_message->smtp_host           = _SMTP_HOST_;
-                   $email_message->smtp_port           = _SMTP_PORT_;
-                   $email_message->smtp_debug          = 0;
-                   $email_message->smtp_direct_delivery = 0;
+                       $from_name                      = $mail_from_name;
+                       $from_address           = $mail_from;
+                       $reply_name                     = $from_name;
+                       $reply_address          = $from_address;
+                       $error_delivery_name    = $from_name;
+                       $error_delivery_address = $from_address;
+                       $to_name                        = $mail_to_name;
+                       $to_address                     = $mail_to;
+                       $cc_name                        = $mail_cc_name;
+                       $cc_address                     = $mail_cc;
+                       $bcc_name                       = $mail_bcc_name;
+                       $bcc_address            = $mail_bcc;
+                       $subject                        = $mail_subject;
+                       $text_message           = $mail_body;
+               
+                       $email_message = new smtp_message_class;
+                       $email_message->localhost               = "localhost";
+                       $email_message->smtp_realm              = _SMTP_RELM_;
+                       $email_message->smtp_user               = _SMTP_USER_;
+                       $email_message->smtp_password   = _SMTP_PASS_;
+                       $email_message->smtp_host               = _SMTP_HOST_;
+                       $email_message->smtp_port               = _SMTP_PORT_;
+                       $email_message->smtp_debug              = 0;
+                       $email_message->smtp_direct_delivery = 0;
                
-                   
$email_message->SetEncodedEmailHeader("To",$to_address,$to_name);
-                   if ($cc_address)
+                       
$email_message->SetEncodedEmailHeader("To",$to_address,$to_name);
+                       if ($cc_address)
                        
$email_message->SetEncodedEmailHeader("Cc",$cc_address,$cc_name);
-                   if ($bcc_address)
+                       if ($bcc_address)
                        
$email_message->SetEncodedEmailHeader("Bcc",$bcc_address,$bcc_name);
-                   
$email_message->SetEncodedEmailHeader("From",$from_address,$from_name);
-                   
$email_message->SetEncodedEmailHeader("Reply-To",$reply_address,$reply_name);
-                   
$email_message->SetEncodedEmailHeader("Errors-To",$error_delivery_address,$error_delivery_name);
-                   
$email_message->AddQuotedPrintableTextPart($email_message->WrapText($text_message));
-                   /*
-                    *  Set the Return-Path header to define the envelope 
sender address to which bounced messages are delivered.
-                    *  If you are using Windows, you need to use the 
smtp_message_class to set the return-path address.
-                    */
-                   if(defined("PHP_OS") && strcmp(substr(PHP_OS,0,3),"WIN"))
-                       
$email_message->SetHeader("Return-Path",$error_delivery_address);
-                   $email_message->SetEncodedHeader("Subject",$subject);
+                       
$email_message->SetEncodedEmailHeader("From",$from_address,$from_name);
+                       
$email_message->SetEncodedEmailHeader("Reply-To",$reply_address,$reply_name);
+                       
$email_message->SetEncodedEmailHeader("Errors-To",$error_delivery_address,$error_delivery_name);
+                       
$email_message->AddQuotedPrintableTextPart($email_message->WrapText($text_message));
+                       /*
+                        *  Set the Return-Path header to define the envelope 
sender address to which bounced messages are delivered.
+                        *  If you are using Windows, you need to use the 
smtp_message_class to set the return-path address.
+                        */
+                       if(defined("PHP_OS") && 
strcmp(substr(PHP_OS,0,3),"WIN"))
+                               
$email_message->SetHeader("Return-Path",$error_delivery_address);
+                       $email_message->SetEncodedHeader("Subject",$subject);
                
-                   if ($attachment && $filename && $contenttype)
-                   {
+                       if ($attachment && $filename && $contenttype)
+                       {
                        $file_attachment=array(
-                           "Data"=>"$attachment",
-                           "Name"=>"$filename",
-                           "Content-Type"=>"$contenttype",
-                           "Disposition"=>"attachment");
+                               "Data"=>"$attachment",
+                               "Name"=>"$filename",
+                               "Content-Type"=>"$contenttype",
+                               "Disposition"=>"attachment");
                        $email_message->AddFilePart($file_attachment);
-                   }
+                       }
                
-                   /*
-                    *  The message is now ready to be assembled and sent.
-                    *  Notice that most of the functions used before this 
point may fail due to
-                    *  programming errors in your script. You may safely 
ignore any errors until
-                    *  the message is sent to not bloat your scripts with too 
much error checking.
-                    */
-                   $error = $email_message->Send();
-                   if (strcmp ($error, ""))
+                       /*
+                        *  The message is now ready to be assembled and sent.
+                        *  Notice that most of the functions used before this 
point may fail due to
+                        *  programming errors in your script. You may safely 
ignore any errors until
+                        *  the message is sent to not bloat your scripts with 
too much error checking.
+                        */
+                       $error = $email_message->Send();
+                       if (strcmp ($error, ""))
                        return false;
-                   else
+                       else
                        return true;
                }
                
                
                function 
websend2pv($username,$sms_to,$message,$sms_type="text",$unicode="0")
                {
-                   $datetime_now = $this->datetime_now;
-                   $gateway_module = $this->gateway_module;
-
+                       $datetime_now = $this->datetime_now;
+                       $gateway_module = $this->gateway_module; 
                        $uid = $this->account;
-//                 $uid = $this->username2uid($username);
-                   $mobile_sender = $this->username2mobile($username);
-                   $max_length = 160;
-                   if ($sms_sender = $this->username2sender($username))
-                   {
+
+                       $mobile_sender = $this->username2mobile($username);
+                       $max_length = 160;
+                       if ($sms_sender = $this->username2sender($username))
+                       {
                        $max_length = $max_length - strlen($sms_sender) - 1;
-                   }
-                   if (strlen($message)>$max_length)
-                   {
-                       $message = substr ($message,0,$max_length-1);
-                   }
-                   $sms_msg = $message;
-                   $sms_msg = str_replace("\r","",$sms_msg);
-                   $sms_msg = str_replace("\n","",$sms_msg);
-                   $sms_msg = str_replace("\""," ",$sms_msg);
-                   $mobile_sender = str_replace("\'","",$mobile_sender);
-                   $mobile_sender = str_replace("\"","",$mobile_sender);
-                   $sms_sender = str_replace("\'","",$sms_sender);
-                   $sms_sender = str_replace("\"","",$sms_sender);
-                   if (is_array($sms_to))
-                   {
+                       }
+                       if (strlen($message)>$max_length)
+                       {
+                               $message = substr ($message,0,$max_length-1);
+                       }
+                       $sms_msg = $message;
+                       $sms_msg = str_replace("\r","",$sms_msg);
+                       $sms_msg = str_replace("\n","",$sms_msg);
+                       $sms_msg = str_replace("\""," ",$sms_msg);
+                       $mobile_sender = str_replace("\'","",$mobile_sender);
+                       $mobile_sender = str_replace("\"","",$mobile_sender);
+                       $sms_sender = str_replace("\'","",$sms_sender);
+                       $sms_sender = str_replace("\"","",$sms_sender);
+                       if (is_array($sms_to))
+                       {
                        $array_sms_to = $sms_to;
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        $array_sms_to[0] = $sms_to;
-                   }
-                   for ($i=0;$i<count($array_sms_to);$i++)
-                   {
+                       }
+                       for ($i=0;$i<count($array_sms_to);$i++)
+                       {
                        $c_sms_to = str_replace("\'","",$array_sms_to[$i]);
                        $c_sms_to = str_replace("\"","",$array_sms_to[$i]);
-                       $db_query = "
-                           INSERT INTO phpgw_sms_tblSMSOutgoing 
-                           
(uid,p_gateway,p_src,p_dst,p_footer,p_msg,p_datetime,p_sms_type,unicode) 
-                           VALUES 
('$uid','$gateway_module','$mobile_sender','$c_sms_to','$sms_sender','$message','$datetime_now','$sms_type','$unicode')
-                       ";
+                       $db_query = "INSERT INTO phpgw_sms_tblSMSOutgoing 
+                               
(uid,p_gateway,p_src,p_dst,p_footer,p_msg,p_datetime,p_sms_type,unicode) 
+                               VALUES 
('$uid','$gateway_module','$mobile_sender','$c_sms_to','$sms_sender','$message','$datetime_now','$sms_type','$unicode')";
                
                        
$GLOBALS['phpgw']->db->query($db_query,__LINE__,__FILE__);
                        $smslog_id = 
$GLOBALS['phpgw']->db->get_last_insert_id(phpgw_sms_tblSMSOutgoing,'smslog_id');
@@ -550,87 +558,87 @@
                        $ok[$i] = 0;
                        if ($smslog_id)
                        {
-                           if 
(gw_send_sms($mobile_sender,$sms_sender,$c_sms_to,$sms_msg,$gp_code,$uid,$smslog_id,$sms_type,$unicode))
-                           {
+                               if 
($this->gw_send_sms($mobile_sender,$sms_sender,$c_sms_to,$sms_msg,$gp_code,$uid,$smslog_id,$sms_type,$unicode))
+                               {
                                $ok[$i] = $smslog_id;
-                           }
+                               }
+                       }
                        }
-                   }
-                   return array($ok,$to);
+                       return array($ok,$to);
                }
                
                function 
websend2group($username,$gp_code,$message,$sms_type="text")
                {
-                   $datetime_now = $this->datetime_now;
-                   $gateway_module = $this->gateway_module;
-                   $uid = username2uid($username);
-                   $mobile_sender = username2mobile($username);
-                   $max_length = 160;
-                   if ($sms_sender = username2sender($username))
-                   {
+                       $datetime_now = $this->datetime_now;
+                       $gateway_module = $this->gateway_module;
+                       $uid = username2uid($username);
+                       $mobile_sender = $this->username2mobile($username);
+                       $max_length = 160;
+                       if ($sms_sender = $this->username2sender($username))
+                       {
                        $max_length = $max_length - strlen($sms_sender) - 1;
-                   }
-                   if (strlen($message)>$max_length)
-                   {
-                       $message = substr ($message,0,$max_length-1);
-                   }
-                   if (is_array($gp_code))
-                   {
+                       }
+                       if (strlen($message)>$max_length)
+                       {
+                               $message = substr ($message,0,$max_length-1);
+                       }
+                       if (is_array($gp_code))
+                       {
                        $array_gp_code = $gp_code;
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        $array_gp_code[0] = $gp_code;
-                   }
-                   $j=0;
-                   for ($i=0;$i<count($array_gp_code);$i++)
-                   {
+                       }
+                       $j=0;
+                       for ($i=0;$i<count($array_gp_code);$i++)
+                       {
                        $c_gp_code = strtoupper($array_gp_code[$i]);
                        $gpid = gpcode2gpid($uid,$c_gp_code);
                        $db_query = "SELECT * FROM phpgw_sms_tblUserPhonebook 
WHERE gpid='$gpid'";
                        $db_result = dba_query($db_query);
                        while ($db_row = dba_fetch_array($db_result))
                        {
-                           $p_num = $db_row[p_num];
-                           $sms_to = $p_num;
-                           $sms_msg = $message;
-                           $sms_msg = str_replace("\r","",$sms_msg);
-                           $sms_msg = str_replace("\n","",$sms_msg);
-                           $sms_msg = str_replace("\""," ",$sms_msg);
-                           $mobile_sender = 
str_replace("\'","",$mobile_sender);
-                           $mobile_sender = 
str_replace("\"","",$mobile_sender);
-                           $sms_sender = str_replace("\'","",$sms_sender);
-                           $sms_sender = str_replace("\"","",$sms_sender);
-                           $sms_to = str_replace("\'","",$sms_to);
-                           $sms_to = str_replace("\"","",$sms_to);
-                           $the_msg = "$sms_to\n$sms_msg";
-                           $db_query1 = "
+                               $p_num = $db_row[p_num];
+                               $sms_to = $p_num;
+                               $sms_msg = $message;
+                               $sms_msg = str_replace("\r","",$sms_msg);
+                               $sms_msg = str_replace("\n","",$sms_msg);
+                               $sms_msg = str_replace("\""," ",$sms_msg);
+                               $mobile_sender = 
str_replace("\'","",$mobile_sender);
+                               $mobile_sender = 
str_replace("\"","",$mobile_sender);
+                               $sms_sender = str_replace("\'","",$sms_sender);
+                               $sms_sender = str_replace("\"","",$sms_sender);
+                               $sms_to = str_replace("\'","",$sms_to);
+                               $sms_to = str_replace("\"","",$sms_to);
+                               $the_msg = "$sms_to\n$sms_msg";
+                               $db_query1 = "
                                INSERT INTO phpgw_sms_tblSMSOutgoing 
                                
(uid,p_gateway,p_src,p_dst,p_footer,p_msg,p_datetime,p_gpid,p_sms_type) 
                                VALUES 
('$uid','$gateway_module','$mobile_sender','$sms_to','$sms_sender','$message','$datetime_now','$gpid','$sms_type')
-                           ";
-                           $smslog_id = @dba_insert_id($db_query1);
-                           $to[$j] = $sms_to;
-                           $ok[$j] = 0;
-                           if ($smslog_id)
-                           {
-                               if 
(gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$c_gp_code,$uid,$smslog_id,$sms_type,$unicode))
+                               ";
+                               $smslog_id = @dba_insert_id($db_query1);
+                               $to[$j] = $sms_to;
+                               $ok[$j] = 0;
+                               if ($smslog_id)
                                {
-                                   $ok[$j] = $sms_to;
+                               if ( 
$this->gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$c_gp_code,$uid,$smslog_id,$sms_type,$unicode))
+                               {
+                                       $ok[$j] = $sms_to;
+                               }
                                }
-                           }
-                           $j++;
+                               $j++;
+                       }
                        }
-                   }
-                   return array($ok,$to);
+                       return array($ok,$to);
                }
                
                function send2group($mobile_sender,$gp_code,$message)
                {
-                   $datetime_now = $this->datetime_now;
-                   $ok = false;
-                   if ($mobile_sender && $gp_code && $message)
-                   {
+                       $datetime_now = $this->datetime_now;
+                       $ok = false;
+                       if ($mobile_sender && $gp_code && $message)
+                       {
                        $db_query = "SELECT uid,username,sender FROM 
phpgw_sms_tblUser WHERE mobile='$mobile_sender'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
@@ -639,80 +647,80 @@
                        $sms_sender = $db_row[sender];
                        if ($uid && $username)
                        {
-                           $gp_code = strtoupper($gp_code);
-                           $db_query = "SELECT * FROM 
phpgw_sms_tblUserGroupPhonebook WHERE uid='$uid' AND gp_code='$gp_code'";
-                           $db_result = dba_query($db_query);          
-                           $db_row = dba_fetch_array($db_result);
-                           $gpid = $db_row[gpid];
-                           if ($gpid && $message)
-                           {
-                               $db_query = "SELECT * FROM 
phpgw_sms_tblUserPhonebook WHERE gpid='$gpid' AND uid='$uid'";
-                               $db_result = dba_query($db_query);
-                               while ($db_row = dba_fetch_array($db_result))
-                               {
-                                   $p_num = $db_row[p_num];
-                                   $sms_to = $p_num;
-                                   $max_length = 160 - strlen($sms_sender) - 3;
-                                   if (strlen($message)>$max_length)
-                                   {
+                               $gp_code = strtoupper($gp_code);
+                               $db_query = "SELECT * FROM 
phpgw_sms_tblUserGroupPhonebook WHERE uid='$uid' AND gp_code='$gp_code'";
+                               $db_result = dba_query($db_query);              
+                               $db_row = dba_fetch_array($db_result);
+                               $gpid = $db_row[gpid];
+                               if ($gpid && $message)
+                               {
+                                       $db_query = "SELECT * FROM 
phpgw_sms_tblUserPhonebook WHERE gpid='$gpid' AND uid='$uid'";
+                                       $db_result = dba_query($db_query);
+                                       while ($db_row = 
dba_fetch_array($db_result))
+                                       {
+                                               $p_num = $db_row[p_num];
+                                       $sms_to = $p_num;
+                                       $max_length = 160 - strlen($sms_sender) 
- 3;
+                                       if (strlen($message)>$max_length)
+                                       {
                                        $message = substr 
($message,0,$max_length-1);
-                                   }
-                                   $sms_msg = $message;
-                                   $sms_msg = str_replace("\r","",$sms_msg);
-                                   $sms_msg = str_replace("\n","",$sms_msg);
-                                   $sms_msg = str_replace("\""," ",$sms_msg);
-                                   $the_msg = "$sms_to\n$sms_msg";
-                                   $mobile_sender = 
str_replace("\'","",$mobile_sender);
-                                   $mobile_sender = 
str_replace("\"","",$mobile_sender);
-                                   $sms_sender = 
str_replace("\'","",$sms_sender);
-                                   $sms_sender = 
str_replace("\"","",$sms_sender);
-                                   $sms_to = str_replace("\'","",$sms_to);
-                                   $sms_to = str_replace("\"","",$sms_to);
-                                   $send_code = md5(mktime().$sms_to);
-                                   $db_query1 = "
+                                       }
+                                       $sms_msg = $message;
+                                       $sms_msg = 
str_replace("\r","",$sms_msg);
+                                       $sms_msg = 
str_replace("\n","",$sms_msg);
+                                       $sms_msg = str_replace("\""," 
",$sms_msg);
+                                       $the_msg = "$sms_to\n$sms_msg";
+                                       $mobile_sender = 
str_replace("\'","",$mobile_sender);
+                                       $mobile_sender = 
str_replace("\"","",$mobile_sender);
+                                       $sms_sender = 
str_replace("\'","",$sms_sender);
+                                       $sms_sender = 
str_replace("\"","",$sms_sender);
+                                       $sms_to = str_replace("\'","",$sms_to);
+                                       $sms_to = str_replace("\"","",$sms_to);
+                                       $send_code = md5(mktime().$sms_to);
+                                       $db_query1 = "
                                        INSERT INTO phpgw_sms_tblSMSOutgoing 
(uid,p_src,p_dst,p_footer,p_msg,p_datetime,p_gpid) 
                                        VALUES 
('$uid','$mobile_sender','$sms_to','$sms_sender','$message','$datetime_now','$gpid')";
-                                   $smslog_id = @dba_insert_id($db_query1);
-                                   $sms_id = "$gp_code.$uid.$smslog_id";
-                                   if ($smslog_id)
-                                   {
-                                       if 
(gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$gp_code,$uid,$smslog_id))
+                                       $smslog_id = @dba_insert_id($db_query1);
+                                       $sms_id = "$gp_code.$uid.$smslog_id";
+                                       if ($smslog_id)
+                                       {
+                                       if 
($this->gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$gp_code,$uid,$smslog_id))
                                        {
-                                           $ok = true;
+                                               $ok = true;
                                        }
-                                   }
+                                       }
+                               }
                                }
-                           }
                        }
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                function 
insertsmstodb($sms_datetime,$sms_sender,$target_code,$message)
                {
-                   $email_footer = $this->email_footer;
-                   $email_service = $this->email_service;
-                   $web_title = $this->web_title;
-                   $gateway_module = $this->gateway_module;
-
-                   $ok = false;
-                   if ($sms_sender && $target_code && $message)
-                   {
+                       $email_footer = $this->email_footer;
+                       $email_service = $this->email_service;
+                       $web_title = $this->web_title;
+                       $gateway_module = $this->gateway_module;
+
+                       $ok = false;
+                       if ($sms_sender && $target_code && $message)
+                       {
                        // masked sender sets here
                        $masked_sender = substr_replace($sms_sender,'xxxx',-4);
                        $db_query = "
-                           INSERT INTO phpgw_sms_tblSMSIncoming 
-                           
(in_gateway,in_sender,in_masked,in_code,in_msg,in_datetime) 
-                           VALUES 
('$gateway_module','$sms_sender','$masked_sender','$target_code','$message','$sms_datetime')
+                               INSERT INTO phpgw_sms_tblSMSIncoming 
+                               
(in_gateway,in_sender,in_masked,in_code,in_msg,in_datetime) 
+                               VALUES 
('$gateway_module','$sms_sender','$masked_sender','$target_code','$message','$sms_datetime')
                        ";
                        if ($cek_ok = @dba_insert_id($db_query))
                        {
-                           $db_query1 = "SELECT board_forward_email FROM 
phpgw_sms_featboard WHERE board_code='$target_code'";
-                           $db_result1 = dba_query($db_query1);
-                           $db_row1 = dba_fetch_array($db_result1);
-                           $email = $db_row1[board_forward_email];
-                           if ($email)
-                           {
+                               $db_query1 = "SELECT board_forward_email FROM 
phpgw_sms_featboard WHERE board_code='$target_code'";
+                               $db_result1 = dba_query($db_query1);
+                               $db_row1 = dba_fetch_array($db_result1);
+                               $email = $db_row1[board_forward_email];
+                               if ($email)
+                               {
                                $subject = "[SMSGW-$target_code] from 
$sms_sender";
                                $body = "Forward WebSMS ($web_title)\n\n";
                                $body .= "Date Time: $sms_datetime\n";
@@ -721,66 +729,66 @@
                                $body .= "Message:\n$message\n\n";
                                $body .= $email_footer."\n\n";
                                sendmail($email_service,$email,$subject,$body);
-                           }
-                           $ok = true;
+                               }
+                               $ok = true;
+                       }
                        }
-                   }
-                   return $ok;
+                       return $ok;
                }
                
                function 
insertsmstoinbox($sms_datetime,$sms_sender,$target_user,$message)
                {
-                   $email_footer = $this->email_footer;
-                   $email_service = $this->email_service;
-                   $web_title = $this->web_title;
-                   $ok = false;
-                   if ($sms_sender && $target_user && $message)
-                   {
+                       $email_footer = $this->email_footer;
+                       $email_service = $this->email_service;
+                       $web_title = $this->web_title;
+                       $ok = false;
+                       if ($sms_sender && $target_user && $message)
+                       {
                        $db_query = "SELECT uid,email,mobile FROM 
phpgw_sms_tblUser WHERE username='$target_user'";
                        $db_result = dba_query($db_query);
                        if ($db_row = dba_fetch_array($db_result))
                        {
-                           $uid = $db_row[uid];
-                           $email = $db_row[email];
-                           $mobile = $db_row[mobile];
-                           $db_query = "
+                               $uid = $db_row[uid];
+                               $email = $db_row[email];
+                               $mobile = $db_row[mobile];
+                               $db_query = "
                                INSERT INTO phpgw_sms_tblUserInbox
                                (in_sender,in_uid,in_msg,in_datetime) 
                                VALUES 
('$sms_sender','$uid','$message','$sms_datetime')
-                           ";
-                           if ($cek_ok = @dba_insert_id($db_query))
-                           {
+                               ";
+                               if ($cek_ok = @dba_insert_id($db_query))
+                               {
                                if ($email)
                                {
-                                   $subject = "[SMSGW-PV] from $sms_sender";
-                                   $body = "Forward Private WebSMS 
($web_title)\n\n";
-                                   $body .= "Date Time: $sms_datetime\n";
-                                   $body .= "Sender: $sms_sender\n";
-                                   $body .= "Receiver: $mobile\n\n";
-                                   $body .= "Message:\n$message\n\n";
-                                   $body .= $email_footer."\n\n";
-                                   
sendmail($email_service,$email,$subject,$body);
+                                       $subject = "[SMSGW-PV] from 
$sms_sender";
+                                       $body = "Forward Private WebSMS 
($web_title)\n\n";
+                                       $body .= "Date Time: $sms_datetime\n";
+                                       $body .= "Sender: $sms_sender\n";
+                                       $body .= "Receiver: $mobile\n\n";
+                                       $body .= "Message:\n$message\n\n";
+                                       $body .= $email_footer."\n\n";
+                                       
sendmail($email_service,$email,$subject,$body);
                                }
                                $ok = true;
-                           }
+                               }
+                       }
                        }
-                   }
-                   return $ok;
+                       return $ok;
                }
                
                function getsmsinbox()
                {
-                   $this->gw_set_incoming_action();
+                       $this->gw_set_incoming_action();
                }
                
                function getsmsstatus()
                {
-                   $gateway_module = $this->gateway_module;
-                   $db_query = "SELECT * FROM phpgw_sms_tblSMSOutgoing WHERE 
p_status='0' AND p_gateway='$gateway_module'";
-                   $this->db->query($db_query,__LINE__,__FILE__);
-                   
-                   while ($this->db->next_record())
-                   {
+                       $gateway_module = $this->gateway_module;
+                       $db_query = "SELECT * FROM phpgw_sms_tblSMSOutgoing 
WHERE p_status='0' AND p_gateway='$gateway_module'";
+                       $this->db->query($db_query,__LINE__,__FILE__);
+                       
+                       while ($this->db->next_record())
+                       {
                        $gpid = "";
                        $gp_code = "";
                        $uid = $this->db->f('uid');
@@ -790,259 +798,259 @@
                        $gpid = $this->db->f('p_gpid');
                        $gp_code = gpid2gpcode($gpid);
                        
$this->gw_set_delivery_status($gp_code,$uid,$smslog_id,$p_datetime,$p_update);
-                   }
+                       }
                        
$this->gw_set_delivery_status($gp_code,$uid,$smslog_id,$p_datetime,$p_update);
                }
                
                function execgwcustomcmd()
                {
-                   if (function_exists("gw_customcmd"))
-                   {
+                       if (function_exists("gw_customcmd"))
+                       {
                        gw_customcmd();
-                   }
+                       }
                }
                
                function execcommoncustomcmd($DAEMON_COUNTER = '')
                {
-                   @include $this->apps_path[inc]."/admin/commoncustomcmd.php";
+                       @include 
$this->apps_path[inc]."/admin/commoncustomcmd.php";
                }
                
                function setsmsdeliverystatus($smslog_id,$uid,$p_status)
                {
-                   $datetime_now = $this->datetime_now;
-                   $ok = false;
-                   $db_query = "UPDATE phpgw_sms_tblSMSOutgoing SET 
p_update='$datetime_now',p_status='$p_status' WHERE smslog_id='$smslog_id' AND 
uid='$uid'";
-                   if ($aff_id = @dba_affected_rows($db_query))
-                   {
+                       $datetime_now = $this->datetime_now;
+                       $ok = false;
+                       $db_query = "UPDATE phpgw_sms_tblSMSOutgoing SET 
p_update='$datetime_now',p_status='$p_status' WHERE smslog_id='$smslog_id' AND 
uid='$uid'";
+                       if ($aff_id = @dba_affected_rows($db_query))
+                       {
                        $ok = true;
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                function checkavailablecode($code)
                {
-                   $reserved_codes = $this->reserved_codes;
-                   $ok = true;
-                   $reserved = false;
-                   for ($i=0;$i<count($reserved_codes);$i++)
-                   {
-                       if ($code == $reserved_codes[$i])
-                       {
-                           $reserved = true;
-                       }
-                   }
-                   if ($reserved)
-                   {
+                       $reserved_codes = $this->reserved_codes;
+                       $ok = true;
+                       $reserved = false;
+                       for ($i=0;$i<count($reserved_codes);$i++)
+                       {
+                               if ($code == $reserved_codes[$i])
+                               {
+                                       $reserved = true;
+                       }
+                       }
+                       if ($reserved)
+                       {
                        $ok = false;    
-                   }
-                   else
-                   {
+                       }
+                       else
+                       {
                        // check for SMS autoreply
                        $db_query = "SELECT autoreply_id FROM 
phpgw_sms_featautoreply WHERE autoreply_code='$code'";
                        if ($db_result = dba_num_rows($db_query))
                        {
-                           $ok = false;
+                               $ok = false;
                        }
                        // check for SMS board
                        $db_query = "SELECT board_id FROM phpgw_sms_featboard 
WHERE board_code='$code'";
                        if ($db_result = dba_num_rows($db_query))
                        {
-                           $ok = false;
+                               $ok = false;
                        }
                        // check for SMS command
                        $db_query = "SELECT command_id FROM 
phpgw_sms_featcommand WHERE command_code='$code'";
                        if ($db_result = dba_num_rows($db_query))
                        {
-                           $ok = false;
+                               $ok = false;
                        }
                        // check for SMS custom
                        $db_query = "SELECT custom_id FROM phpgw_sms_featcustom 
WHERE custom_code='$code'";
                        if ($db_result = dba_num_rows($db_query))
                        {
-                           $ok = false;
+                               $ok = false;
                        }
                        // check for SMS poll
                        $db_query = "SELECT poll_id FROM phpgw_sms_featpoll 
WHERE poll_code='$code'";
                        if ($db_result = dba_num_rows($db_query))
                        {
-                           $ok = false;
+                               $ok = false;
                        }
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                // part of SMS board
                function outputtorss($code,$line="10")
                {
-                   $web_title = $this->web_title;
-                   include_once 
"$this->apps_path[libs]/gpl/feedcreator.class.php";
-                   $code = strtoupper($code);
-                   if (!$line) { $line = "10"; };
-                   $format_output = "RSS0.91";
-                   $rss = new UniversalFeedCreator();
-                   $db_query1 = "SELECT * FROM phpgw_sms_tblSMSIncoming WHERE 
in_code='$code' ORDER BY in_datetime DESC LIMIT 0,$line";
-                   $db_result1 = dba_query($db_query1);
-                   while ($db_row1 = dba_fetch_array($db_result1))
-                   {
-                       $title = $db_row1[in_masked];
-                       $description = $db_row1[in_msg];
-                       $datetime = $db_row1[in_datetime];
-                       $items = new FeedItem();
-                       $items->title = $title;
+                       $web_title = $this->web_title;
+                       include_once 
"$this->apps_path[libs]/gpl/feedcreator.class.php";
+                       $code = strtoupper($code);
+                       if (!$line) { $line = "10"; };
+                       $format_output = "RSS0.91";
+                       $rss = new UniversalFeedCreator();
+                       $db_query1 = "SELECT * FROM phpgw_sms_tblSMSIncoming 
WHERE in_code='$code' ORDER BY in_datetime DESC LIMIT 0,$line";
+                       $db_result1 = dba_query($db_query1);
+                       while ($db_row1 = dba_fetch_array($db_result1))
+                       {
+                               $title = $db_row1[in_masked];
+                               $description = $db_row1[in_msg];
+                               $datetime = $db_row1[in_datetime];
+                               $items = new FeedItem();
+                               $items->title = $title;
                        $items->description = $description;
                        $items->comments = $datetime;
                        $items->date = strtotime($datetime);
-                       $rss->addItem($items);      
-                   }
-                   $feeds = $rss->createFeed($format_output);
-                   return $feeds;
+                       $rss->addItem($items);          
+                       }
+                       $feeds = $rss->createFeed($format_output);
+                       return $feeds;
                }
                
                // part of SMS board
                function 
outputtohtml($code,$line="10",$pref_bodybgcolor="#E0D0C0",$pref_oddbgcolor="#EEDDCC",$pref_evenbgcolor="#FFEEDD")
                {
-                   $web_title = $this->web_title;
-                   $code = strtoupper($code);
-                   if (!$line) { $line = "10"; };
-                   if (!$pref_bodybgcolor) { $pref_bodybgcolor = "#E0D0C0"; }
-                   if (!$pref_oddbgcolor) { $pref_oddbgcolor = "#EEDDCC"; }
-                   if (!$pref_evenbgcolor) { $pref_evenbgcolor = "#FFEEDD"; }
-                   $db_query = "SELECT board_pref_template FROM 
phpgw_sms_featboard WHERE board_code='$code'";
-                   $db_result = dba_query($db_query);
-                   if ($db_row = dba_fetch_array($db_result))
-                   {
-                       $template = $db_row[board_pref_template];
+                       $web_title = $this->web_title;
+                       $code = strtoupper($code);
+                       if (!$line) { $line = "10"; };
+                       if (!$pref_bodybgcolor) { $pref_bodybgcolor = 
"#E0D0C0"; }
+                       if (!$pref_oddbgcolor) { $pref_oddbgcolor = "#EEDDCC"; }
+                       if (!$pref_evenbgcolor) { $pref_evenbgcolor = 
"#FFEEDD"; }
+                       $db_query = "SELECT board_pref_template FROM 
phpgw_sms_featboard WHERE board_code='$code'";
+                       $db_result = dba_query($db_query);
+                       if ($db_row = dba_fetch_array($db_result))
+                       {
+                               $template = $db_row[board_pref_template];
                        $db_query1 = "SELECT * FROM phpgw_sms_tblSMSIncoming 
WHERE in_code='$code' ORDER BY in_datetime DESC LIMIT 0,$line";
                        $db_result1 = dba_query($db_query1);
                        $content = "<html>\n<head>\n<title>$web_title - Code: 
$code</title>\n<meta name=\"author\" 
content=\"http://playsms.sourceforge.net\";>\n</head>\n<body 
bgcolor=\"$pref_bodybgcolor\" topmargin=\"0\" leftmargin=\"0\">\n<table 
width=100% cellpadding=2 cellspacing=2>\n";
                        $i = 0;
                        while ($db_row1 = dba_fetch_array($db_result1))
                        {
-                           $i++;
-                           $sender = $db_row1[in_masked];
-                           $datetime = $db_row1[in_datetime];
-                           $message = $db_row1[in_msg];
-                           $tmp_template = $template;
-                           $tmp_template = 
str_replace("##SENDER##",$sender,$tmp_template);
-                           $tmp_template = 
str_replace("##DATETIME##",$datetime,$tmp_template);
-                           $tmp_template = 
str_replace("##MESSAGE##",$message,$tmp_template);
-                           if (($i % 2) == 0)
-                           {
+                               $i++;
+                               $sender = $db_row1[in_masked];
+                               $datetime = $db_row1[in_datetime];
+                               $message = $db_row1[in_msg];
+                               $tmp_template = $template;
+                               $tmp_template = 
str_replace("##SENDER##",$sender,$tmp_template);
+                               $tmp_template = 
str_replace("##DATETIME##",$datetime,$tmp_template);
+                               $tmp_template = 
str_replace("##MESSAGE##",$message,$tmp_template);
+                               if (($i % 2) == 0)
+                               {
                                $pref_zigzagcolor = "$pref_evenbgcolor";
-                           }
-                           else
-                           {
+                               }
+                               else
+                               {
                                $pref_zigzagcolor = "$pref_oddbgcolor";
-                           }
-                           $content .= "\n<tr><td width=100% 
bgcolor=\"$pref_zigzagcolor\">\n$tmp_template</td></tr>\n\n";
+                               }
+                               $content .= "\n<tr><td width=100% 
bgcolor=\"$pref_zigzagcolor\">\n$tmp_template</td></tr>\n\n";
                        }
                        $content .= "</table>\n</body>\n</html>\n";
                        return $content;
-                   }
+                       }
                }
                
                // part of SMS command
                function 
execcommand($sms_datetime,$sms_sender,$command_code,$command_param)
                {
-                   $datetime_now = $this->datetime_now;
-                   $ok = false;
-                   $db_query = "SELECT command_exec FROM phpgw_sms_featcommand 
WHERE command_code='$command_code'";
-                   $db_result = dba_query($db_query);
-                   $db_row = dba_fetch_array($db_result);
-                   $command_exec = $db_row[command_exec];
-                   $command_exec = 
str_replace("##SMSDATETIME##","$sms_datetime",$command_exec);
-                   $command_exec = 
str_replace("##SMSSENDER##","$sms_sender",$command_exec);
-                   $command_exec = 
str_replace("##COMMANDCODE##","$command_code",$command_exec);
-                   $command_exec = 
str_replace("##COMMANDPARAM##","$command_param",$command_exec);
-                   $command_output = shell_exec(stripslashes($command_exec));
-                   $db_query = "
+                       $datetime_now = $this->datetime_now;
+                       $ok = false;
+                       $db_query = "SELECT command_exec FROM 
phpgw_sms_featcommand WHERE command_code='$command_code'";
+                       $db_result = dba_query($db_query);
+                       $db_row = dba_fetch_array($db_result);
+                       $command_exec = $db_row[command_exec];
+                       $command_exec = 
str_replace("##SMSDATETIME##","$sms_datetime",$command_exec);
+                       $command_exec = 
str_replace("##SMSSENDER##","$sms_sender",$command_exec);
+                       $command_exec = 
str_replace("##COMMANDCODE##","$command_code",$command_exec);
+                       $command_exec = 
str_replace("##COMMANDPARAM##","$command_param",$command_exec);
+                       $command_output = 
shell_exec(stripslashes($command_exec));
+                       $db_query = "
                        INSERT INTO phpgw_sms_featcommand_log
                        
(sms_sender,command_log_datetime,command_log_code,command_log_exec) 
                        VALUES
                        
('$sms_sender','$datetime_now','$command_code','$command_exec')
-                   ";
-                   if ($new_id = @dba_insert_id($db_query))
-                   {
+                       ";
+                       if ($new_id = @dba_insert_id($db_query))
+                       {
                        $ok = true;
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                // part of SMS custom
                function 
processcustom($sms_datetime,$sms_sender,$custom_code,$custom_param)
                {
-                   $datetime_now = $this->datetime_now;
-                   $ok = false;
-                   $db_query = "SELECT custom_url FROM phpgw_sms_featcustom 
WHERE custom_code='$custom_code'";
-                   $db_result = dba_query($db_query);
-                   $db_row = dba_fetch_array($db_result);
-                   $custom_url = $db_row[custom_url];
-                   $custom_url = 
str_replace("##SMSDATETIME##",urlencode($sms_datetime),$custom_url);
-                   $custom_url = 
str_replace("##SMSSENDER##",urlencode($sms_sender),$custom_url);
-                   $custom_url = 
str_replace("##CUSTOMCODE##",urlencode($custom_code),$custom_url);
-                   $custom_url = 
str_replace("##CUSTOMPARAM##",urlencode($custom_param),$custom_url);
-                   $url = parse_url($custom_url);
-                   if (!$url['port']) 
-                   {
+                       $datetime_now = $this->datetime_now;
+                       $ok = false;
+                       $db_query = "SELECT custom_url FROM 
phpgw_sms_featcustom WHERE custom_code='$custom_code'";
+                       $db_result = dba_query($db_query);
+                       $db_row = dba_fetch_array($db_result);
+                       $custom_url = $db_row[custom_url];
+                       $custom_url = 
str_replace("##SMSDATETIME##",urlencode($sms_datetime),$custom_url);
+                       $custom_url = 
str_replace("##SMSSENDER##",urlencode($sms_sender),$custom_url);
+                       $custom_url = 
str_replace("##CUSTOMCODE##",urlencode($custom_code),$custom_url);
+                       $custom_url = 
str_replace("##CUSTOMPARAM##",urlencode($custom_param),$custom_url);
+                       $url = parse_url($custom_url);
+                       if (!$url['port']) 
+                       {
                        $url['port'] = 80;
-                   }
-                   $connection = 
fsockopen($url['host'],$url['port'],&$error_number,&$error_description,60);
-                   if($connection) 
-                   {
+                       }
+                       $connection = 
fsockopen($url['host'],$url['port'],&$error_number,&$error_description,60);
+                       if($connection) 
+                       {
                        socket_set_blocking($connection, false);
                        fputs($connection, "GET $custom_url HTTP/1.0\r\n\r\n");
-                       $db_query = "
-                           INSERT INTO phpgw_sms_featcustom_log
-                           
(sms_sender,custom_log_datetime,custom_log_code,custom_log_url) 
-                           VALUES
-                           
('$sms_sender','$datetime_now','$custom_code','$custom_url')
+                               $db_query = "
+                               INSERT INTO phpgw_sms_featcustom_log
+                               
(sms_sender,custom_log_datetime,custom_log_code,custom_log_url) 
+                               VALUES
+                               
('$sms_sender','$datetime_now','$custom_code','$custom_url')
                        ";
                        if ($new_id = @dba_insert_id($db_query))
                        {
-                           $ok = true;
+                               $ok = true;
                        }
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                // part of SMS autoreply
                function 
processautoreply($sms_datetime,$sms_sender,$autoreply_code,$autoreply_param)
                {
-                   $datetime_now = $this->datetime_now;
-                   $ok = false;
-                   $autoreply_request = $autoreply_code." ".$autoreply_param;
-                   $array_autoreply_request = explode(" ",$autoreply_request);
-                   for ($i=0;$i<count($array_autoreply_request);$i++)
-                   {
+                       $datetime_now = $this->datetime_now;
+                       $ok = false;
+                       $autoreply_request = $autoreply_code." 
".$autoreply_param;
+                       $array_autoreply_request = explode(" 
",$autoreply_request);
+                       for ($i=0;$i<count($array_autoreply_request);$i++)
+                       {
                        $autoreply_part[$i] = 
trim($array_autoreply_request[$i]);
                        $tmp_autoreply_request .= 
$array_autoreply_request[$i]." ";
-                   }
-                   $autoreply_request = trim($tmp_autoreply_request);
-                   for ($i=1;$i<8;$i++)
-                   {
+                       }
+                       $autoreply_request = trim($tmp_autoreply_request);
+                       for ($i=1;$i<8;$i++)
+                       {
                        $autoreply_scenario_param_list .= 
"autoreply_scenario_param$i='".$autoreply_part[$i]."' AND ";
-                   }
-                   $db_query = "
+                       }
+                       $db_query = "
                        SELECT autoreply_scenario_result FROM 
phpgw_sms_featautoreply_scenario 
                        WHERE $autoreply_scenario_param_list 1=1
-                   ";
-                   $db_result = dba_query($db_query);
-                   $db_row = dba_fetch_array($db_result);
-                   if ($autoreply_scenario_result = 
$db_row[autoreply_scenario_result])
-                   {
-                       $db_query = "
-                           INSERT INTO phpgw_sms_featautoreply_log
-                           
(sms_sender,autoreply_log_datetime,autoreply_log_code,autoreply_log_request) 
-                           VALUES
-                           
('$sms_sender','$datetime_now','$autoreply_code','$autoreply_request')
+                       ";
+                       $db_result = dba_query($db_query);
+                       $db_row = dba_fetch_array($db_result);
+                       if ($autoreply_scenario_result = 
$db_row[autoreply_scenario_result])
+                       {
+                               $db_query = "
+                               INSERT INTO phpgw_sms_featautoreply_log
+                               
(sms_sender,autoreply_log_datetime,autoreply_log_code,autoreply_log_request) 
+                               VALUES
+                               
('$sms_sender','$datetime_now','$autoreply_code','$autoreply_request')
                        ";
                        if ($new_id = @dba_insert_id($db_query))
                        {
-                           $ok = true;
+                               $ok = true;
+                       }
                        }
-                   }
-                   if ($ok)
-                   {
+                       if ($ok)
+                       {
                        $ok = false;
                        $db_query = "SELECT uid FROM phpgw_sms_featautoreply 
WHERE autoreply_code='$autoreply_code'";
                        $db_result = dba_query($db_query);
@@ -1052,20 +1060,20 @@
                        $smslog_id = 
websend2pv($c_username,$sms_sender,$autoreply_scenario_result);
                        if ($smslog_id)
                        {
-                           $ok = true;
+                               $ok = true;
                        }
-                   }
-                   return $ok;
+                       }
+                       return $ok;
                }
                
                // part of SMS poll
                function savepoll($sms_sender,$target_poll,$target_choice)
                {
-                   $ok = false;
-                   $target_poll = strtoupper($target_poll);
-                   $target_choice = strtoupper($target_choice);
-                   if ($sms_sender && $target_poll && $target_choice)
-                   {
+                       $ok = false;
+                       $target_poll = strtoupper($target_poll);
+                       $target_choice = strtoupper($target_choice);
+                       if ($sms_sender && $target_poll && $target_choice)
+                       {
                        $db_query = "SELECT poll_id,poll_enable FROM 
phpgw_sms_featpoll WHERE poll_code='$target_poll'";
                        $db_result = dba_query($db_query);
                        $db_row = dba_fetch_array($db_result);
@@ -1077,112 +1085,112 @@
                        $choice_id = $db_row[choice_id];
                        if ($poll_id && $choice_id)
                        {
-                           $db_query = "SELECT result_id FROM 
phpgw_sms_featpoll_result WHERE poll_sender='$sms_sender' AND 
poll_id='$poll_id'";
-                           $already_vote = @dba_num_rows($db_query);
-                           if ((!$already_vote) && $poll_enable)
-                           {
+                               $db_query = "SELECT result_id FROM 
phpgw_sms_featpoll_result WHERE poll_sender='$sms_sender' AND 
poll_id='$poll_id'";
+                               $already_vote = @dba_num_rows($db_query);
+                               if ((!$already_vote) && $poll_enable)
+                               {
                                $db_query = "
-                                   INSERT INTO phpgw_sms_featpoll_result 
-                                   (poll_id,choice_id,poll_sender) 
-                                   VALUES 
('$poll_id','$choice_id','$sms_sender')
+                                       INSERT INTO phpgw_sms_featpoll_result 
+                                       (poll_id,choice_id,poll_sender) 
+                                       VALUES 
('$poll_id','$choice_id','$sms_sender')
                                ";
                                dba_query($db_query);
-                           }
-                           $ok = true;
+                               }
+                               $ok = true;
+                       }
                        }
-                   }
-                   return $ok;    
+                       return $ok;     
                }
                
                // check incoming SMS for available codes
                // and sets the action
                function 
setsmsincomingaction($sms_datetime,$sms_sender,$target_code,$message)
                {
-                   $ok = false;
-                   switch ($target_code)
-                   {
+                       $ok = false;
+                       switch ($target_code)
+                       {
                        case "BC":
-                           $array_target_group = explode(" ",$message);
-                           $target_group = 
strtoupper(trim($array_target_group[0]));
-                           $message = $array_target_group[1];
-                           for ($i=2;$i<count($array_target_group);$i++)
-                           {
+                               $array_target_group = explode(" ",$message);
+                               $target_group = 
strtoupper(trim($array_target_group[0]));
+                               $message = $array_target_group[1];
+                               for ($i=2;$i<count($array_target_group);$i++)
+                               {
                                $message .= " ".$array_target_group[$i];
-                           }
-                           if (send2group($sms_sender,$target_group,$message))
-                           {
+                               }
+                               if 
(send2group($sms_sender,$target_group,$message))
+                               {
                                $ok = true;
-                           }
-                           break;
+                               }
+                               break;
                        case "PV":
-                           $array_target_user = explode(" ",$message);
-                           $target_user = 
strtoupper(trim($array_target_user[0]));
-                           $message = $array_target_user[1];
-                           for ($i=2;$i<count($array_target_user);$i++)
-                           {
+                               $array_target_user = explode(" ",$message);
+                               $target_user = 
strtoupper(trim($array_target_user[0]));
+                               $message = $array_target_user[1];
+                               for ($i=2;$i<count($array_target_user);$i++)
+                               {
                                $message .= " ".$array_target_user[$i];
-                           }
-                           if 
(insertsmstoinbox($sms_datetime,$sms_sender,$target_user,$message))
-                           {
+                               }
+                               if 
(insertsmstoinbox($sms_datetime,$sms_sender,$target_user,$message))
+                               {
                                $ok = true;
-                           }
-                           break;
+                               }
+                               break;
                        default:
-                           // maybe its for sms autoreply
-                           $db_query = "SELECT autoreply_id FROM 
phpgw_sms_featautoreply WHERE autoreply_code='$target_code'";
-                           if ($db_result = dba_num_rows($db_query))
-                           {
+                               // maybe its for sms autoreply
+                               $db_query = "SELECT autoreply_id FROM 
phpgw_sms_featautoreply WHERE autoreply_code='$target_code'";
+                               if ($db_result = dba_num_rows($db_query))
+                               {
                                if 
(processautoreply($sms_datetime,$sms_sender,$target_code,$message))
                                {
-                                   $ok = true;
+                                       $ok = true;
+                               }
                                }
-                           }
-                           // maybe its for sms poll
-                           $db_query = "SELECT poll_id FROM phpgw_sms_featpoll 
WHERE poll_code='$target_code'";
-                           if ($db_result = dba_num_rows($db_query))
-                           {
+                               // maybe its for sms poll
+                               $db_query = "SELECT poll_id FROM 
phpgw_sms_featpoll WHERE poll_code='$target_code'";
+                               if ($db_result = dba_num_rows($db_query))
+                               {
                                if (savepoll($sms_sender,$target_code,$message))
                                {
-                                   $ok = true;
+                                       $ok = true;
+                               }
                                }
-                           }
-                           // or maybe its for sms command
-                           $db_query = "SELECT command_id FROM 
phpgw_sms_featcommand WHERE command_code='$target_code'";
-                           if ($db_result = dba_num_rows($db_query))
-                           {
+                               // or maybe its for sms command
+                               $db_query = "SELECT command_id FROM 
phpgw_sms_featcommand WHERE command_code='$target_code'";
+                               if ($db_result = dba_num_rows($db_query))
+                               {
                                if 
(execcommand($sms_datetime,$sms_sender,$target_code,$message))
                                {
-                                   $ok = true;
+                                       $ok = true;
+                               }
                                }
-                           }
-                           // or maybe its for sms custom
-                           $db_query = "SELECT custom_id FROM 
phpgw_sms_featcustom WHERE custom_code='$target_code'";
-                           if ($db_result = dba_num_rows($db_query))
-                           {
+                               // or maybe its for sms custom
+                               $db_query = "SELECT custom_id FROM 
phpgw_sms_featcustom WHERE custom_code='$target_code'";
+                               if ($db_result = dba_num_rows($db_query))
+                               {
                                if 
(processcustom($sms_datetime,$sms_sender,$target_code,$message))
                                {
-                                   $ok = true;
+                                       $ok = true;
                                }
-                           }
-                           // its for sms board
-                           $db_query = "SELECT board_id FROM 
phpgw_sms_featboard WHERE board_code='$target_code'";
-                           if ($db_result = dba_num_rows($db_query))
-                           {
+                               }
+                               // its for sms board
+                               $db_query = "SELECT board_id FROM 
phpgw_sms_featboard WHERE board_code='$target_code'";
+                               if ($db_result = dba_num_rows($db_query))
+                               {
                                if 
(insertsmstodb($sms_datetime,$sms_sender,$target_code,$message))
                                {
-                                   $ok = true;
+                                       $ok = true;
                                }
-                           }
-                   }
-                   if (!$ok)
-                   {
+                               }
+                       }
+                       if (!$ok)
+                       {
                        $message = $target_code." ".$message;
                        if 
(insertsmstoinbox($sms_datetime,$sms_sender,"admin",$message))
                        {
-                           $ok = true;
+                               $ok = true;
+                       }
                        }
-                   }
-                   return $ok;
+                       return $ok;
                }
 
 
Index: sms/inc/class.uisms.inc.php
diff -u sms/inc/class.uisms.inc.php:1.4 sms/inc/class.uisms.inc.php:1.5
--- sms/inc/class.uisms.inc.php:1.4     Tue May 16 19:45:49 2006
+++ sms/inc/class.uisms.inc.php Wed May 17 20:23:25 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: class.uisms.inc.php,v 1.4 2006/05/16 19:45:49 sigurdne 
Exp $
+       * @version $Id: class.uisms.inc.php,v 1.5 2006/05/17 20:23:25 sigurdne 
Exp $
        */
 
        /**
@@ -46,22 +46,7 @@
                        $this->config                           = 
CreateObject('phpgwapi.config');
                        $this->config->read_repository();
                        $this->gateway_number                   = 
$this->config->config_data['gateway_number'];
-//                     $GLOBALS['phpgw_info']['sms_config']['gateway_module'] 
= $this->config->config_data['gateway_module'];
                        $this->bo                               = 
CreateObject($this->currentapp.'.bosms',False);
-/*
-$GLOBALS['phpgw_info']['sms_config']['reserved_codes'] = $reserved_codes;
-$GLOBALS['phpgw_info']['sms_config']['web_title'] = $web_title;
-$GLOBALS['phpgw_info']['sms_config']['email_service'] = $email_service;
-$GLOBALS['phpgw_info']['sms_config']['email_footer'] = $email_footer;
-$GLOBALS['phpgw_info']['sms_config']['datetime_now'] = $datetime_now;
-$GLOBALS['phpgw_info']['sms_config']['apps_config'] = $apps_config;
-$GLOBALS['phpgw_info']['sms_config']['apps_path'] = $apps_path;
-$GLOBALS['phpgw_info']['sms_config']['feat_command_path'] = $feat_command_path;
-$GLOBALS['phpgw_info']['sms_config']['gateway_module'] = $gateway_module;
-$GLOBALS['phpgw_info']['sms_config']['gateway_number'] = $gateway_number;
-$GLOBALS['phpgw_info']['sms_config']['email_footer'] = $email_footer;
-$GLOBALS['phpgw_info']['sms_config']['gnokii_cfg'] = $gnokii_cfg;
-*/
 
                        $this->menu                             = 
CreateObject($this->currentapp.'.menu');
                        $this->grants                           = 
$this->bo->grants;
@@ -82,7 +67,7 @@
                                'order'         => $this->order,
                        );
 
-       //              $this->bo->save_sessiondata($data);
+                       $this->bo->save_sessiondata($data);
                }
 
                function index()
@@ -202,6 +187,9 @@
                        $this->menu->sub='.outbox';
                        $links = $this->menu->links();
 
+                       $receipt = 
$GLOBALS['phpgw']->session->appsession('session_data','sms_send_receipt');
+                       
$GLOBALS['phpgw']->session->appsession('session_data','sms_send_receipt','');
+
        //              $sms_info = $this->bo->read();
 
                        while (is_array($sms_info) && list(,$entry) = 
each($sms_info))
Index: sms/inc/plugin/gateway/gnokii/fn.php
diff -u sms/inc/plugin/gateway/gnokii/fn.php:1.2 
sms/inc/plugin/gateway/gnokii/fn.php:1.3
--- sms/inc/plugin/gateway/gnokii/fn.php:1.2    Tue May 16 19:45:49 2006
+++ sms/inc/plugin/gateway/gnokii/fn.php        Wed May 17 20:23:25 2006
@@ -6,7 +6,7 @@
                {
                        $this->db = $GLOBALS['phpgw']->db;
                        $this->db2 = clone($this->db);
-               
+                       $this->sms_();          
                        $this->gnokii_param[name]= 
$GLOBALS['phpgw_info']['sms_config']['gateway_module'];
                        $this->gnokii_param[path]= 
$GLOBALS['phpgw_info']['sms_config']['gnokii_cfg'];
                }
Index: sms/setup/tables_current.inc.php
diff -u sms/setup/tables_current.inc.php:1.1.1.1 
sms/setup/tables_current.inc.php:1.2
--- sms/setup/tables_current.inc.php:1.1.1.1    Mon May 15 10:29:23 2006
+++ sms/setup/tables_current.inc.php    Wed May 17 20:23:25 2006
@@ -7,7 +7,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage setup
-       * @version $Id: tables_current.inc.php,v 1.1.1.1 2006/05/15 10:29:23 
sigurdne Exp $
+       * @version $Id: tables_current.inc.php,v 1.2 2006/05/17 20:23:25 
sigurdne Exp $
        */
 
 
@@ -313,8 +313,8 @@
                                'p_dst' => array('type' => 'varchar', 
'precision' => 100,'nullable' => False),
                                'p_footer' => array('type' => 'varchar', 
'precision' => 11,'nullable' => False),
                                'p_msg' => array('type' => 'varchar', 
'precision' => 250,'nullable' => False),
-                               'p_datetime' => array('type' => 'varchar', 
'precision' => 20,'nullable' => False,'default' => '0000-00-00 00:00:00'),
-                               'p_update' => array('type' => 'varchar', 
'precision' => 20,'nullable' => False,'default' => '0000-00-00 00:00:00'),
+                               'p_datetime' => array('type' => 
'timestamp','nullable' => False,'default' => 'current_timestamp'),
+                               'p_update' => array('type' => 'timestamp', 
'precision' => 20,'nullable' => true),
                                'p_status' => array('type' => 'int', 
'precision' => 2,'nullable' => False,'default' => '0'),
                                'p_gpid' => array('type' => 'int', 'precision' 
=> 2,'nullable' => False,'default' => '0'),
                                'p_credit' => array('type' => 'int', 
'precision' => 2,'nullable' => False,'default' => '0'),




reply via email to

[Prev in Thread] Current Thread [Next in Thread]