[Phpgroupware-cvs] property/class.uiproject.php, 1.1.1.11

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/class.uiproject.php
diff -u property/class.uiproject.php:1.1.1.10 
property/class.uiproject.php:1.1.1.11
--- property/class.uiproject.php:1.1.1.10       Fri Apr 30 09:52:25 2004
+++ property/class.uiproject.php        Fri Apr 30 17:35:57 2004
@@ -397,7 +397,7 @@
                                'links'                                         
        => $links,
                                'allow_allrows'                                 
=> false,
                                'start_record'                                  
=> $this->start,
-                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'],
                                'num_records'                                   
=> count($project_list),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => $this->bocommon->link('/index.php',$link_data),
@@ -452,7 +452,7 @@
                        $appname                = lang('project');
 
 
-                       $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                       $dateformat = 
strtolower($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
                        $sep = '/';
                        $dlarr[strpos($dateformat,'y')] = 'yyyy';
                        $dlarr[strpos($dateformat,'m')] = 'MM';
@@ -463,7 +463,7 @@
 
                        if(!$values['end_date'])
                        {
-                               $values['end_date'] = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               $values['end_date'] = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
                        }
 
                        $cal_info       = $this->bocommon->jscalendar();
@@ -659,8 +659,8 @@
 
                                        if ($values['approval'] && 
$values['mail_address'])
                                        {
-                                               
$coordinator_name=$GLOBALS['phpgw_info']['user']['fullname'];
-                                               
$coordinator_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
+                                               
$coordinator_name=$GLOBALS['phpgw_data']['user']['fullname'];
+                                               
$coordinator_email=$GLOBALS['phpgw_data']['prefs'][$this->currentapp . 
'.email'];
                                                $headers = "Return-Path: <". 
$coordinator_email .">\r\n";
                                                $headers .= "From: " . 
$coordinator_name . "<" . $coordinator_email .">\r\n";
                                                $headers .= "Bcc: " . 
$coordinator_name . "<" . $coordinator_email .">\r\n";
@@ -794,11 +794,11 @@
                        );
 
 
-                       
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
+                       
$supervisor_id=$GLOBALS['phpgw_data']['prefs'][$this->currentapp . 
'.approval_from'];
                        $need_approval = 
$config->config_data['workorder_approval'];
 
-                       
$project_status=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'];
-                       
$project_category=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_category'];
+                       
$project_status=$GLOBALS['phpgw_data']['prefs'][$this->currentapp . 
'.project_status'];
+                       
$project_category=$GLOBALS['phpgw_data']['prefs'][$this->currentapp . 
'.project_category'];
                        if(!$values['status'])
                        {
                                $values['status']=$project_status;
@@ -816,13 +816,14 @@
 
                        if ($supervisor_id && $need_approval=='yes')
                        {
-                               $prefs = 
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
-                               $supervisor_email = $prefs['email'];
+//                             $prefs = 
$this->bocommon->create_preferences($this->currentapp,$supervisor_id);
+//                             $supervisor_email = $prefs['email'];
+                               $supervisor_email = 
$GLOBALS['phpgw']->prefs->get('email',$supervisor_id,$this->currentapp);
                        }
 
                        if(!$values['start_date'])
                        {
-                               $values['start_date'] = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               $values['start_date'] = 
$this->bocommon->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
                        }
 
                        if($receipt)
@@ -983,7 +984,7 @@
                                'value_approval_mail_address'           => 
$supervisor_email,
 
 
-                               'currency'                                      
        => $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
+                               'currency'                                      
        => $GLOBALS['phpgw_data']['user']['preferences']['common']['currency']
                        );
 
                        $appname                = lang('project');
@@ -1192,7 +1193,7 @@
                                'edit_action'                                   
        => 
$this->bocommon->link('/index.php','sid=cookie&op='.$this->currentapp.'.uiproject.edit&id='
 . $id),
                                'lang_edit_statustext'                          
=> lang('Edit this entry project'),
                                'lang_edit'                                     
                => lang('Edit'),
-                               'currency'                                      
                => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
+                               'currency'                                      
                => 
$GLOBALS['phpgw_data']['user']['preferences']['common']['currency']
                        );
 
                        $appname                = lang('project');