[Phpgroupware-cvs] demo/inc class.bodemo.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    demo
Changes by:     Sigurd Nes <sigurdne>   07/01/17 10:03:33

Modified files:
        inc            : class.bodemo.inc.php 

Log message:
        better date handling

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/demo/inc/class.bodemo.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7

Patches:
Index: class.bodemo.inc.php
===================================================================
RCS file: /sources/phpgroupware/demo/inc/class.bodemo.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- class.bodemo.inc.php        27 Dec 2006 11:04:41 -0000      1.6
+++ class.bodemo.inc.php        17 Jan 2007 10:03:33 -0000      1.7
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package demo
        * @subpackage demo
-       * @version $Id: class.bodemo.inc.php,v 1.6 2006/12/27 11:04:41 sigurdne 
Exp $
+       * @version $Id: class.bodemo.inc.php,v 1.7 2007/01/17 10:03:33 sigurdne 
Exp $
        */
 
        /**
@@ -287,42 +287,46 @@
                        return 
$this->custom->preserve_attribute_values($values,$values_attribute);
                }
 
-               function date_array($date)
+               function date_array($datestr)
                {
-                       if(!$date)
+                       $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+                       $fields = split('[./-]',$datestr);
+                       foreach(split('[./-]',$dateformat) as $n => $field)
                        {
-                               $date_array['day']      = date("d");
-                               $date_array['month']    = date("m");
-                               $date_array['year']     = date("Y");
-                       }
-                       else
+                               $date[$field] = intval($fields[$n]);
+
+                               if($field == 'M')
+                               {
+                                       for($i=1; $i <=12; $i++)
                        {
-                               $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];
+                                               
if(date('M',mktime(0,0,0,$i,1,2000)) == $fields[$n])
+                                               {
+                                                       $date['m'] = $i;
+                                               }
+                                       }
+                               }
                        }
 
-                       return $date_array;
+                       $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;
                }
 
-
        }