phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] sms bin/phpgwsmsd bin/phpgwsmsd.php bin/phpgwsm...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] sms bin/phpgwsmsd bin/phpgwsmsd.php bin/phpgwsm...
Date: Mon, 22 May 2006 12:50:07 +0000

CVSROOT:        /sources/phpgroupware
Module name:    sms
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/22 12:50:06

Modified files:
        bin            : phpgwsmsd phpgwsmsd.php phpgwsmsd_start 
        inc            : class.bosms.inc.php class.sms.inc.php 
                         class.sosms.inc.php class.uisms.inc.php 
        templates/base : sms.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/bin/phpgwsmsd.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/bin/phpgwsmsd.php.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/bin/phpgwsmsd_start.diff?tr1=1.1.1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.bosms.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.sms.inc.php.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.sosms.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.uisms.inc.php.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/templates/base/sms.xsl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: sms/bin/phpgwsmsd
diff -u sms/bin/phpgwsmsd:1.1.1.1 sms/bin/phpgwsmsd:1.2
--- sms/bin/phpgwsmsd:1.1.1.1   Mon May 15 10:29:23 2006
+++ sms/bin/phpgwsmsd   Mon May 22 12:50:05 2006
@@ -2,7 +2,7 @@
 <?php
 
 // The path to directory of installed playsms
-$PLAYSMS_PATH = "/home/sn5607/public_html/head/phpgroupware/sms";
+$PLAYSMS_PATH = "/home/sn5607/public_html/phpgroupware/sms";
 
 // DO NOT CHANGE ANYTHING BELOW THE LINE
 // ------------------------------------------------------
Index: sms/bin/phpgwsmsd.php
diff -u sms/bin/phpgwsmsd.php:1.1.1.1 sms/bin/phpgwsmsd.php:1.2
--- sms/bin/phpgwsmsd.php:1.1.1.1       Mon May 15 10:29:23 2006
+++ sms/bin/phpgwsmsd.php       Mon May 22 12:50:05 2006
@@ -2,7 +2,7 @@
 <?php
 
 // The path to directory of installed playsms
-$PLAYSMS_PATH = "C:/cygwin/var/www/html/rc_16/phpgroupware\sms";
+$PLAYSMS_PATH = "/home/sn5607/public_html/phpgroupware/sms";
 
 // DO NOT CHANGE ANYTHING BELOW THE LINE
 // ------------------------------------------------------
Index: sms/bin/phpgwsmsd_start
diff -u sms/bin/phpgwsmsd_start:1.1.1.1 sms/bin/phpgwsmsd_start:1.2
--- sms/bin/phpgwsmsd_start:1.1.1.1     Mon May 15 10:29:23 2006
+++ sms/bin/phpgwsmsd_start     Mon May 22 12:50:05 2006
@@ -2,4 +2,4 @@
 
 # playsmsd must be in PATH eg: /usr/bin or /usr/local/bin
 
-playsmsd &
+phpgwsmsd &
Index: sms/inc/class.bosms.inc.php
diff -u sms/inc/class.bosms.inc.php:1.5 sms/inc/class.bosms.inc.php:1.6
--- sms/inc/class.bosms.inc.php:1.5     Thu May 18 13:27:59 2006
+++ sms/inc/class.bosms.inc.php Mon May 22 12:50:06 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.5 2006/05/18 13:27:59 sigurdne 
Exp $
+       * @version $Id: class.bosms.inc.php,v 1.6 2006/05/22 12:50:06 sigurdne 
Exp $
        */
 
        /**
@@ -194,6 +194,11 @@
                        $this->so->delete_out($id);
                }
 
+               function delete_in($id)
+               {
+                       $this->so->delete_in($id);
+               }
+
                function select_category_list($format='',$selected='')
                {
 
Index: sms/inc/class.sms.inc.php
diff -u sms/inc/class.sms.inc.php:1.6 sms/inc/class.sms.inc.php:1.7
--- sms/inc/class.sms.inc.php:1.6       Thu May 18 13:27:59 2006
+++ sms/inc/class.sms.inc.php   Mon May 22 12:50:06 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.6 2006/05/18 13:27:59 sigurdne 
Exp $
+       * @version $Id: class.sms.inc.php,v 1.7 2006/05/22 12:50:06 sigurdne 
Exp $
        */
 
        /**
@@ -72,8 +72,8 @@
                        $request['end_date']                    = 
$GLOBALS['phpgw']->common->show_date($request['end_date'],$dateformat);
 
 
-                       $this->db = $GLOBALS['phpgw']->db;
-                       $this->db2 = clone($this->db);
+                       $this->db       = clone($GLOBALS['phpgw']->db);
+                       $this->db2      = clone($this->db);
                        $this->init = true;
 
                        switch($GLOBALS['phpgw_info']['server']['db_type'])
@@ -744,37 +744,43 @@
                        $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 = "
-                               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 ($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);
-                               }
-                               $ok = true;
+                       //      $db_query = "SELECT uid,email,mobile FROM 
phpgw_sms_tblUser WHERE username='$target_user'";
+                               $uid = 
$GLOBALS['phpgw']->accounts->name2id($target_user);
+                       //      $GLOBALS['phpgw']->preferences->account_id = 
$uid;
+                       //      
$GLOBALS['phpgw']->preferences->read_repository();
+                               $mobile = 
$GLOBALS['phpgw_info']['user']['preferences']['sms']['cellphone'];
+                               $email = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['address'];
+
+                               if ($uid)
+                               {
+                                       $db_query = "
+                                       INSERT INTO phpgw_sms_tbluserinbox
+                                       (in_sender,in_uid,in_msg,in_datetime) 
+                                       VALUES 
('$sms_sender','$uid','$message','$sms_datetime')
+                                       ";
+
+                                       
$this->db->query($db_query,__LINE__,__FILE__);
+
+                                       if ($cek_ok = 
$this->db->get_last_insert_id(phpgw_sms_tbluserinbox,'in_id'))
+                                       {
+                                               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";
+                       //                              
$this->sendmail($email_service,$email,$subject,$body);
+                                               }
+                                               $ok = true;
+                                       }
                                }
                        }
-                       }
                        return $ok;
                }
                
@@ -1119,7 +1125,7 @@
                                {
                                $message .= " ".$array_target_group[$i];
                                }
-                               if 
(send2group($sms_sender,$target_group,$message))
+                               if 
($this->send2group($sms_sender,$target_group,$message))
                                {
                                $ok = true;
                                }
@@ -1140,54 +1146,64 @@
                        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))
-                               {
-                               if 
(processautoreply($sms_datetime,$sms_sender,$target_code,$message))
+                               $this->db->query($db_query,__LINE__,__FILE__);
+                               if($this->db->next_record())
+                       //      if ($db_result = dba_num_rows($db_query))
                                {
-                                       $ok = true;
-                               }
+                                       if 
($this->processautoreply($sms_datetime,$sms_sender,$target_code,$message))
+                                       {
+                                               $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))
-                               {
-                               if (savepoll($sms_sender,$target_code,$message))
+                               $this->db->query($db_query,__LINE__,__FILE__);
+                               if($this->db->next_record())
+                       //      if ($db_result = dba_num_rows($db_query))
                                {
-                                       $ok = true;
-                               }
+                                       if 
($this->savepoll($sms_sender,$target_code,$message))
+                                       {
+                                               $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))
+                               $this->db->query($db_query,__LINE__,__FILE__);
+                               if($this->db->next_record())
+//                             if ($db_result = dba_num_rows($db_query))
                                {
-                               if 
(execcommand($sms_datetime,$sms_sender,$target_code,$message))
-                               {
-                                       $ok = true;
-                               }
+                                       if 
($this->execcommand($sms_datetime,$sms_sender,$target_code,$message))
+                                       {
+                                               $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))
+                               $this->db->query($db_query,__LINE__,__FILE__);
+                               if($this->db->next_record())
+               //              if ($db_result = dba_num_rows($db_query))
                                {
-                               if 
(processcustom($sms_datetime,$sms_sender,$target_code,$message))
-                               {
-                                       $ok = true;
-                               }
+                                       if 
($this->processcustom($sms_datetime,$sms_sender,$target_code,$message))
+                                       {
+                                               $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))
+                               $this->db->query($db_query,__LINE__,__FILE__);
+                               if($this->db->next_record())
+               //              if ($db_result = dba_num_rows($db_query))
                                {
-                               if 
($this->insertsmstodb($sms_datetime,$sms_sender,$target_code,$message))
-                               {
-                                       $ok = true;
-                               }
+                                       if 
($this->insertsmstodb($sms_datetime,$sms_sender,$target_code,$message))
+                                       {
+                                               $ok = true;
+                                       }
                                }
                        }
                        if (!$ok)
                        {
                        $message = $target_code." ".$message;
-                       if 
($this->insertsmstoinbox($sms_datetime,$sms_sender,"admin",$message))
+                       if 
($this->insertsmstoinbox($sms_datetime,$sms_sender,"Admins",$message))
                        {
                                $ok = true;
                        }
Index: sms/inc/class.sosms.inc.php
diff -u sms/inc/class.sosms.inc.php:1.3 sms/inc/class.sosms.inc.php:1.4
--- sms/inc/class.sosms.inc.php:1.3     Thu May 18 13:27:59 2006
+++ sms/inc/class.sosms.inc.php Mon May 22 12:50:06 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.sosms.inc.php,v 1.3 2006/05/18 13:27:59 sigurdne 
Exp $
+       * @version $Id: class.sosms.inc.php,v 1.4 2006/05/22 12:50:06 sigurdne 
Exp $
        */
 
        /**
@@ -60,6 +60,7 @@
                                $grants         = 
$GLOBALS['phpgw']->acl->get_grants('sms',$acl_location);
                        }
 
+//_debug_array($grants);
                        if ($order)
                        {
                                $ordermethod = " ORDER BY $order $sort";
@@ -117,7 +118,7 @@
                                        'entry_time'    => 
$this->db->f('in_datetime'),
                                        'message'       => 
stripslashes($this->db->f('in_msg')),
                                        'user'          => 
$GLOBALS['phpgw']->accounts->id2name($this->db->f('in_uid')),
-                                       'grants'        => 
(int)$this->grants[$this->db->f('uid')]
+                                       'grants'        => 
(int)$grants[$this->db->f('in_uid')]
                                );
 
                        }
@@ -247,26 +248,6 @@
                        return $values;
                }
 
-               function read_training($id)
-               {
-                       $sql = "SELECT phpgw_hrm_training.id as 
training_id,phpgw_hrm_training.title as title, 
phpgw_hrm_training.start_date,phpgw_hrm_training.end_date,phpgw_hrm_training_place.name
 as place FROM phpgw_hrm_training $this->left_join phpgw_hrm_training_place on 
phpgw_hrm_training.place_id=phpgw_hrm_training_place.id WHERE 
phpgw_hrm_training.user_id=" . intval($id);
-
-                       $this->db->query($sql,__LINE__,__FILE__);
-
-                       while ($this->db->next_record())
-                       {
-                               $training[] = array
-                               (
-                                       'training_id'   => 
$this->db->f('training_id'),
-                                       'start_date'    => 
$this->db->f('start_date'),
-                                       'end_date'      => 
$this->db->f('end_date'),
-                                       'title' => 
stripslashes($this->db->f('title')),
-                                       'place' => 
stripslashes($this->db->f('place'))
-                               );
-
-                       }
-                       return $training;
-               }
 
                function add($values)
                {
@@ -326,6 +307,12 @@
                        $this->db->query("UPDATE phpgw_sms_tblsmsoutgoing SET 
flag_deleted='1' WHERE smslog_id="  . intval($id),__LINE__,__FILE__);
                }
 
+               function delete_in($id)
+               {
+                       $this->db->query("UPDATE phpgw_sms_tbluserinbox SET 
in_hidden='1' WHERE in_id="  . intval($id),__LINE__,__FILE__);
+               }
+
+
                function select_place_list()
                {
                        $this->db->query("SELECT * FROM 
phpgw_hrm_training_place  ORDER BY name ");
Index: sms/inc/class.uisms.inc.php
diff -u sms/inc/class.uisms.inc.php:1.7 sms/inc/class.uisms.inc.php:1.8
--- sms/inc/class.uisms.inc.php:1.7     Thu May 18 13:27:59 2006
+++ sms/inc/class.uisms.inc.php Mon May 22 12:50:06 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.7 2006/05/18 13:27:59 sigurdne 
Exp $
+       * @version $Id: class.uisms.inc.php,v 1.8 2006/05/22 12:50:06 sigurdne 
Exp $
        */
 
        /**
@@ -32,6 +32,7 @@
                        'outbox'   => True,
                        'send'   => True,
                        'send_group'=> True,
+                       'delete_in' => True,
                        'delete_out' => True
                );
 
@@ -84,14 +85,21 @@
 
                        while (is_array($sms_info) && list(,$entry) = 
each($sms_info))
                        {
-
                                
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
                                {
                                        $link_delete            = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_in&id='
 . $entry['id']);
                                        $text_delete            = 
lang('delete');
-                                       $lang_delete_sms_text = lang('delete 
the sms from outbox');
+                                       $lang_delete_sms_text = lang('delete 
the sms from inbox');
                                }
 
+                               
if($this->bocommon->check_perms($entry['grants'], PHPGW_ACL_DELETE))
+                               {
+                                       $link_answer            = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.send&p_num='
 . $entry['sender']);
+                                       $text_answer            = 
lang('answer');
+                                       $lang_answer_sms_text = lang('answer 
this sms');
+                               }
+
+
                                $content[] = array
                                (
                                        'id'                                    
=> $entry['id'],
@@ -102,6 +110,10 @@
                                        'link_delete'                           
=> $link_delete,
                                        'text_delete'                           
=> $text_delete,
                                        'lang_delete_sms_text'                  
=> $lang_delete_sms_text,
+                                       'link_answer'                           
=> $link_answer,
+                                       'text_answer'                           
=> $text_answer,
+                                       'lang_answer_sms_text'                  
=> $lang_answer_sms_text,
+
                                );
 
                                unset ($link_delete);
@@ -110,7 +122,7 @@
 
                        }
 
-//_debug_array($content);
+//_debug_array($entry['grants']);
 
                        $table_header[] = array
                        (
@@ -125,12 +137,24 @@
                                                                                
                                'cat_id'        =>$this->cat_id,
                                                                                
                                'allrows' => $this->allrows)
                                                                                
)),
+                               'sort_sender'   => 
$this->nextmatchs->show_sort_order(array
+                                                                               
(
+                                                                               
        'sort'  => $this->sort,
+                                                                               
        'var'   =>      'in_sender',
+                                                                               
        'order' =>      $this->order,
+                                                                               
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uisms.index',
+                                                                               
                                'query'         =>$this->query,
+                                                                               
                                'cat_id'        =>$this->cat_id,
+                                                                               
                                'allrows' => $this->allrows)
+                                                                               
)),
+
                                'lang_delete'   => lang('delete'),
                                'lang_id'       => lang('id'),
                                'lang_user'     => lang('user'),
                                'lang_sender'   => lang('sender'),
                                'lang_entry_time'=> lang('time'),
                                'lang_message'  => lang('message'),
+                               'lang_answer'   => lang('answer'),
                        );
 
                        if(!$this->allrows)
@@ -326,6 +350,7 @@
 
                function send()
                {
+                       $p_num          = get_var('p_num',array('POST','GET'));
                        $values         = get_var('values',array('POST'));
                        $from           = get_var('from',array('POST','GET'));
                        $from           = $from?$from:'index';
@@ -341,6 +366,8 @@
                                $values['msg_flash']            = 
get_var('msg_flash',array('POST'));
                                $values['msg_unicode']          = 
get_var('msg_unicode',array('POST'));
 
+                               $p_num          = 
$values['p_num_text']?$values['p_num_text']:$p_num;
+                               
                                if ($values['save'] || $values['apply'])
                                {
 
@@ -441,6 +468,7 @@
                                'lang_from'                     => lang('from'),
                                
                                'value_sms_from'                => 
$this->gateway_number,
+                               'value_p_num'                   => $p_num,
                                'lang_format'                   => 
lang('International format'),
                                'lang_message'                  => 
lang('message'),
                                'lang_character_left'           => 
lang('character left'),                              
@@ -469,6 +497,43 @@
                }
 
 
+               function delete_in()
+               {
+                       $id             = get_var('id',array('POST','GET'));
+                       $confirm        = get_var('confirm',array('POST'));
+
+                       $link_data = array
+                       (
+                               'menuaction' => $this->currentapp.'.uisms.index'
+                       );
+
+                       if (get_var('confirm',array('POST')))
+                       {
+                               $this->bo->delete_in($id);
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                       }
+
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
+
+                       $data = array
+                       (
+                               'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
+                               'delete_action'                 => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uisms.delete_in&id='
 . $id),
+                               'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
+                               'lang_yes'                      => lang('yes'),
+                               'lang_yes_statustext'           => lang('Delete 
the entry'),
+                               'lang_no_statustext'            => lang('Back 
to the list'),
+                               'lang_no'                       => lang('no')
+                       );
+
+                       $appname                                = 
lang('outbox');
+                       $function_msg                           = 
lang('delete');
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
+               }
+
+
                function delete_out()
                {
                        $id             = get_var('id',array('POST','GET'));
Index: sms/templates/base/sms.xsl
diff -u sms/templates/base/sms.xsl:1.4 sms/templates/base/sms.xsl:1.5
--- sms/templates/base/sms.xsl:1.4      Thu May 18 13:27:59 2006
+++ sms/templates/base/sms.xsl  Mon May 22 12:50:06 2006
@@ -1,11 +1,11 @@
-<!-- $Id: sms.xsl,v 1.4 2006/05/18 13:27:59 sigurdne Exp $ -->
+<!-- $Id: sms.xsl,v 1.5 2006/05/22 12:50:06 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
-                       <xsl:when test="edit">
+                       <xsl:when test="send">
                                <xsl:apply-templates select="send"/>
                        </xsl:when>
-                       <xsl:when test="edit">
+                       <xsl:when test="send_group">
                                <xsl:apply-templates select="send_group"/>
                        </xsl:when>
                        <xsl:when test="list_outbox">
@@ -52,6 +52,7 @@
 
        <xsl:template match="table_header_inbox">
                <xsl:variable name="sort_entry_time"><xsl:value-of 
select="sort_entry_time"/></xsl:variable>
+               <xsl:variable name="sort_sender"><xsl:value-of 
select="sort_sender"/></xsl:variable>
                <tr class="th">
                        <td class="th_text" width="1%" align="right">
                                <xsl:value-of select="lang_id"/>
@@ -59,19 +60,20 @@
                        <td class="th_text" width="1%" align="right">
                                <xsl:value-of select="lang_user"/>
                        </td>
-
                        <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_sender"/>
+                               <a href="{$sort_sender}"><xsl:value-of 
select="lang_sender"/></a>
                        </td>
 
                        <td class="th_text" width="10%" align="center">
                                <a href="{$sort_entry_time}"><xsl:value-of 
select="lang_entry_time"/></a>
                        </td>
-
                        <td class="th_text" width="50%" align="center">
                                <xsl:value-of select="lang_message"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
+                               <xsl:value-of select="lang_answer"/>
+                       </td>
+                       <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_delete"/>
                        </td>
                </tr>
@@ -79,7 +81,7 @@
 
        <xsl:template match="values_inbox">
                <xsl:variable name="lang_delete_sms_text"><xsl:value-of 
select="lang_delete_place_text"/></xsl:variable>
-
+               <xsl:variable name="lang_answer_sms_text"><xsl:value-of 
select="lang_answer_place_text"/></xsl:variable>
                        <tr>
                                <xsl:attribute name="class">
                                        <xsl:choose>
@@ -113,6 +115,10 @@
                                </td>
 
                                <td align="center">
+                                       <xsl:variable 
name="link_answer"><xsl:value-of select="link_answer"/></xsl:variable>
+                                       <a href="{$link_answer}" 
onMouseover="window.status='{$lang_answer_sms_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_answer"/></a>
+                               </td>
+                               <td align="center">
                                        <xsl:variable 
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
                                        <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_sms_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
                                </td>
@@ -263,7 +269,7 @@
        </xsl:template>
 
 
-<!-- add / edit  -->
+<!-- send -->
        <xsl:template match="send">
                <div align="left">
                <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
@@ -290,7 +296,7 @@
                                        <xsl:value-of select="lang_to"/>
                                </td>
                                <td>
-                                       <input type="text" size="20" 
maxlength="20" name="p_num_text" value="{value_p_num_text}" 
onMouseout="window.status='';return true;">
+                                       <input type="text" size="20" 
maxlength="20" name="p_num_text" value="{value_p_num}" 
onMouseout="window.status='';return true;">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_to_status_text"/>




reply via email to

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