Nettoyage

This commit is contained in:
Rodolphe Quiedeville 2005-01-05 15:34:24 +00:00
parent 7fd6a929a4
commit 6cc0795e09

View File

@ -1,5 +1,5 @@
<?PHP <?PHP
/* Copyright (c) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (c) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
@ -23,14 +23,16 @@
* $Source$ * $Source$
*/ */
/*! \file htdocs/html.form.class.php /*!
\brief Fichier de la classe des fonctions prédéfinie de composants html \file htdocs/html.form.class.php
\version $Revision$ \brief Fichier de la classe des fonctions prédéfinie de composants html
\version $Revision$
*/ */
/*! \class Form /*!
\brief Classe permettant la génération de composants html \class Form
\brief Classe permettant la génération de composants html
*/ */
class Form class Form
@ -39,7 +41,7 @@ class Form
var $errorstr; var $errorstr;
/*! \brief Constructeur /*! \brief Constructeur
\param DB handler d'accès base de donnée \param DB handler d'accès base de donnée
*/ */
function Form($DB) function Form($DB)
@ -71,47 +73,47 @@ class Form
$sql .= "ORDER BY code_pays, code ASC"; $sql .= "ORDER BY code_pays, code ASC";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
{ {
$pays=''; $pays='';
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($obj->code == 0) { if ($obj->code == 0) {
print '<option value="0">&nbsp;</option>'; print '<option value="0">&nbsp;</option>';
} }
else { else {
if ($pays == '' || $pays != $obj->libelle_pays) { if ($pays == '' || $pays != $obj->libelle_pays) {
// Affiche la rupture // Affiche la rupture
print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n"; print '<option value="-1">----- '.$obj->libelle_pays." -----</option>\n";
$pays=$obj->libelle_pays; $pays=$obj->libelle_pays;
} }
if ($selected > 0 && $selected == $obj->rowid) if ($selected > 0 && $selected == $obj->rowid)
{ {
print '<option value="'.$obj->rowid.'" selected>'; print '<option value="'.$obj->rowid.'" selected>';
} }
else else
{ {
print '<option value="'.$obj->rowid.'">'; print '<option value="'.$obj->rowid.'">';
} }
// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
print $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:'')); print $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:''));
print '</option>'; print '</option>';
} }
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
} }
} }
/* /*
* \brief Retourne la liste déroulante des regions actives dont le pays est actif * \brief Retourne la liste déroulante des regions actives dont le pays est actif
@ -131,7 +133,7 @@ class Form
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
@ -162,7 +164,7 @@ class Form
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
@ -186,38 +188,38 @@ class Form
$sql .= " ORDER BY code ASC;"; $sql .= " ORDER BY code ASC;";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
{ {
$foundselected=false; $foundselected=false;
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($selected > 0 && $selected == $obj->rowid) if ($selected > 0 && $selected == $obj->rowid)
{ {
$foundselected=true; $foundselected=true;
print '<option value="'.$obj->rowid.'" selected>'; print '<option value="'.$obj->rowid.'" selected>';
} }
else else
{ {
print '<option value="'.$obj->rowid.'">'; print '<option value="'.$obj->rowid.'">';
} }
// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
if ($obj->code) { print $obj->code . ' - '; } if ($obj->code) { print $obj->code . ' - '; }
print ($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:'')); print ($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code?$langs->trans("Country".$obj->code):($obj->libelle!='-'?$obj->libelle:''));
print '</option>'; print '</option>';
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
return 0; return 0;
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
return 1; return 1;
} }
} }
@ -234,23 +236,23 @@ class Form
$langs_available=$langs->get_available_languages(); $langs_available=$langs->get_available_languages();
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = count($langs_available); $num = count($langs_available);
$i = 0; $i = 0;
if ($num) if ($num)
{
while ($i < $num)
{ {
while ($i < $num) if ($selected == $langs_available[$i])
{ {
if ($selected == $langs_available[$i]) print '<option value="'.$langs_available[$i].'" selected>'.$langs_available[$i].'</option>';
{
print '<option value="'.$langs_available[$i].'" selected>'.$langs_available[$i].'</option>';
}
else
{
print '<option value="'.$langs_available[$i].'">'.$langs_available[$i].'</option>';
}
$i++;
} }
else
{
print '<option value="'.$langs_available[$i].'">'.$langs_available[$i].'</option>';
}
$i++;
} }
}
print '</select>'; print '</select>';
} }
@ -269,7 +271,7 @@ class Form
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
@ -277,18 +279,18 @@ class Form
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($selected > 0 && $selected == $obj->idp) if ($selected > 0 && $selected == $obj->idp)
{ {
print '<option value="'.$obj->idp.'" selected>'.$obj->nom.'</option>'; print '<option value="'.$obj->idp.'" selected>'.$obj->nom.'</option>';
} }
else else
{ {
print '<option value="'.$obj->idp.'">'.$obj->nom.'</option>'; print '<option value="'.$obj->idp.'">'.$obj->nom.'</option>';
} }
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
@ -310,33 +312,34 @@ class Form
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="'.$htmlname.'">'; print '<select name="'.$htmlname.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
{ {
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($selected && $selected == $obj->idp) if ($selected && $selected == $obj->idp)
{ {
print '<option value="'.$obj->idp.'" selected>'.$obj->name.' '.$obj->firstname.'</option>'; print '<option value="'.$obj->idp.'" selected>'.$obj->name.' '.$obj->firstname.'</option>';
} }
else else
{ {
print '<option value="'.$obj->idp.'">'.$obj->name.' '.$obj->firstname.'</option>'; print '<option value="'.$obj->idp.'">'.$obj->name.' '.$obj->firstname.'</option>';
} }
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
}
else
{
dolibarr_print_error($this->db);
} }
else {
dolibarr_print_error($this->db);
}
} }
/* /*
* \brief Retourne le nom d'un pays * \brief Retourne le nom d'un pays
@ -366,8 +369,6 @@ class Form
} }
/* /*
* \brief Retourne la liste déroulante des civilite actives * \brief Retourne la liste déroulante des civilite actives
* \param selected civilite pré-sélectionnée * \param selected civilite pré-sélectionnée
@ -382,34 +383,34 @@ class Form
$sql .= " WHERE active = 1"; $sql .= " WHERE active = 1";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="civilite_id">'; print '<select name="civilite_id">';
print '<option value="">&nbsp;</option>'; print '<option value="">&nbsp;</option>';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
{ {
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($selected == $obj->code) if ($selected == $obj->code)
{ {
print '<option value="'.$obj->code.'" selected>'; print '<option value="'.$obj->code.'" selected>';
} }
else else
{ {
print '<option value="'.$obj->code.'">'; print '<option value="'.$obj->code.'">';
} }
// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
print ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->civilite!='-'?$obj->civilite:'')); print ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->civilite!='-'?$obj->civilite:''));
print '</option>'; print '</option>';
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
} }
} }
@ -430,45 +431,45 @@ class Form
$sql .= " AND f.active = 1 AND p.active = 1 ORDER BY code_pays, code ASC"; $sql .= " AND f.active = 1 AND p.active = 1 ORDER BY code_pays, code ASC";
if ($this->db->query($sql)) if ($this->db->query($sql))
{ {
print '<select name="forme_juridique_code">'; print '<select name="forme_juridique_code">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if ($num) if ($num)
{ {
$pays=''; $pays='';
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
if ($obj->code == 0) { if ($obj->code == 0) {
print '<option value="0">&nbsp;</option>'; print '<option value="0">&nbsp;</option>';
} }
else { else {
if ($pays == '' || $pays != $obj->libelle_pays) { if ($pays == '' || $pays != $obj->libelle_pays) {
// Affiche la rupture // Affiche la rupture
print '<option value="0">----- '.$obj->libelle_pays." -----</option>\n"; print '<option value="0">----- '.$obj->libelle_pays." -----</option>\n";
$pays=$obj->libelle_pays; $pays=$obj->libelle_pays;
} }
if ($selected > 0 && $selected == $obj->code) if ($selected > 0 && $selected == $obj->code)
{ {
print '<option value="'.$obj->code.'" selected>'; print '<option value="'.$obj->code.'" selected>';
} }
else else
{ {
print '<option value="'.$obj->code.'">'; print '<option value="'.$obj->code.'">';
} }
// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut // Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
print $obj->code . ' - ' .($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:'')); print $obj->code . ' - ' .($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:''));
print '</option>'; print '</option>';
} }
$i++; $i++;
} }
} }
print '</select>'; print '</select>';
} }
else { else {
dolibarr_print_error($this->db); dolibarr_print_error($this->db);
} }
} }
@ -507,9 +508,9 @@ class Form
function select_tva($name='', $defaulttx = '') function select_tva($name='', $defaulttx = '')
{ {
if (! strlen(trim($name))) if (! strlen(trim($name)))
{ {
$name = "tauxtva"; $name = "tauxtva";
} }
$file = DOL_DOCUMENT_ROOT . "/conf/tva.local.php"; $file = DOL_DOCUMENT_ROOT . "/conf/tva.local.php";
if (is_readable($file)) if (is_readable($file))
@ -559,7 +560,7 @@ class Form
{ {
if (! $set_time && ! $empty) if (! $set_time && ! $empty)
{ {
$set_time = time(); $set_time = time();
} }
$strmonth[1] = "Janvier"; $strmonth[1] = "Janvier";
@ -577,20 +578,20 @@ class Form
// Analyse de la date de préselection // Analyse de la date de préselection
if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?',$set_time,$reg)) { if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?',$set_time,$reg)) {
// Date au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' // Date au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
$syear = $reg[1]; $syear = $reg[1];
$smonth = $reg[2]; $smonth = $reg[2];
$sday = $reg[3]; $sday = $reg[3];
$shour = $reg[4]; $shour = $reg[4];
$smin = $reg[5]; $smin = $reg[5];
} }
else { else {
// Date est un timestamps // Date est un timestamps
$syear = date("Y", $set_time); $syear = date("Y", $set_time);
$smonth = date("n", $set_time); $smonth = date("n", $set_time);
$sday = date("d", $set_time); $sday = date("d", $set_time);
$shour = date("H", $set_time); $shour = date("H", $set_time);
$smin = date("i", $set_time); $smin = date("i", $set_time);
} }
print '<select name="'.$prefix.'day">'; print '<select name="'.$prefix.'day">';
@ -620,7 +621,6 @@ class Form
print "</select>"; print "</select>";
print '<select name="'.$prefix.'month">'; print '<select name="'.$prefix.'month">';
if ($empty || $set_time == -1) if ($empty || $set_time == -1)
{ {
@ -715,105 +715,105 @@ class Form
* *
*/ */
function select($name, $sql, $id='') function select($name, $sql, $id='')
{ {
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
print '<select name="'.$name.'">'; print '<select name="'.$name.'">';
$num = $this->db->num_rows(); $num = $this->db->num_rows();
$i = 0; $i = 0;
if (strlen("$id")) if (strlen("$id"))
{ {
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row($i); $row = $this->db->fetch_row($i);
print "<option value=\"$row[0]\" "; print "<option value=\"$row[0]\" ";
if ($id == $row[0]) if ($id == $row[0])
{ {
print "selected"; print "selected";
} }
print ">$row[1]</option>\n"; print ">$row[1]</option>\n";
$i++; $i++;
} }
} }
else else
{ {
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_row($i); $row = $this->db->fetch_row($i);
print "<option value=\"$row[0]\">$row[1]</option>\n"; print "<option value=\"$row[0]\">$row[1]</option>\n";
$i++; $i++;
} }
} }
print "</select>"; print "</select>";
} }
else else
{ {
print $this->db->error(); print $this->db->error();
} }
} }
/*! /*!
\brief Affiche un select à partir d'un tableau \brief Affiche un select à partir d'un tableau
\param name nom de la zone select \param name nom de la zone select
\param array tableau de key+valeur \param array tableau de key+valeur
\param id key présélectionnée \param id key présélectionnée
\param empty 1 si il faut un valeur " " dans la liste, 0 sinon \param empty 1 si il faut un valeur " " dans la liste, 0 sinon
\param key_libelle 1 pour afficher la key dans la valeur "[key] value" \param key_libelle 1 pour afficher la key dans la valeur "[key] value"
*/ */
function select_array($name, $array, $id='', $empty=0, $key_libelle=0) function select_array($name, $array, $id='', $empty=0, $key_libelle=0)
{ {
print '<select name="'.$name.'">'; print '<select name="'.$name.'">';
$i = 0; $i = 0;
if (strlen($id)) { if (strlen($id)) {
if ($empty == 1) if ($empty == 1)
{ {
$array[0] = "&nbsp;"; $array[0] = "&nbsp;";
} }
reset($array); reset($array);
}
while (list($key, $value) = each ($array))
{
print "<option value=\"$key\" ";
// Si il faut présélectionner une valeur
if ($id && $id == $key)
{
print "selected";
}
if ($key_libelle)
{
print ">[$key] $value</option>\n";
}
else
{
if ($value=="-") { $value="&nbsp;"; }
print ">$value</option>\n";
}
}
print "</select>";
} }
while (list($key, $value) = each ($array))
{
print "<option value=\"$key\" ";
// Si il faut présélectionner une valeur
if ($id && $id == $key)
{
print "selected";
}
if ($key_libelle)
{
print ">[$key] $value</option>\n";
}
else
{
if ($value=="-") { $value="&nbsp;"; }
print ">$value</option>\n";
}
}
print "</select>";
}
/* /*
* \brief Renvoie la chaîne de caractère décrivant l'erreur * \brief Renvoie la chaîne de caractère décrivant l'erreur
* *
*/ */
function error() function error()
{ {
return $this->errorstr; return $this->errorstr;
} }
/* /*
@ -864,13 +864,13 @@ class Form
* *
*/ */
function checkbox($name,$checked=0,$value=1) function checkbox($name,$checked=0,$value=1)
{ {
if ($checked==1){ if ($checked==1){
print "<input type=\"checkbox\" name=\"$name\" value=\"$value\" checked />\n"; print "<input type=\"checkbox\" name=\"$name\" value=\"$value\" checked />\n";
}else{ }else{
print "<input type=\"checkbox\" name=\"$name\" value=\"$value\" />\n"; print "<input type=\"checkbox\" name=\"$name\" value=\"$value\" />\n";
}
} }
}
/* /*
* \brief Affiche la partie de formulaire pour saisie d'un mail * \brief Affiche la partie de formulaire pour saisie d'un mail
@ -883,41 +883,42 @@ class Form
$langs->load("other"); $langs->load("other");
print "<table class=\"border\" width=\"100%\">"; print "<table class=\"border\" width=\"100%\">";
// Topic // Topic
if ($withtopic) { if ($withtopic)
print "<tr>"; {
print "<td width=\"180\">".$langs->trans("MailTopic")."</td>"; print "<tr>";
print "<td>"; print "<td width=\"180\">".$langs->trans("MailTopic")."</td>";
print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"\">"; print "<td>";
print "</td></tr>"; print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"\">";
} print "</td></tr>";
}
// Message // Message
if ($withbody) { if ($withbody)
print "<tr>"; {
print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>"; print "<tr>";
print "<td>"; print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>";
print "<textarea rows=\"8\" cols=\"72\" name=\"message\">"; print "<td>";
print $defaultbody; print "<textarea rows=\"8\" cols=\"72\" name=\"message\">";
print "</textarea>"; print $defaultbody;
print "</td></tr>"; print "</textarea>";
} print "</td></tr>";
}
// Si fichier joint // Si fichier joint
if ($withfile) { if ($withfile)
print "<tr>"; {
print "<td width=\"180\">".$langs->trans("MailFile")."</td>"; print "<tr>";
print "<td>"; print "<td width=\"180\">".$langs->trans("MailFile")."</td>";
print "<input type=\"file\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>"; print "<td>";
print "</td></tr>"; print "<input type=\"file\" name=\"addedfile\" value=\"".$langs->trans("Upload")."\"/>";
} print "</td></tr>";
}
print "</table>"; print "</table>";
} }
} }
?> ?>