lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-06-26 09:32:13 +00:00
parent dff4a56301
commit d2916ffb1e
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/core/class/html.formother.class.php
View File

@ -29,7 +29,7 @@
* \file htdocs/core/class/html.formother.class.php * \file htdocs/core/class/html.formother.class.php
* \ingroup core * \ingroup core
* \brief Fichier de la classe des fonctions predefinie de composants html autre * \brief Fichier de la classe des fonctions predefinie de composants html autre
* \version $Id$ * \version $Id: html.formother.class.php,v 1.16 2011/06/26 09:32:13 hregis Exp $
*/ */
@ -595,16 +595,31 @@ class FormOther
*/ */
function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='') function select_year($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='')
{ {
print $this->selectyear($selected,$htmlname,$useempty,$min_year,$max_year,$offset,$invert,$option);
}
/**
* Return HTML combo list of years
* @param selected Preselected value (''=current year, -1=none, year otherwise)
* @param htmlname Name of HTML select object
* @param useempty Affiche valeur vide dans liste
* @param $min_year Offset of minimum year into list (by default current year -10)
* @param $max_year Offset of maximum year into list (by default current year + 5)
*/
function selectyear($selected='',$htmlname='yearid',$useempty=0, $min_year=10, $max_year=5, $offset=0, $invert=0, $option='')
{
$out='';
$currentyear = date("Y")+$offset; $currentyear = date("Y")+$offset;
$max_year = $currentyear+$max_year; $max_year = $currentyear+$max_year;
$min_year = $currentyear-$min_year; $min_year = $currentyear-$min_year;
if(empty($selected)) $selected = $currentyear; if(empty($selected)) $selected = $currentyear;
print '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >'; $out.= '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '"'.$option.' >';
if($useempty) if($useempty)
{ {
if ($selected == '') $selected_html = ' selected="selected"'; if ($selected == '') $selected_html = ' selected="selected"';
print '<option value=""' . $selected_html . '>&nbsp;</option>'; $out.= '<option value=""' . $selected_html . '>&nbsp;</option>';
} }
if (! $invert) if (! $invert)
{ {
@ -612,7 +627,7 @@ class FormOther
{ {
$selected_html=''; $selected_html='';
if ($selected > 0 && $y == $selected) $selected_html = ' selected="selected"'; if ($selected > 0 && $y == $selected) $selected_html = ' selected="selected"';
print '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>'; $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
} }
} }
else else
@ -621,10 +636,12 @@ class FormOther
{ {
$selected_html=''; $selected_html='';
if ($selected > 0 && $y == $selected) $selected_html = ' selected="selected"'; if ($selected > 0 && $y == $selected) $selected_html = ' selected="selected"';
print '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>'; $out.= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
} }
} }
print "</select>\n"; $out.= "</select>\n";
return $out;
} }
} }