[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm/inc class.bocommon.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] hrm/inc class.bocommon.inc.php |
Date: |
Wed, 03 Jan 2007 14:33:19 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Changes by: Sigurd Nes <sigurdne> 07/01/03 14:33:19
Modified files:
inc : class.bocommon.inc.php
Log message:
date conversion
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.bocommon.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.bocommon.inc.php 28 Dec 2006 04:55:30 -0000 1.12
+++ class.bocommon.inc.php 3 Jan 2007 14:33:19 -0000 1.13
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.12 2006/12/28 04:55:30
skwashd Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.13 2007/01/03 14:33:19
sigurdne Exp $
*/
/**
@@ -146,36 +146,48 @@
return $moneyformat;
}
+ function date_array($datestr)
+ {
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- function date_array($date)
+ $fields = split('[./-]',$datestr);
+ foreach(split('[./-]',$dateformat) as $n => $field)
{
- $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $dateformat = str_replace(".","",$dateformat);
- $dateformat = str_replace("-","",$dateformat);
- $dateformat = str_replace("/","",$dateformat);
- $y=strpos($dateformat,'y');
- $d=strpos($dateformat,'d');
- $m=strpos($dateformat,'m');
-
- $dateparts = explode('/', $date);
- $date_array['day'] = $dateparts[$d];
- $date_array['month'] = $dateparts[$m];
- $date_array['year'] = $dateparts[$y];
+ $date[$field] = intval($fields[$n]);
- return $date_array;
+ if($field == 'M')
+ {
+ for($i=1; $i <=12; $i++)
+ {
+
if(date('M',mktime(0,0,0,$i,1,2000)) == $fields[$n])
+ {
+ $date['m'] = $i;
+ }
+ }
+ }
+ }
+
+ $ret = array(
+ 'year' => $date['Y'],
+ 'month' => $date['m'],
+ 'day' => $date['d']
+ );
+ return $ret;
}
function date_to_timestamp($date)
{
- if($date)
+ if ($date === '')
{
+ return False;
+ }
+
$date_array = $this->date_array($date);
$date = mktime
(8,0,0,$date_array['month'],$date_array['day'],$date_array['year']);
- }
+
return $date;
}
-
function select_multi_list($selected='',$input_list)
{
$j=0;
- [Phpgroupware-cvs] hrm/inc class.bocommon.inc.php,
Sigurd Nes <=