Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: $optiontype not used

Browse Source 
Fix: select_array is deprecated
This commit is contained in:
Regis Houssin
2010-08-19 15:13:17 +00:00
parent 9c333459c6
commit 9601f8a353
5 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/liste.php
View File

@@ -230,7 +230,7 @@ if ($resql)
print '<td class="liste_titre">';
$listetype=$membertypestatic->liste_array();
$form->select_array("type", $listetype, $_REQUEST["type"], 1, 0, 0, 0, '', 0, 12);
$form->selectarray("type", $listetype, $_REQUEST["type"], 1, 0, 0, '', 0, 12);
print '</td>';
print '<td class="liste_titre">&nbsp;</td>';

7
htdocs/adherents/type.php
View File

@@ -457,13 +457,6 @@ if ($rowid > 0)
print '<td class="liste_titre" align="left">';
print '<input class="flat" type="text" name="search_login" value="'.$_REQUEST["search_login"].'" size="7"></td>';
// Type
/*print '<td class="liste_titre">';
$listetype=$membertypestatic->liste_array();
$form->select_array("type", $listetype, $_REQUEST["type"], 1, 0, 0, 0, '', 0, 12);
print '</td>';
*/
print '<td class="liste_titre">&nbsp;</td>';
print '<td class="liste_titre" align="left">';

16
htdocs/core/class/html.form.class.php
View File

@@ -2727,21 +2727,13 @@ class Form
* \param disabled Html select box is disabled
* \return string HTML select string
*/
function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $optionType=0, $option='', $translate=0, $maxlen=0, $disabled=0)
function selectarray($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $option='', $translate=0, $maxlen=0, $disabled=0)
{
global $langs;
$out='';
// \TODO Simplify optionType and option (only one should be necessary)
if ($optionType == 1 && $option != '')
{
$out.='<select '.($disabled?'disabled="true"':'').' class="flat" name="'.$htmlname.'" '.$option.'>';
}
else
{
$out.='<select '.($disabled?'disabled="true"':'').' class="flat" name="'.$htmlname.'">';
}
$out.='<select '.($disabled?'disabled="true"':'').' class="flat" name="'.$htmlname.'" '.($option != ''?$option:'').'>';
if ($show_empty)
{
@@ -2796,9 +2788,9 @@ class Form
* \param maxlen Length maximum for labels
* \deprecated Use selectarray instead
*/
function select_array($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $optionType=0, $option='', $translate=0, $maxlen=0)
function select_array($htmlname, $array, $id='', $show_empty=0, $key_in_label=0, $value_as_key=0, $option='', $translate=0, $maxlen=0)
{
print $this->selectarray($htmlname, $array, $id, $show_empty, $key_in_label, $value_as_key, $optionType, $option, $translate, $maxlen);
print $this->selectarray($htmlname, $array, $id, $show_empty, $key_in_label, $value_as_key, $option, $translate, $maxlen);
}

4
htdocs/expedition/fiche.php
View File

@@ -426,7 +426,7 @@ if ($_GET["action"] == 'create')
print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
print '<td colspan="3">';
$expe->fetch_delivery_methods();
$html->select_array("expedition_method_id",$expe->meths,$_POST["expedition_method_id"],1,0,0,0,"",1);
$html->selectarray("expedition_method_id",$expe->meths,$_POST["expedition_method_id"],1,0,0,"",1);
print "</td></tr>\n";
// Tracking number
@@ -875,7 +875,7 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setexpedition_method_id">';
$expedition->fetch_delivery_methods();
$html->select_array("expedition_method_id",$expedition->meths,$expedition->expedition_method_id,1,0,0,0,"",1);
$html->selectarray("expedition_method_id",$expedition->meths,$expedition->expedition_method_id,1,0,0,"",1);
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}

12
htdocs/fourn/commande/dispatch.php
View File

@@ -268,16 +268,8 @@ if ($id > 0 || ! empty($ref))
// Warehouse
print '<td align="right">';
/*if (sizeof($user->entrepots) === 1) deprecated
{
$uentrepot = array();
$uentrepot[$user->entrepots[0]['id']] = $user->entrepots[0]['label'];
print $html->selectarray("entrepot_".$i, $uentrepot, '', $disabled, 0, 0, 0, '', 0, 0, $disabled);
}
else
{*/
print $html->selectarray("entrepot_".$i, $entrepot->list_array(), '', $disabled, 0, 0, 0, '', 0, 0, $disabled);
//}
print $html->selectarray("entrepot_".$i, $entrepot->list_array(), '', $disabled, 0, 0, '', 0, 0, $disabled);
print "</td>\n";
print "</tr>\n";
}