[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/class.bocommon.php, 1.1.1.15
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/class.bocommon.php, 1.1.1.15 |
Date: |
Sun, 23 May 2004 05:40:15 -0000 |
Update of /property
Modified Files:
Branch:
class.bocommon.php
date: 2004/05/02 12:47:33; author: sigurdne; state: Exp; lines: +9 -5
Log Message:
no message
=====================================================================
Index: property/class.bocommon.php
diff -u property/class.bocommon.php:1.1.1.14
property/class.bocommon.php:1.1.1.15
--- property/class.bocommon.php:1.1.1.14 Fri Apr 30 17:35:55 2004
+++ property/class.bocommon.php Sun May 2 12:47:33 2004
@@ -61,6 +61,10 @@
// $this->dateformat = "F j,
Y";
// $this->datetimeformat = "F j, Y g:iA";
break;
+ default:
+ $this->dateformat = "M d
Y";
+ $this->datetimeformat = "M d Y g:iA";
+
}
/* if
($GLOBALS['phpgw_data']['server']['db_type']=='mssql')
@@ -81,7 +85,7 @@
{
$phpgw_js_url =
dirname($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']).'/api/skins/default';
$img = $phpgw_js_url.'/images/calendar_popup.png';
- $dateformat =
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
+ $dateformat =
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.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>
@@ -173,7 +177,7 @@
function date_array($date)
{
- $dateformat =
strtolower($GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat']);
+ $dateformat =
strtolower($GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat']);
$dateformat = str_replace(".","",$dateformat);
$dateformat = str_replace("-","",$dateformat);
$dateformat = str_replace("/","",$dateformat);
@@ -640,7 +644,7 @@
if($values_attribute[$i]['datatype']=='D' &&
$values_attribute[$i]['value'])
{
- $dateformat=
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'];
+ $dateformat=
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat'];
$dateformat =
str_replace(".","",$dateformat);
$dateformat =
str_replace("-","",$dateformat);
$dateformat =
str_replace("/","",$dateformat);
@@ -1479,7 +1483,7 @@
if (! $format)
{
- $format =
$GLOBALS['phpgw_data']['user']['preferences']['common']['dateformat'] . ' - ';
+ $format =
$GLOBALS['phpgw_data']['prefs'][$this->currentapp . '.dateformat'] . ' - ';
if
($GLOBALS['phpgw_data']['user']['preferences']['common']['timeformat'] == '12')
{
$format .= 'h:i:s a';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/class.bocommon.php, 1.1.1.15,
nomail <=