[Phpgroupware-cvs] property/class.uilocation.php, 1.1.1.15

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/class.uilocation.php
diff -u property/class.uilocation.php:1.1.1.14 
property/class.uilocation.php:1.1.1.15
--- property/class.uilocation.php:1.1.1.14      Fri Apr 30 09:52:25 2004
+++ property/class.uilocation.php       Fri Apr 30 17:35:57 2004
@@ -417,7 +417,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($location_list),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => $this->bocommon->short_link('/index.php',$link_data),
@@ -659,7 +659,7 @@
 
                        $contacts                       = 
CreateObject($this->currentapp.'_contacts');
 
-                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $sep = '/';
                        $dlarr[strpos($dateformat,'Y')] = 'Y';
                        $dlarr[strpos($dateformat,'m')] = 'm';
@@ -794,7 +794,7 @@
                        
$this->fm_session->appsession('insert_record',$this->currentapp,$insert_record);
 
 
-                       $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';
@@ -1012,7 +1012,7 @@
 
                        $contacts                       = 
CreateObject($this->currentapp.'_contacts');
 
-                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $sep = '/';
                        $dlarr[strpos($dateformat,'Y')] = 'Y';
                        $dlarr[strpos($dateformat,'m')] = 'm';
@@ -1132,7 +1132,7 @@
                                }
                        }
 
-                       $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';