[Phpgroupware-cvs] CVS: etemplate/inc class.date_widget.inc.php, 1.13.2.3, 1.13.2.4

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv11857

Modified Files:
      Tag: Version-0_9_16-branch
        class.date_widget.inc.php 
Log Message:
rollback jscal

Index: class.date_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -C2 -r1.13.2.3 -r1.13.2.4
*** class.date_widget.inc.php   21 Aug 2003 08:27:05 -0000      1.13.2.3
--- class.date_widget.inc.php   6 Sep 2003 23:35:32 -0000       1.13.2.4
***************
*** 37,44 ****
                function date_widget($ui)
                {
-                       if ($ui == 'html')
-                       {
-                               $this->jscal = 
CreateObject('phpgwapi.jscalendar');
-                       }
                        $this->timeformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'];
                }
--- 37,40 ----
***************
*** 149,170 ****
                        {
                                $dcell = $tpl->empty_cell();
!                               // test if we can use jsCalendar
!                               if ($n == 0 && $this->jscal && 
$tmpl->java_script())
!                               {
!                                       $dcell['type'] = 'html';
!                                       $dcell['name'] = 'str';
!                                       $value['str'] = 
$this->jscal->input($name.'[str]',False,$value['Y'],$value['m'],$value['d'],lang($cell['help']));
!                                       $n = 2;                         // no 
other fields
!                                       $options &= ~2;         // no set-today 
button
!                                       // register us for process_exec
!                                       
$GLOBALS['phpgw_info']['etemplate']['to_process'][$name] = 'ext-'.$cell['type'];
!                               }
!                               else
!                               {
!                                       $dcell['type'] = $types[$format[$n]];
!                                       $dcell['size'] = $opts[$format[$n]];
!                                       $dcell['name'] = $format[$n];
!                                       $dcell['help'] = 
lang($help[$format[$n]]).': '.lang($cell['help']);     // note: no lang on 
help, already done
!                               }
                                if ($n == 4)
                                {
--- 145,153 ----
                        {
                                $dcell = $tpl->empty_cell();
!                               $dcell['type'] = $types[$format[$n]];
!                               $dcell['size'] = $opts[$format[$n]];
!                               $dcell['name'] = $format[$n];
!                               $dcell['help'] = lang($help[$format[$n]]).': 
'.lang($cell['help']);     // note: no lang on help, already done
! 
                                if ($n == 4)
                                {
***************
*** 240,251 ****
                                        $value[$d] = date($d);
                                }
-                       }
-                       if (isset($value_in['str']) && !empty($value_in['str']))
-                       {
-                               if (!is_array($value))
-                               {
-                                       $value = array();
-                               }
-                               $value += 
$this->jscal->input2date($value_in['str'],False,'d','m','Y');
                        }
                        if ($value['d'] || isset($value['H']) && $value['H'] 
!== '' ||
--- 223,226 ----