[Phpgroupware-cvs] property/class.uiwo_hour.php, 1.1.1.10

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/class.uiwo_hour.php
diff -u property/class.uiwo_hour.php:1.1.1.9 
property/class.uiwo_hour.php:1.1.1.10
--- property/class.uiwo_hour.php:1.1.1.9        Fri Apr 30 09:52:25 2004
+++ property/class.uiwo_hour.php        Fri Apr 30 17:35:58 2004
@@ -107,7 +107,7 @@
 
                        if (isset($list) AND is_array($list))
                        {
-                               $dateformat                                     
        = $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                               $dateformat                                     
        = $GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                                foreach($list as $entry)
                                {
                                        $sum_deviation = $sum_deviation + 
$entry['amount'];
@@ -175,7 +175,7 @@
                        $hour_id                = 
$this->bocommon->get_var2('hour_id',array('POST','GET'));
                        $id                             = 
$this->bocommon->get_var2('id',array('POST','GET'));
                        $values                 = 
$this->bocommon->get_var2('values',array('POST','GET'));
-                       $dateformat             = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat             = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
 
                        $this->bocommon->xsl_add_file(array('wo_hour'));
 
@@ -661,11 +661,11 @@
                                'done_action'                                   
=> 
$this->bocommon->link('/index.php','sid=cookie&op='.$this->currentapp.'.uiwo_hour.index&workorder_id='
 . $workorder_id)
                        );
 
-                       $dateformat                                             
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat                                             
= $GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $date                                                   
= $this->bocommon->show_date(time(),$dateformat);
 
-                       $from_name      =       
$GLOBALS['phpgw_info']['user']['fullname'];
-                       $from_email     =       
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
+                       $from_name      =       
$GLOBALS['phpgw_data']['user']['fullname'];
+                       $from_email     =       
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.email'];
 
                        $email_data = array
                        (
@@ -685,7 +685,7 @@
                                'lang_from'                                     
        =>      lang('From'),
                                'from_name'                                     
        =>      $from_name,
                                'from_email'                                    
=>      $from_email,
-                               'from_phone'                                    
=>      
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['cellphone'],
+                               'from_phone'                                    
=>      $GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.cellphone'],
                                'lang_district'                                 
=>      lang('District'),
                                'district'                                      
        =>      $project['location_data']['district_id'],
 
@@ -721,7 +721,7 @@
                                'key_deliver_list'                              
=> $this->boproject->select_key_location_list($workorder['key_deliver']),
                                'lang_key_deliver'                              
=>      lang('Where to deliver the key'),
 
-                               'currency'                                      
        => $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+                               'currency'                                      
        => $GLOBALS['phpgw_data']['user']['preferences']['common']['currency'],
 
                                'lang_cost_tax'                                 
=>      lang('Cost (incl tax):'),
                                'lang_materials'                                
=>      lang('Materials:__________'),
@@ -889,7 +889,7 @@
                                }
                        }
 
-                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $date = $this->bocommon->show_date('',$dateformat);
 
                        // don't want any warnings turning up in the pdf code 
if the server is set to 'anal' mode.
@@ -1100,7 +1100,7 @@
 
                        if(!$this->allrows)
                        {
-                               $record_limit   = 15; 
//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                               $record_limit   = 15; 
//$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'];
                        }
                        else
                        {
@@ -1324,7 +1324,7 @@
 
                        if(!$this->allrows)
                        {
-                               $record_limit   = 15; 
//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+                               $record_limit   = 15; 
//$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'];
                        }
                        else
                        {
@@ -1545,7 +1545,7 @@
                                'lang_ns3420'                                   
=> lang('NS3420'),
                                'value_ns3420_id'                               
=> $values['ns3420_id'],
                                'lang_ns3420_statustext'                => 
lang('Select a standard-code from the norwegian standard'),
-                               'currency'                                      
        => $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
+                               'currency'                                      
        => $GLOBALS['phpgw_data']['user']['preferences']['common']['currency']
 
                        );