[Phpgroupware-cvs] phpgwapi/inc class.sbox.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/09/18 11:56:44

Modified files:
        inc            : class.sbox.inc.php 

Log message:
        fix notice and some other issues with years

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.sbox.inc.php?cvsroot=phpgwapi&r1=1.29&r2=1.30

Patches:
Index: class.sbox.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.sbox.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.sbox.inc.php  30 Dec 2004 06:47:31 -0000      1.29
+++ class.sbox.inc.php  18 Sep 2006 11:56:44 -0000      1.30
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.sbox.inc.php,v 1.29 2004/12/30 06:47:31 skwashd 
Exp $
+       * @version $Id: class.sbox.inc.php,v 1.30 2006/09/18 11:56:44 skwashd 
Exp $
        */
 
        /**
@@ -409,36 +409,45 @@
                        return '<select 
name="'.$name.'">'."\n".$out.'</select>'."\n";
                }
 
-               function getYears($name, $selected = 0, $startYear = 0, 
$endyear = 0)
+               function getYears($name, $selected = 0, $startYear = 0, 
$endYear = 0)
                {
                        if (!$startYear)
                        {
                                $startYear = date('Y') - 5;
                        }
-                       if ($selected && $startYear > $selected) $startYear = 
$selected;
+                       if ($selected && $startYear > $selected)
+                       {
+                               $startYear = $selected;
+                       }
+
+                       if (!$endYear)
+                       {
+                               $endYear = date('Y') + 6;
+                       }
 
-                       if (!$endyear)
+                       if ($selected && $endYear < $selected)
                        {
-                               $endyear = date('Y') + 6;
+                               $endYear = $selected;
                        }
-                       if ($selected && $endYear < $selected) $endYear = 
$selected;
 
                        $out = '<select name="'.$name.'">'."\n";
 
+                       /*
                        $out .= '<option value=""';
-                       if ($selected == 0 OR $selected == '')
+                       if ($selected == 0 || $selected == '')
                        {
-                               $out .= ' SELECTED';
+                               $out .= ' selected';
                        }
                        $out .= '></option>'."\n";
+                       */
 
                        // We need to add some good error checking here.
-                       for ($i=$startYear;$i<$endyear; $i++)
+                       for ( $i = $startYear; $i < $endYear; ++$i )
                        {
                                $out .= '<option value="'.$i.'"';
-                               if ($selected==$i)
+                               if ( $selected == $i )
                                {
-                                       $out .= ' SELECTED';
+                                       $out .= ' selected';
                                }
                                $out .= '>'.$i.'</option>'."\n";
                        }