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

[nomail]

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

date: 2004/04/30 17:35:56;  author: sigurdne;  state: Exp;  lines: +14 -11

Log Message:
no message
=====================================================================
Index: property/class.botts.php
diff -u property/class.botts.php:1.1.1.8 property/class.botts.php:1.1.1.9
--- property/class.botts.php:1.1.1.8    Fri Apr 30 09:52:25 2004
+++ property/class.botts.php    Fri Apr 30 17:35:56 2004
@@ -40,7 +40,7 @@
                        $this->bocommon         = 
CreateObject($this->currentapp.'_bocommon');
                        $this->historylog       = 
CreateObject($this->currentapp.'_historylog','tts');
                        $this->config           = 
CreateObject($this->currentapp.'_config');
-                       $this->dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $this->dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $this->fm_session       = 
CreateObject($this->currentapp.'_session');
 
                        if ($session)
@@ -203,7 +203,7 @@
 
                        if(!$selected)
                        {
-                               $selected = 
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['prioritydefault'];
+                               $selected = 
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.prioritydefault'];
                        }
 
                        $priority_comment[1]=' - '.lang('Lowest');
@@ -594,23 +594,25 @@
 
 
                //      $prefs_user = 
$GLOBALS['phpgw']->preferences->create_email_preferences($ticket['user_id']);
-                       $prefs_user = 
$this->bocommon->create_preferences($this->currentapp,$ticket['user_id']);
+               //      $prefs_user = 
$this->bocommon->create_preferences($this->currentapp,$ticket['user_id']);
+               //      $from_address=$prefs_user['email'];
 
-                       $from_address=$prefs_user['email'];
+                       $from_address = 
$GLOBALS['phpgw']->prefs->get('email',$ticket['user_id'],$this->currentapp);
 
        //-----------from--------
 
                        $current_user_id=$GLOBALS['phpgw_data']['user']['id'];
 
-                       $current_user_firstname = 
$GLOBALS['phpgw_info']['user']['firstname'];
+                       $current_user_firstname = 
$GLOBALS['phpgw_data']['user']['firstname'];
 
-                       $current_user_lastname  
=$GLOBALS['phpgw_info']['user']['lastname'];
+                       $current_user_lastname  
=$GLOBALS['phpgw_data']['user']['lastname'];
 
                        $current_user_name= $user_firstname . " " 
.$user_lastname ;
 
 //                     $current_prefs_user = 
$GLOBALS['phpgw']->preferences->create_email_preferences($current_user_id);
-                       $current_prefs_user = 
$this->bocommon->create_preferences($this->currentapp,$current_user_id);
-                       $current_user_address=$current_prefs_user['email'];
+//                     $current_prefs_user = 
$this->bocommon->create_preferences($this->currentapp,$current_user_id);
+//                     $current_user_address=$current_prefs_user['email'];
+                       $current_user_address = 
$GLOBALS['phpgw']->prefs->get('email',$current_user_id,$this->currentapp);
 
                        $headers = "Return-Path: <". $current_user_address 
.">\r\n";
                        $headers .= "From: " . $current_user_name . "<" . 
$current_user_address .">\r\n";
@@ -690,10 +692,11 @@
                                if ($members[$i]['account_id'])
                                {
                        //              $prefs = 
$GLOBALS['phpgw']->preferences->create_email_preferences($members[$i]['account_id']);
-                                       $prefs = 
$this->bocommon->create_preferences($this->currentapp,$members[$i]['account_id']);
-                                       if (strlen($prefs['email'])> 
(strlen($members[$i]['account_name'])+1))
+                       //              $prefs = 
$this->bocommon->create_preferences($this->currentapp,$members[$i]['account_id']);
+
+                                       if 
(strlen($GLOBALS['phpgw']->prefs->get('email',$members[$i]['account_id'],$this->currentapp))>
 (strlen($members[$i]['account_name'])+1))
                                        {
-                                               $toarray[$prefs['email']] = 
$prefs['email'];
+                                               
$toarray[$GLOBALS['phpgw']->prefs->get('email',$members[$i]['account_id'],$this->currentapp)]
 = 
$GLOBALS['phpgw']->prefs->get('email',$members[$i]['account_id'],$this->currentapp);
                                        }
                                        else
                                        {