[Phpgroupware-cvs] CVS: etemplate/inc class.date_widget.inc.php, 1.13.2.2, 1.13.2.3 class.select_widget.inc.php, 1.8, 1.8.2.1

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.date_widget.inc.php class.select_widget.inc.php 
Log Message:
make time in date-widget use padding zeros for the minutes and with 24h 
timeformat for the hours too.


Index: class.date_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.date_widget.inc.php,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -r1.13.2.2 -r1.13.2.3
*** class.date_widget.inc.php   20 Aug 2003 00:35:24 -0000      1.13.2.2
--- class.date_widget.inc.php   21 Aug 2003 08:27:05 -0000      1.13.2.3
***************
*** 135,140 ****
                        );
                        $opts = array(
!                               'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23',
!                               'i' => $value['i'] % 5 || $options & 4 ? 
',0,59' : ',0,59,5' // 5min steps, if ok with value
                        );
                        $help = array(
--- 135,140 ----
                        );
                        $opts = array(
!                               'H' => $this->timeformat == '12' ? ',0,12' : 
',0,23,01',
!                               'i' => $value['i'] % 5 || $options & 4 ? 
',0,59,01' : ',0,59,05' // 5min steps, if ok with value
                        );
                        $help = array(

Index: class.select_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.select_widget.inc.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** class.select_widget.inc.php 4 May 2003 09:18:40 -0000       1.8
--- class.select_widget.inc.php 21 Aug 2003 08:27:05 -0000      1.8.2.1
***************
*** 490,498 ****
                                        // fall-through
                                        
!                               case 'select-number':   // options: 
rows,min,max,dec
!                                       $cell['sel_options'][''] = '';
!                                       $type = $type === '' ? 1 : 
intval($type);
!                                       $type2 = $type2 === '' ? 10 : 
intval($type2);
!                                       $type3 = !$type3 ? 1 : intval($type3);
                                        if (($type < $type2) != ($type3 > 0))
                                        {
--- 490,502 ----
                                        // fall-through
                                        
!                               case 'select-number':   // options: 
rows,min,max,decrement
!                                       $type = $type === '' ? 1 : 
intval($type);               // min
!                                       $type2 = $type2 === '' ? 10 : 
intval($type2);   // max
!                                       $format = '%d';
!                                       if (!empty($type3) && $type3[0] == '0') 
                // leading zero
!                                       {
!                                               $format = 
'%0'.strlen($type3).'d';
!                                       }
!                                       $type3 = !$type3 ? 1 : intval($type3);  
                // decrement
                                        if (($type < $type2) != ($type3 > 0))
                                        {
***************
*** 501,505 ****
                                        for ($i=0,$n=$type; $n <= $type2 && $i 
<= 100; $n += $type3)
                                        {
!                                               $cell['sel_options'][$n] = $n;
                                        }
                                        $cell['no_lang'] = True;
--- 505,509 ----
                                        for ($i=0,$n=$type; $n <= $type2 && $i 
<= 100; $n += $type3)
                                        {
!                                               $cell['sel_options'][$n] = 
sprintf($format,$n);
                                        }
                                        $cell['no_lang'] = True;