[Phpgroupware-cvs] property/class.bocommon.php, 1.1.1.14

[nomail]

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

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

Log Message:
no message
=====================================================================
Index: property/class.bocommon.php
diff -u property/class.bocommon.php:1.1.1.13 
property/class.bocommon.php:1.1.1.14
--- property/class.bocommon.php:1.1.1.13        Fri Apr 30 09:52:25 2004
+++ property/class.bocommon.php Fri Apr 30 17:35:55 2004
@@ -81,14 +81,14 @@
                {
                        $phpgw_js_url = 
dirname($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']).'/api/skins/default';
                        $img = $phpgw_js_url.'/images/calendar_popup.png';
-                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                       $dateformat = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                        $jsDateFormat = '%B %e, %Y';//str_replace(array('d', 
'm', 'M', 'Y'), array('%d', '%m', '%b', '%Y'), $dateformat);
 /*
                        $GLOBALS['phpgw_info']['flags']['java_script'] 
.='</script>
                        <link rel="stylesheet" type="text/css" media="all" 
href="'.$phpgw_js_url.'/jscalendar/calendar-win2k-cold-1.css" 
title="win2k-cold-1" >
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/calendar.js"></script>
                        <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/calendar-setup.js"></script>
-                       <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],0,2)
 .'.js"></script>
+                       <script type="text/javascript" 
src="'.$phpgw_js_url.'/jscalendar/lang/calendar-'.substr($GLOBALS['phpgw_data']['user']['preferences']['common']['lang'],0,2)
 .'.js"></script>
                        ';
 */
 
@@ -173,7 +173,7 @@
 
                function date_array($date)
                {
-                       $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                       $dateformat = 
strtolower($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
                        $dateformat = str_replace(".","",$dateformat);
                        $dateformat = str_replace("-","",$dateformat);
                        $dateformat = str_replace("/","",$dateformat);
@@ -206,7 +206,7 @@
 
                        if(!$selected)
                        {
-                               
$selected=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp][$entity_type.'_columns_'.$cat_id];
+                               
$selected=$GLOBALS['phpgw_data']['user']['preferences'][$this->currentapp][$entity_type.'_columns_'.$cat_id];
                        }
 
                        $columns = 
$bostandard_entity->read_attrib($entity_type,$cat_id,$allrows);
@@ -640,7 +640,7 @@
 
                                if($values_attribute[$i]['datatype']=='D' && 
$values_attribute[$i]['value'])
                                {
-                                       $dateformat= 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+                                       $dateformat= 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
                                        $dateformat = 
str_replace(".","",$dateformat);
                                        $dateformat = 
str_replace("-","",$dateformat);
                                        $dateformat = 
str_replace("/","",$dateformat);
@@ -1479,8 +1479,8 @@
 
                        if (! $format)
                        {
-                               $format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'] . ' - ';
-                               if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] == '12')
+                               $format = 
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'] . ' - ';
+                               if 
($GLOBALS['phpgw_data']['user']['preferences']['common']['timeformat'] == '12')
                                {
                                        $format .= 'h:i:s a';
                                }