[Phpgroupware-cvs] property/class.botts.php, 1.1.1.13

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.botts.php

date: 2004/05/11 13:32:40;  author: sigurdne;  state: Exp;  lines: +12 -6

Log Message:
no message
=====================================================================
Index: property/class.botts.php
diff -u property/class.botts.php:1.1.1.12 property/class.botts.php:1.1.1.13
--- property/class.botts.php:1.1.1.12   Mon May 10 13:18:14 2004
+++ property/class.botts.php    Tue May 11 13:32:40 2004
@@ -54,6 +54,7 @@
                        $sort   = 
$this->bocommon->get_var2('sort',array('POST','GET'));
                        $order  = 
$this->bocommon->get_var2('order',array('POST','GET'));
                        $filter = 
$this->bocommon->get_var2('filter',array('POST','GET'));
+                       $user_filter= 
$this->bocommon->get_var2('user_filter',array('POST','GET'));
                        $cat_id = 
$this->bocommon->get_var2('cat_id',array('POST','GET'));
                        $district_id    = 
$this->bocommon->get_var2('district_id',array('POST','GET'));
                        $allrows        = 
$this->bocommon->get_var2('allrows',array('POST','GET'));
@@ -75,6 +76,10 @@
                        {
                                $this->filter = $filter;
                        }
+                       if(isset($user_filter))
+                       {
+                               $this->user_filter = $user_filter;
+                       }
                        if(isset($sort))
                        {
                                $this->sort = $sort;
@@ -113,6 +118,7 @@
                        $this->start    = $data['start'];
                        $this->query    = $data['query'];
                        $this->filter   = $data['filter'];
+                       $this->user_filter      = $data['user_filter'];
                        $this->sort             = $data['sort'];
                        $this->order    = $data['order'];
                        $this->cat_id   = $data['cat_id'];
@@ -295,7 +301,7 @@
                {
                        $tickets = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                                                                
        'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' => 
$this->district_id,
-                                                                               
        'allrows'=>$this->allrows));
+                                                                               
        'allrows'=>$this->allrows,'user_filter' => $this->user_filter));
                        $this->total_records = $this->so->total_records;
                        $entity = $this->so->get_origin_entity_type();
 
@@ -614,7 +620,7 @@
                        $group_name= 
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
 
                        // build subject
-                       $ticket['subject'] = '['.lang('Ticket').' #'.$id.'] : ' 
. $location_code .' ' .$this->get_category_name($ticket['cat_id']);
+                       $subject = '['.lang('Ticket').' #'.$id.'] : ' . 
$location_code .' ' .$this->get_category_name($ticket['cat_id']) . '; ' 
.$ticket['subject'];
 
 
                //      $prefs_user = 
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['user_id']);
@@ -697,7 +703,7 @@
                                        $body .=lang('Note').': '. 
nl2br(stripslashes($value['new_value']))."\n\n";
                                        $i++;
                                }
-                               $ticket['subject'].= "-" .$i;
+                               $subject.= "-" .$i;
                        }
 
                        
/**************************************************************\
@@ -763,11 +769,11 @@
 
                        if ($mail_method=='smtp'):
                        {
-                               $rc = $this->send->msg('email', $to, 
$ticket['subject'], stripslashes($body), '', $cc, 
$bcc,$current_user_address,$current_user_name,'txt');
+                               $rc = $this->send->msg('email', $to, $subject, 
stripslashes($body), '', $cc, 
$bcc,$current_user_address,$current_user_name,'txt');
                        }
                        elseif ($mail_method=='sendmail'):
                        {
-                               $rc=    
@mail($to,$ticket['subject'],stripslashes($body), $headers);
+                               $rc=    @mail($to,$subject,stripslashes($body), 
$headers);
                        }
                        else:
                        {
@@ -782,7 +788,7 @@
                                $receipt['error'][] = array('msg'=> lang('The 
mail server returned'));
                                $receipt['error'][] = array('msg'=> 'From :' . 
$current_user_name . '<' . $current_user_address .'>');
                                $receipt['error'][] = array('msg'=> 'to: '.$to);
-                               $receipt['error'][] = array('msg'=> 'subject: 
'.$ticket['subject']);
+                               $receipt['error'][] = array('msg'=> 'subject: 
'.$subject);
                                $receipt['error'][] = array('msg'=> $body );
        //                      $receipt['error'][] = array('msg'=> 'cc: ' . 
$cc);
        //                      $receipt['error'][] = array('msg'=> 'bcc: 
'.$bcc);