diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 43f75f7e1223f7d56de4fdff851125f33cd9b8d5..aac2a88d044c3b92c7f26dd9d58ea03ab472ae00 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -454,7 +454,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$now=dol_now();
@@ -487,10 +487,10 @@ if ($rowid)
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur" colspan="2">';
- print $html->showrefnav($adh,'rowid');
+ print $form->showrefnav($adh,'rowid');
print '</td></tr>';
- $showphoto='<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'.$html->showphoto('memberphoto',$adh).'</td>';
+ $showphoto='<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'.$form->showphoto('memberphoto',$adh).'</td>';
// Login
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
@@ -559,7 +559,7 @@ if ($rowid)
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td>';
- print $html->select_societes($adh->fk_soc,'socid','',1);
+ print $form->select_societes($adh->fk_soc,'socid','',1);
print '</td>';
print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr></table></form>';
@@ -595,13 +595,13 @@ if ($rowid)
{
$include=array($adh->user_id,$user->id);
}*/
- print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'userid','');
+ print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'userid','');
}
else
{
if ($adh->user_id)
{
- print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'none');
+ print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
}
@@ -794,7 +794,7 @@ if ($rowid)
// Create a form array
$formquestion=array( array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$adh->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$adh->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
if ($ret == 'html') print '<br>';
}
@@ -835,7 +835,7 @@ if ($rowid)
$datefrom=mktime();
}
}
- $html->select_date($datefrom,'','','','',"cotisation");
+ $form->select_date($datefrom,'','','','',"cotisation");
print "</td></tr>";
// Date end subscription
@@ -848,7 +848,7 @@ if ($rowid)
$dateto=-1; // By default, no date is suggested
}
print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
- $html->select_date($dateto,'end','','','',"cotisation");
+ $form->select_date($dateto,'end','','','',"cotisation");
print "</td></tr>";
if ($adht->cotisation)
@@ -917,17 +917,17 @@ if ($rowid)
// Bank account
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
- $html->select_comptes($_POST["accountid"],'accountid',0,'',1);
+ $form->select_comptes($_POST["accountid"],'accountid',0,'',1);
print "</td></tr>\n";
// Payment mode
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
- $html->select_types_paiements($_POST["operation"],'operation','',2);
+ $form->select_types_paiements($_POST["operation"],'operation','',2);
print "</td></tr>\n";
// Date of payment
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
- $html->select_date($paymentdate?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1);
+ $form->select_date($paymentdate?$paymentdate:-1,'payment',0,0,1,'cotisation',1,1);
print "</td></tr>\n";
print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
@@ -973,7 +973,7 @@ if ($rowid)
$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
- print $html->textwithpicto($tmp,$helpcontent,1,'help');
+ print $form->textwithpicto($tmp,$helpcontent,1,'help');
}
print '</td></tr>';
print '</table>';
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 68c69bf73364dd408311a9daa8653fc566ef3522..d7ddc80c463e6bb16bc75c3796411ddf4665280c 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -167,10 +167,10 @@ if ($result)
{
print '<input type="hidden" name="action" value="2bank">';
print '<input type="hidden" name="rowid" value="'.$objp->crowid.'">';
- $html = new Form($db);
- $html->select_comptes('','accountid',0,'',1);
+ $form = new Form($db);
+ $form->select_comptes('','accountid',0,'',1);
print '<br>';
- $html->select_types_paiements('','paymenttypeid');
+ $form->select_types_paiements('','paymenttypeid');
print '<input name="num_chq" type="text" class="flat" size="5">';
}
else
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index c6c4a9e0c4f9e48bd1b87f6623146333d0826b5d..b71ba3dd48bb488f23497e617d68205931ad5c8b 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -126,7 +126,7 @@ if ($id > 0)
if ($conf->notification->enabled) $langs->load("mails");
$head = member_prepare_head($member);
- $html=new Form($db);
+ $form=new Form($db);
dol_fiche_head($head, 'document', $langs->trans("Member"),0,'user');
@@ -145,7 +145,7 @@ if ($id > 0)
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur">';
- print $html->showrefnav($member,'rowid');
+ print $form->showrefnav($member,'rowid');
print '</td></tr>';
// Login
@@ -157,7 +157,7 @@ if ($id > 0)
// Morphy
print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>';
/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
- print $html->showphoto('memberphoto',$member);
+ print $form->showphoto('memberphoto',$member);
print '</td>';*/
print '</tr>';
@@ -199,7 +199,7 @@ if ($id > 0)
*/
if ($_GET['action'] == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 1f28bf85ae03d4239068f7cef4fc36a21170bc43..23c6b659799574390fc5a0126524465ddc700996 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -607,8 +607,8 @@ $extralabels=$extrafields->fetch_name_optionals_label('member');
$help_url='EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
llxHeader('',$langs->trans("Member"),$help_url);
-$html = new Form($db);
-$htmlcompany = new FormCompany($db);
+$form = new Form($db);
+$formcompany = new FormCompany($db);
$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
@@ -677,7 +677,7 @@ if ($action == 'create')
$morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Moral");
print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature")."</span></td><td>\n";
- print $html->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy, 1);
+ print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy, 1);
print "</td>\n";
// Type
@@ -685,7 +685,7 @@ if ($action == 'create')
$listetype=$adht->liste_array();
if (count($listetype))
{
- print $html->selectarray("typeid", $listetype, isset($_POST["typeid"])?$_POST["typeid"]:$typeid, 1);
+ print $form->selectarray("typeid", $listetype, isset($_POST["typeid"])?$_POST["typeid"]:$typeid, 1);
} else {
print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
}
@@ -696,7 +696,7 @@ if ($action == 'create')
// Civility
print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
- print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').'</td>';
+ print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').'</td>';
print '</tr>';
// Lastname
@@ -723,15 +723,15 @@ if ($action == 'create')
// Zip / Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</td></tr>';
// Country
$object->pays_id=$object->pays_id?$object->pays_id:$mysoc->pays_id;
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
- $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$object->pays_id,'pays_id');
+ $form->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$object->pays_id,'pays_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
@@ -741,7 +741,7 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans('State').'</td><td>';
if ($object->pays_id)
{
- $htmlcompany->select_departement(isset($_POST["departement_id"])?$_POST["departement_id"]:$object->fk_departement,$object->pays_code);
+ $formcompany->select_departement(isset($_POST["departement_id"])?$_POST["departement_id"]:$object->fk_departement,$object->pays_code);
}
else
{
@@ -764,12 +764,12 @@ if ($action == 'create')
// Birthday
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
- $html->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
+ $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
print "</td></tr>\n";
// Profil public
print "<tr><td>".$langs->trans("Public")."</td><td>\n";
- print $html->selectyesno("public",$object->public,1);
+ print $form->selectyesno("public",$object->public,1);
print "</td></tr>\n";
// Other attributes
@@ -791,13 +791,13 @@ if ($action == 'create')
if ($conf->societe->enabled)
{
print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td class="valeur">';
- print $html->select_societes($object->fk_soc,'socid','',1);
+ print $form->select_societes($object->fk_soc,'socid','',1);
print '</td></tr>';
}
// Login Dolibarr
print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
- print $html->select_users($object->user_id,'userid',1);
+ print $form->select_users($object->user_id,'userid',1);
print '</td></tr>';
*/
print "</table>\n";
@@ -889,11 +889,11 @@ if ($action == 'edit')
$morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Morale");
print '<tr><td><span class="fieldrequired">'.$langs->trans("Nature").'</span></td><td>';
- print $html->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
+ print $form->selectarray("morphy", $morphys, isset($_POST["morphy"])?$_POST["morphy"]:$object->morphy);
print "</td>";
// Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
- print $html->showphoto('memberphoto',$object)."\n";
+ print $form->showphoto('memberphoto',$object)."\n";
if ($caneditfieldmember)
{
if ($object->photo) print "<br>\n";
@@ -909,7 +909,7 @@ if ($action == 'edit')
print '<tr><td><span class="fieldrequired">'.$langs->trans("Type").'</span></td><td>';
if ($user->rights->adherent->creer)
{
- print $html->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
+ print $form->selectarray("typeid", $adht->liste_array(), (isset($_POST["typeid"])?$_POST["typeid"]:$object->typeid));
}
else
{
@@ -923,7 +923,7 @@ if ($action == 'edit')
// Civilite
print '<tr><td width="20%">'.$langs->trans("UserTitle").'</td><td width="35%">';
- print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n";
+ print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id)."\n";
print '</td>';
print '</tr>';
@@ -948,15 +948,15 @@ if ($action == 'edit')
// Zip / Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</td></tr>';
// Country
//$object->pays_id=$object->pays_id?$object->pays_id:$mysoc->pays_id; // In edit mode we don't force to company country if not defined
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td>';
- $html->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$object->pays_id,'pays_id');
+ $form->select_pays(isset($_POST["pays_id"])?$_POST["pays_id"]:$object->pays_id,'pays_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
@@ -964,7 +964,7 @@ if ($action == 'edit')
if (empty($conf->global->MEMBER_DISABLE_STATE))
{
print '<tr><td>'.$langs->trans('State').'</td><td>';
- $htmlcompany->select_departement($object->fk_departement,$object->pays_code);
+ $formcompany->select_departement($object->fk_departement,$object->pays_code);
print '</td></tr>';
}
@@ -982,12 +982,12 @@ if ($action == 'edit')
// Date naissance
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
- $html->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
+ $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
print "</td></tr>\n";
// Profil public
print "<tr><td>".$langs->trans("Public")."</td><td>\n";
- print $html->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$object->public),1);
+ print $form->selectyesno("public",(isset($_POST["public"])?$_POST["public"]:$object->public),1);
print "</td></tr>\n";
// Other attributes
@@ -1025,7 +1025,7 @@ if ($action == 'edit')
print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
if ($object->user_id)
{
- print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+ print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
print '</td></tr>';
@@ -1093,7 +1093,7 @@ if ($rowid && $action != 'edit')
if ($object->fk_soc > 0) $text.=$langs->trans("UserWillBeExternalUser");
else $text.=$langs->trans("UserWillBeInternalUser");
}
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrLogin"),$text,"confirm_create_user",$formquestion,'yes');
if ($ret == 'html') print '<br>';
}
@@ -1113,7 +1113,7 @@ if ($rowid && $action != 'edit')
// Create a form array
$formquestion=array( array('label' => $langs->trans("NameToCreate"), 'type' => 'text', 'name' => 'companyname', 'value' => $name));
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?rowid=".$object->id,$langs->trans("CreateDolibarrThirdParty"),$langs->trans("ConfirmCreateThirdParty"),"confirm_create_thirdparty",$formquestion,1);
if ($ret == 'html') print '<br>';
}
@@ -1139,19 +1139,19 @@ if ($rowid && $action != 'edit')
$helpcontent.="<br>";
$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
- $label=$html->textwithpicto($tmp,$helpcontent,1,'help');
+ $label=$form->textwithpicto($tmp,$helpcontent,1,'help');
// Cree un tableau formulaire
$formquestion=array();
if ($object->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?true:false));
- $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ValidateMember"),$langs->trans("ConfirmValidateMember"),"confirm_valid",$formquestion,1);
if ($ret == 'html') print '<br>';
}
// Confirm send card by mail
if ($action == 'sendinfo')
{
- $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid",$langs->trans("SendCardByMail"),$langs->trans("ConfirmSendCardByMail",$object->email),"confirm_sendinfo",'',0,1);
if ($ret == 'html') print '<br>';
}
@@ -1177,19 +1177,19 @@ if ($rowid && $action != 'edit')
$helpcontent.="<br>";
$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
- $label=$html->textwithpicto($tmp,$helpcontent,1,'help');
+ $label=$form->textwithpicto($tmp,$helpcontent,1,'help');
// Cree un tableau formulaire
$formquestion=array();
if ($object->email) $formquestion[0]=array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL?'true':'false'));
- $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid",$langs->trans("ResiliateMember"),$langs->trans("ConfirmResiliateMember"),"confirm_resign",$formquestion);
if ($ret == 'html') print '<br>';
}
// Confirm remove member
if ($action == 'delete')
{
- $ret=$html->form_confirm("fiche.php?rowid=$rowid",$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",'',0,1);
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid",$langs->trans("DeleteMember"),$langs->trans("ConfirmDeleteMember"),"confirm_delete",'',0,1);
if ($ret == 'html') print '<br>';
}
@@ -1198,7 +1198,7 @@ if ($rowid && $action != 'edit')
*/
if ($action == 'add_spip')
{
- $ret=$html->form_confirm("fiche.php?rowid=$rowid","Ajouter dans spip","Etes-vous sur de vouloir ajouter cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip");
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid","Ajouter dans spip","Etes-vous sur de vouloir ajouter cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_add_spip");
if ($ret == 'html') print '<br>';
}
@@ -1207,7 +1207,7 @@ if ($rowid && $action != 'edit')
*/
if ($action == 'del_spip')
{
- $ret=$html->form_confirm("fiche.php?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip");
+ $ret=$form->form_confirm("fiche.php?rowid=$rowid","Supprimer dans spip","Etes-vous sur de vouloir effacer cet adherent dans spip ? (serveur : ".ADHERENT_SPIP_SERVEUR.")","confirm_del_spip");
if ($ret == 'html') print '<br>';
}
@@ -1220,11 +1220,11 @@ if ($rowid && $action != 'edit')
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur" colspan="2">';
- print $html->showrefnav($object,'rowid');
+ print $form->showrefnav($object,'rowid');
print '</td></tr>';
$showphoto='<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
- $showphoto.=$html->showphoto('memberphoto',$object);
+ $showphoto.=$form->showphoto('memberphoto',$object);
$showphoto.='</td>';
// Login
@@ -1335,7 +1335,7 @@ if ($rowid && $action != 'edit')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td>';
- print $html->select_societes($object->fk_soc,'socid','',1);
+ print $form->select_societes($object->fk_soc,'socid','',1);
print '</td>';
print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr></table></form>';
@@ -1374,13 +1374,13 @@ if ($rowid && $action != 'edit')
print '</td><td colspan="2" class="valeur">';
if ($_GET['action'] == 'editlogin')
{
- print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
+ print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'userid','');
}
else
{
if ($object->user_id)
{
- print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
+ print $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id,$object->user_id,'none');
}
else print $langs->trans("NoDolibarrAccess");
}
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index d202a411271e596179fc41568d45b047c10634ad..957b8798e9394a7390388778343aa851cf914844 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -91,7 +91,7 @@ if ($_GET["action"] == 'dolibarr2ldap')
llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
-$html = new Form($db);
+$form = new Form($db);
$head = member_prepare_head($adh);
@@ -103,7 +103,7 @@ print '<table class="border" width="100%">';
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur">';
-print $html->showrefnav($adh,'id');
+print $form->showrefnav($adh,'id');
print '</td></tr>';
// Nom
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index 188638cf366e917df983c1d2cf43d23d01a949e8..e0d0a3310ed6fd04eb121eac2814604126f9ac10 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -73,7 +73,7 @@ $search_categ = isset($_GET["search_categ"])?$_GET["search_categ"]:$_POST["searc
llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
$form=new Form($db);
-$htmlother=new FormOther($db);
+$formother=new FormOther($db);
$now=dol_now();
@@ -196,7 +196,7 @@ if ($resql)
if ($conf->categorie->enabled)
{
$moreforfilter.=$langs->trans('Categories'). ': ';
- $moreforfilter.=$htmlother->select_categories(3,$search_categ,'search_categ');
+ $moreforfilter.=$formother->select_categories(3,$search_categ,'search_categ');
$moreforfilter.=' ';
}
if ($moreforfilter)
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index b0658c0831d3ca3f4515e74c6e7d2d1edc912af1..a5a285da3417a9fde92a6b7a4fedecea88639a6e 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -74,7 +74,7 @@ if ($_POST["action"] == 'update' && $user->rights->adherent->creer && ! $_POST["
llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
-$html = new Form($db);
+$form = new Form($db);
if ($id)
{
@@ -92,7 +92,7 @@ if ($id)
// Reference
print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
- print $html->showrefnav($adh,'id');
+ print $form->showrefnav($adh,'id');
print '</td>';
print '</tr>';
@@ -105,7 +105,7 @@ if ($id)
// Morphy
print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$adh->getmorphylib().'</td>';
/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
- print $html->showphoto('memberphoto',$member);
+ print $form->showphoto('memberphoto',$member);
print '</td>';*/
print '</tr>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 11e4b0fe1b39c1a65460d6fff2e29ba61b6a1ff4..7d5172db6238a009a1a1d53563a551e40e0f42a6 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -214,7 +214,7 @@ if (! $rowid && $_GET["action"] != 'create' && $_GET["action"] != 'edit')
/* ************************************************************************** */
if ($_GET["action"] == 'create')
{
- $htmls = new Form($db);
+ $form = new Form($db);
print_fiche_titre($langs->trans("NewMemberType"));
@@ -229,11 +229,11 @@ if ($_GET["action"] == 'create')
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';
print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
- print $htmls->selectyesno("cotisation",1,1);
+ print $form->selectyesno("cotisation",1,1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
- print $htmls->selectyesno("vote",0,1);
+ print $form->selectyesno("vote",0,1);
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
@@ -581,7 +581,7 @@ if ($rowid > 0)
if ($_GET["action"] == 'edit')
{
- $htmls = new Form($db);
+ $form = new Form($db);
$adht = new AdherentType($db);
$adht->id = $rowid;
@@ -609,11 +609,11 @@ if ($rowid > 0)
print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40" value="'.$adht->libelle.'"></td></tr>';
print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
- print $htmls->selectyesno("cotisation",$adht->cotisation,1);
+ print $form->selectyesno("cotisation",$adht->cotisation,1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
- print $htmls->selectyesno("vote",$adht->vote,1);
+ print $form->selectyesno("vote",$adht->vote,1);
print '</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index 64c011622d6566e530e4856b38e9aa7893e604a0..18a14a755fe80a4fa9647e751567cc8a8d2e4f17 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -70,7 +70,7 @@ if ($_GET['action'] == 'delete')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 07254c9d3fca0f00507e1745f0741636cf8d22bb..e2fad678e13f918505637ed72e64e29d76d776f9 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -92,7 +92,7 @@ if($action && $action!='setcoder')
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$formbarcode = new FormBarCode($db);
llxHeader('',$langs->trans("BarcodeSetup"),'BarcodeConfiguration');
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index ecd1b6cefc9132a177ec6a44b485badf607eaaff..3d54a657d4a89a94e25c8a377e38a19a6992fb56 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -271,7 +271,7 @@ $var=True;
if ($resql)
{
- $html=new Form($db);
+ $form=new Form($db);
$num = $db->num_rows($resql);
$i = 0;
@@ -335,7 +335,7 @@ if ($resql)
// Pour chaque position possible, on affiche un lien
// d'activation si boite non deja active pour cette position
print '<td>';
- print $html->selectarray("pos",$pos_name);
+ print $form->selectarray("pos",$pos_name);
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="boxid" value="'.$obj->rowid.'">';
print ' <input type="submit" class="button" name="button" value="'.$langs->trans("Activate").'">';
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index e84980069d36b7138174ececdd1e7bbe6f1998f6..b3e4f2563c554cd7a0cd14cabe0d7ecc8f96c3d5 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -215,7 +215,7 @@ if ($action == 'set_COMMANDE_FREE_TEXT')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup');
@@ -316,7 +316,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -453,7 +453,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
@@ -490,7 +490,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setvalidorder">';
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("ValidOrderAfterPropalClosed").'</td>';
-print '<td width="60" align="center">'.$html->selectyesno("validorder",$conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL,1).'</td>';
+print '<td width="60" align="center">'.$form->selectyesno("validorder",$conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL,1).'</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr>';
print '</form>';
@@ -504,7 +504,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="deliverycostline">';
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("AddDeliveryCostLine").'</td>';
-print '<td width="60" align="center">'.$html->selectyesno("addline",$conf->global->COMMANDE_ADD_DELIVERY_COST_LINE,1).'</td>';
+print '<td width="60" align="center">'.$form->selectyesno("addline",$conf->global->COMMANDE_ADD_DELIVERY_COST_LINE,1).'</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr>';
print '</form>';
@@ -518,7 +518,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set_use_customer_contact_as_recipient">';
print '<tr '.$bc[$var].'>';
print '<td>'.$langs->trans("UseCustomerContactAsOrderRecipientIfExist").'</td>';
-print '<td width="60" align="center">'.$html->selectyesno("use_customer_contact_as_recipient",$conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1).'</td>';
+print '<td width="60" align="center">'.$form->selectyesno("use_customer_contact_as_recipient",$conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1).'</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr>';
print '</form>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index ac4a620a9e6bbfad20edc203c3a41a3130c3aec7..3004a4e2cab3193c7cf52b8b696031e716632e58 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -92,7 +92,7 @@ if ($action == 'update' || $action == 'add')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 8c67fd28cf58aed3200064ca5e9e0c0e06858957..a9088a2b9766e51937b6dd1a6040b501f3c8512a 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -66,7 +66,7 @@ else if ($action == 'disable_delivery')
* Affiche page
*/
$dir = DOL_DOCUMENT_ROOT."/core/modules/expedition/";
-$html=new Form($db);
+$form=new Form($db);
llxHeader("","");
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index b6222c5b9fe6da96dcdf6255e13c018cfea6a07b..3288f574739bf9130e9851ef3a595e61af0886fd 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -81,7 +81,7 @@ if ($action == 'setmod')
llxHeader();
$dir=DOL_DOCUMENT_ROOT."/core/modules/contract/";
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup');
@@ -172,7 +172,7 @@ if (is_resource($handle))
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 78dbbe3ba95462fa0b8583053ee8fd20b9f63fb5..020ea1f2f3d0d870b42cc2b586b889ad4a68f63a 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -537,7 +537,7 @@ if ($_GET["action"] == $acts[1]) // disable
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$formadmin=new FormAdmin($db);
llxHeader();
@@ -564,7 +564,7 @@ print "<br>\n";
*/
if ($_GET['action'] == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$_GET["rowid"].'&code='.$_GET["code"].'&id='.$_GET["id"], $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$_GET["rowid"].'&code='.$_GET["code"].'&id='.$_GET["id"], $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete','',0,1);
if ($ret == 'html') print '<br>';
}
@@ -980,10 +980,10 @@ llxFooter();
function fieldList($fieldlist,$obj='')
{
global $conf,$langs,$db;
+ global $form;
global $region_id;
global $elementList,$sourceList;
- $html = new Form($db);
$formadmin = new FormAdmin($db);
$formcompany = new FormCompany($db);
@@ -992,7 +992,7 @@ function fieldList($fieldlist,$obj='')
if ($fieldlist[$field] == 'pays') {
if (in_array('region_id',$fieldlist)) { print '<td> </td>'; continue; } // For region page, we do not show the country input
print '<td>';
- print $html->select_country(($obj->pays_code?$obj->pays_code:$obj->pays),'pays');
+ print $form->select_country(($obj->pays_code?$obj->pays_code:$obj->pays),'pays');
print '</td>';
}
elseif ($fieldlist[$field] == 'pays_id') {
@@ -1017,14 +1017,14 @@ function fieldList($fieldlist,$obj='')
elseif ($fieldlist[$field] == 'element')
{
print '<td>';
- print $html->selectarray('element', $elementList,$obj->$fieldlist[$field]);
+ print $form->selectarray('element', $elementList,$obj->$fieldlist[$field]);
print '</td>';
}
// La source de l'element (pour les type de contact).'
elseif ($fieldlist[$field] == 'source')
{
print '<td>';
- print $html->selectarray('source', $sourceList,$obj->$fieldlist[$field]);
+ print $form->selectarray('source', $sourceList,$obj->$fieldlist[$field]);
print '</td>';
}
elseif ($fieldlist[$field] == 'type' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX."c_actioncomm")
@@ -1035,7 +1035,7 @@ function fieldList($fieldlist,$obj='')
}
elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'fdm') {
print '<td>';
- print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
+ print $form->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1);
print '</td>';
}
elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) {
@@ -1052,7 +1052,7 @@ function fieldList($fieldlist,$obj='')
}
elseif ($fieldlist[$field]=='unit') {
print '<td>';
- print $html->selectarray('unit',array('mm','cm','point','inch'),$obj->$fieldlist[$field],0,0,1);
+ print $form->selectarray('unit',array('mm','cm','point','inch'),$obj->$fieldlist[$field],0,0,1);
print '</td>';
}
else
diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php
index 54a5d208a5bd312c37267c510e97b0ce6b34bbc2..7fada7e9ee8f6f11980b2b0b5375544cd81a4ab2 100644
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.php
@@ -127,7 +127,7 @@ if ($_GET["action"] == 'del')
*/
$dir = "../core/modules/dons/";
-$html=new Form($db);
+$form=new Form($db);
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
@@ -249,7 +249,7 @@ if (is_resource($handle))
$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1);
$text='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'" target="specimen">'.img_object($langs->trans("Preview"),'generic').'</a>';
print '<td align="center">';
- print $html->textwithpicto(' '.$text,$htmltooltip,-1,0);
+ print $form->textwithpicto(' '.$text,$htmltooltip,-1,0);
print '</td>';
print "</tr>\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 5da12051d7ec3638a8ddada34841644c3ed986dc..2719ef96b6d2668c7c808adf1c788da7f630470a 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -297,7 +297,7 @@ if ($action == 'set_SHIPPING_FREE_TEXT')
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader("","");
@@ -424,7 +424,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -552,7 +552,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"),'sending').'</a>';
- print $html->textwithpicto(' '.$link,$htmltooltip,-1,0);
+ print $form->textwithpicto(' '.$link,$htmltooltip,-1,0);
print '</td>';
print '</tr>';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 8b0a87d06b36ef48a9434a49008d899b5bf50560..40b7cef01c415dabc45dbd33d1b10c7511dacb18 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -283,7 +283,7 @@ if ($action == 'setforcedate')
llxHeader("",$langs->trans("BillsSetup"),'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura');
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@@ -409,7 +409,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
if ($conf->global->FACTURE_ADDON.'.php' == $file) // If module is the one used, we show existing errors
{
@@ -563,7 +563,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
// Preview
@@ -708,7 +708,7 @@ print '<input type="hidden" name="action" value="setforcedate" />';
print '<tr '.$bc[$var].'><td>';
print $langs->trans("ForceInvoiceDate");
print '</td><td width="60" align="center">';
-print $html->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1);
+print $form->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
print "</td></tr>\n";
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 42198d5af346c36c8fbd5eb1a35d5e5cd0daa20d..920024d01cf912c34b4a7613ea78dc88233504dd 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -219,7 +219,7 @@ if ($action == 'setmod')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup');
@@ -304,7 +304,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.=''.$langs->trans("NextValue").': '.$nextval;
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -432,7 +432,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">';
$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'intervention').'</a>';
- print $html->textwithpicto(' '.$link,$htmltooltip,-1,0);
+ print $form->textwithpicto(' '.$link,$htmltooltip,-1,0);
print '</td>';
print '</tr>';
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 10fea69ecba4c630453ba6609050de5529fc4f62..ac2087bbf64ca2662bca1205140e29fc51cfbde1 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -242,7 +242,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader();
@@ -340,7 +340,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -472,7 +472,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
@@ -604,7 +604,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1);
$htmltooltip.='<br>'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1);
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimenfacture&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 790341a9bd3d6a048416a0a08fb216b6d581b275..920433691dcb834bf1a95eaacdd59f7a44bd1cc8 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -89,7 +89,7 @@ if ($action == 'update')
$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-$html=new Form($db);
+$form=new Form($db);
$formother=new FormOther($db);
$formadmin=new FormAdmin($db);
@@ -125,7 +125,7 @@ if ($action == 'edit') // Edit
// Multilangual GUI
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableMultilangInterface").'</td><td>';
- print $html->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
+ print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -146,7 +146,7 @@ if ($action == 'edit') // Edit
{
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$searchformtitle[$key].'</td><td colspan="2">';
- print $html->selectyesno($searchform[$key],$searchformconst[$key],1);
+ print $form->selectyesno($searchform[$key],$searchformconst[$key],1);
print '</td></tr>';
}
print '</table>';
@@ -161,7 +161,7 @@ if ($action == 'edit') // Edit
// Show logo
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("EnableShowLogo").'</td><td>';
- print $html->selectyesno('MAIN_SHOW_LOGO',$conf->global->MAIN_SHOW_LOGO,1);
+ print $form->selectyesno('MAIN_SHOW_LOGO',$conf->global->MAIN_SHOW_LOGO,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -175,7 +175,7 @@ if ($action == 'edit') // Edit
// Desactivation javascript et ajax
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
- print $html->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
+ print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -185,7 +185,7 @@ if ($action == 'edit') // Edit
{
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("UsePreviewTabs").'</td><td>';
- print $html->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0,1);
+ print $form->selectyesno('main_use_preview_tabs',isset($conf->global->MAIN_USE_PREVIEW_TABS)?$conf->global->MAIN_USE_PREVIEW_TABS:0,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -203,7 +203,7 @@ if ($action == 'edit') // Edit
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
- print $html->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
+ print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -211,7 +211,7 @@ if ($action == 'edit') // Edit
// Hide helpcenter link on login page
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelpCenter").'</td><td>';
- print $html->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
+ print $form->selectyesno('MAIN_HELPCENTER_DISABLELINK',isset($conf->global->MAIN_HELPCENTER_DISABLELINK)?$conf->global->MAIN_HELPCENTER_DISABLELINK:0,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -219,7 +219,7 @@ if ($action == 'edit') // Edit
// Hide wiki link on login page
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1)).'</td><td>';
- print $html->selectyesno('MAIN_HELP_DISABLELINK',isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
+ print $form->selectyesno('MAIN_HELP_DISABLELINK',isset($conf->global->MAIN_HELP_DISABLELINK)?$conf->global->MAIN_HELP_DISABLELINK:0,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
@@ -245,7 +245,7 @@ if ($action == 'edit') // Edit
// Show bugtrack link
$var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';
- print $html->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
+ print $form->selectyesno('main_show_bugtrack_link',$conf->global->MAIN_BUGTRACK_ENABLELINK,1);
print '</td>';
print '<td width="20"> </td>';
print '</tr>';
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index c770c432b2f5d90e755dac13984dd4b0af53e551..22aa034694078183c0804c4c992831d2474b956d 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -95,7 +95,7 @@ if (! function_exists("ldap_connect"))
dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"));
$var=true;
-$html=new Form($db);
+$form=new Form($db);
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
@@ -115,7 +115,7 @@ $arraylist=array();
$arraylist['0']=$langs->trans("No");
$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr");
$arraylist['dolibarr2ldap']=$langs->trans("DolibarrToLDAP");
-print $html->selectarray('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE);
+print $form->selectarray('activesynchro',$arraylist,$conf->global->LDAP_SYNCHRO_ACTIVE);
print '</td><td>'.$langs->trans("LDAPDnSynchroActiveExample");
if ($conf->global->LDAP_SYNCHRO_ACTIVE && ! $conf->global->LDAP_USER_DN)
{
@@ -131,7 +131,7 @@ if ($conf->societe->enabled)
$arraylist=array();
$arraylist['0']=$langs->trans("No");
$arraylist['1']=$langs->trans("DolibarrToLDAP");
- print $html->selectarray('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE);
+ print $form->selectarray('activecontact',$arraylist,$conf->global->LDAP_CONTACT_ACTIVE);
print '</td><td>'.$langs->trans("LDAPDnContactActiveExample").'</td></tr>';
}
@@ -143,7 +143,7 @@ if ($conf->adherent->enabled)
$arraylist=array();
$arraylist['0']=$langs->trans("No");
$arraylist['1']=$langs->trans("DolibarrToLDAP");
- print $html->selectarray('activemembers',$arraylist,$conf->global->LDAP_MEMBER_ACTIVE);
+ print $form->selectarray('activemembers',$arraylist,$conf->global->LDAP_MEMBER_ACTIVE);
print '</td><td>'.$langs->trans("LDAPDnMemberActiveExample").'</td></tr>';
}
@@ -160,7 +160,7 @@ $arraylist=array();
$arraylist['activedirectory']='Active Directory';
$arraylist['openldap']='OpenLdap';
$arraylist['egroupware']='Egroupware';
-print $html->selectarray('type',$arraylist,$conf->global->LDAP_SERVER_TYPE);
+print $form->selectarray('type',$arraylist,$conf->global->LDAP_SERVER_TYPE);
print '</td><td> </td></tr>';
// Version
@@ -169,7 +169,7 @@ print '<tr '.$bc[$var].'><td>'.$langs->trans("Version").'</td><td>';
$arraylist=array();
$arraylist['3']='Version 3';
$arraylist['2']='Version 2';
-print $html->selectarray('version',$arraylist,$conf->global->LDAP_SERVER_PROTOCOLVERSION);
+print $form->selectarray('version',$arraylist,$conf->global->LDAP_SERVER_PROTOCOLVERSION);
print '</td><td>'.$langs->trans("LDAPServerProtocolVersion").'</td></tr>';
// Serveur primaire
@@ -211,7 +211,7 @@ print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPServerUseTLS").'</td><td>';
$arraylist=array();
$arraylist['0']=$langs->trans("No");
$arraylist['1']=$langs->trans("Yes");
-print $html->selectarray('usetls',$arraylist,$conf->global->LDAP_SERVER_USE_TLS);
+print $form->selectarray('usetls',$arraylist,$conf->global->LDAP_SERVER_USE_TLS);
print '</td><td>'.$langs->trans("LDAPServerUseTLSExample").'</td></tr>';
print '<tr class="liste_titre">';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 5c1b747af738dc6853b20ab69ade00794a4be9e3..d7dc1ffc9e5847579eef4af9486375702c5fdffa 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -113,7 +113,7 @@ print '<br>';
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-$html=new Form($db);
+$form=new Form($db);
print '<table class="noborder" width="100%">';
$var=true;
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 3120d780c3606c58363fc792cad757c32919aaa6..5b4eded2f990a4a3c62be69db6e41e0743bca927 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -106,7 +106,7 @@ print '<br>';
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-$html=new Form($db);
+$form=new Form($db);
print '<table class="noborder" width="100%">';
$var=true;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 1f70702df1395db814c10a83ee4f5a605a25124f..cca1d5fbdcb979a92db07ed1a511e12daf626d1a 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -128,7 +128,7 @@ print '<br>';
print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-$html=new Form($db);
+$form=new Form($db);
print '<table class="noborder" width="100%">';
$var=true;
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index cef4be7307295ec8bb14bd0c056c49c8fd1d6a27..5f528bc5a5f38b0b5d98e43bca17be72981d9d7b 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -114,7 +114,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-$html=new Form($db);
+$form=new Form($db);
print '<table class="noborder" width="100%">';
$var=true;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index fb9fce66af816bab6332646b1afe0aeb4b104e49..74bed303f0db5a76bc126a54613cc1818fdd8aa4 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -84,7 +84,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader();
@@ -110,12 +110,12 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_UNIT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_UNIT . '"></td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td><input class="flat" name="MAIN_MAX_DECIMALS_TOT" size="3" value="' . $conf->global->MAIN_MAX_DECIMALS_TOT . '"></td></tr>';
$var=!$var;
@@ -123,7 +123,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td><input class="flat" name="MAIN_ROUNDING_RULE_TOT" size="3" value="' . $conf->global->MAIN_ROUNDING_RULE_TOT . '"></td></tr>';
print '</table>';
@@ -144,12 +144,12 @@ else
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_UNIT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_UNIT.'</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_MAX_DECIMALS_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td align="right">'.$conf->global->MAIN_MAX_DECIMALS_TOT.'</td></tr>';
$var=!$var;
@@ -157,7 +157,7 @@ else
$var=!$var;
print '<tr '.$bc[$var].'><td>';
- print $html->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
+ print $form->textwithpicto($langs->trans("MAIN_ROUNDING_RULE_TOT"),$langs->trans("ParameterActiveForNextInputOnly"));
print '</td><td align="right">'.$conf->global->MAIN_ROUNDING_RULE_TOT.'</td></tr>';
print '</table>';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 33cb3bb057d93c0cb62ebe92870353d3a4a25a07..666e4fa6fbe5914a4a63b82509f51d17a209a2d5 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -190,7 +190,7 @@ if ($action == 'setmod')
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader("","");
@@ -308,7 +308,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -433,7 +433,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br><br>'.$langs->trans("FeaturesSupported").':';
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'sending').'</a>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 66e41488edcd108417a8f3c3c7c361413a74c443..789789bc9e5719467e64d540f636e433b8b1ff14 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -270,7 +270,7 @@ $listofmethods['smtps']='SMTP/SMTPS socket library';
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
- $html=new Form($db);
+ $form=new Form($db);
if ($conf->use_javascript_ajax)
{
@@ -321,7 +321,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
// Disable
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
- print $html->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
+ print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1);
print '</td></tr>';
// Separator
@@ -335,14 +335,14 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
// SuperAdministrator access only
if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
{
- print $html->selectarray('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE);
+ print $form->selectarray('MAIN_MAIL_SENDMODE',$listofmethods,$conf->global->MAIN_MAIL_SENDMODE);
}
else
{
$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
if (empty($text)) $text = $langs->trans("Undefined");
$htmltext = $langs->trans("ContactSuperAdminForChange");
- print $html->textwithpicto($text,$htmltext,1,'superadmin');
+ print $form->textwithpicto($text,$htmltext,1,'superadmin');
print '<input type="hidden" name="MAIN_MAIL_SENDMODE" value="'.$conf->global->MAIN_MAIL_SENDMODE.'">';
}
print '</td></tr>';
@@ -371,7 +371,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
$text = $conf->global->MAIN_MAIL_SMTP_SERVER ? $conf->global->MAIN_MAIL_SMTP_SERVER : $smtpserver;
$htmltext = $langs->trans("ContactSuperAdminForChange");
- print $html->textwithpicto($text,$htmltext,1,'superadmin');
+ print $form->textwithpicto($text,$htmltext,1,'superadmin');
print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$conf->global->MAIN_MAIL_SMTP_SERVER.'">';
}
}
@@ -401,7 +401,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
$text = $conf->global->MAIN_MAIL_SMTP_PORT ? $conf->global->MAIN_MAIL_SMTP_PORT : $smtpport;
$htmltext = $langs->trans("ContactSuperAdminForChange");
- print $html->textwithpicto($text,$htmltext,1,'superadmin');
+ print $form->textwithpicto($text,$htmltext,1,'superadmin');
print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" value="'.$conf->global->MAIN_MAIL_SMTP_PORT.'">';
}
}
@@ -420,7 +420,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
else
{
$htmltext = $langs->trans("ContactSuperAdminForChange");
- print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,'superadmin');
+ print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID,$htmltext,1,'superadmin');
print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$conf->global->MAIN_MAIL_SMTPS_ID.'">';
}
print '</td></tr>';
@@ -439,7 +439,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
else
{
$htmltext = $langs->trans("ContactSuperAdminForChange");
- print $html->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin');
+ print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW,$htmltext,1,'superadmin');
print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$conf->global->MAIN_MAIL_SMTPS_PW.'">';
}
print '</td></tr>';
@@ -452,7 +452,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
if (function_exists('openssl_open'))
{
- print $html->selectyesno('MAIN_MAIL_EMAIL_TLS',$conf->global->MAIN_MAIL_EMAIL_TLS,1);
+ print $form->selectyesno('MAIN_MAIL_EMAIL_TLS',$conf->global->MAIN_MAIL_EMAIL_TLS,1);
}
else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
}
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 99f6d88eae643976ddcfe4898205d228450b822c..9d56ca1ddba3720420874f47c416575d22303b60 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -97,7 +97,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
* View
*/
-$html=new Form($db);
+$form=new Form($db);
$htmladmin=new FormAdmin($db);
$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
@@ -143,10 +143,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
print '<td>';
- print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc"));
print '</td>';
print '<td>';
- print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc"));
print '</td>';
print '</tr>';
@@ -190,10 +190,10 @@ else
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
print '<td>';
- print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc"));
print '</td>';
print '<td>';
- print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc"));
print '</td>';
print '</tr>';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 5c8dc99ab0f47f1518f5795f491bade55e480ea9..ff2f82583b208a86f158d853a2f4ea444e1247a0 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -216,8 +216,8 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
* View
*/
-$html=new Form($db);
-$htmladmin=new FormAdmin($db);
+$form=new Form($db);
+$formadmin=new FormAdmin($db);
llxHeader('',$langs->trans("Menu"));
@@ -274,7 +274,7 @@ if ($action == 'create')
// Handler
print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td>';
print '<td>';
- print $htmladmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
+ print $formadmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
print '</td>';
print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index b528f7e374f2659304774f4f885bc6f768ac0115..7c32e5c8bd7fa6e67fc5f65ba04c031354ff2bc1 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -198,8 +198,8 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
* View
*/
-$html=new Form($db);
-$htmladmin=new FormAdmin($db);
+$form=new Form($db);
+$formadmin=new FormAdmin($db);
$arrayofjs=array('/admin/menus/menu.js.php?lang='.$langs->defaultlang);
llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs);
@@ -241,7 +241,7 @@ if ($_GET["action"] == 'delete')
$result = $db->query($sql);
$obj = $db->fetch_object($result);
- $ret=$html->form_confirm("index.php?menu_handler=".$menu_handler."&menuId=".$_GET['menuId'],$langs->trans("DeleteMenu"),$langs->trans("ConfirmDeleteMenu",$obj->titre),"confirm_delete");
+ $ret=$form->form_confirm("index.php?menu_handler=".$menu_handler."&menuId=".$_GET['menuId'],$langs->trans("DeleteMenu"),$langs->trans("ConfirmDeleteMenu",$obj->titre),"confirm_delete");
if ($ret == 'html') print '<br>';
}
@@ -249,7 +249,7 @@ if ($_GET["action"] == 'delete')
print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" action="change_menu_handler">';
print $langs->trans("MenuHandler").': ';
-print $htmladmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
+print $formadmin->select_menu_families($menu_handler,'menu_handler',$dirmenu);
print ' <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
print '</form>';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 0bbf3e2ec55e0d72391dbaeb39299b89b7b12323..abbc1e038c540fa109abce3f1b960a9c5b28b3f4 100755
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -66,7 +66,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
$wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
llxHeader('',$langs->trans("Setup"),$wikihelp);
-$html=new Form($db);
+$form=new Form($db);
$formother=new FormOther($db);
$formadmin=new FormAdmin($db);
@@ -116,7 +116,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
$pid1=$langs->transcountry("ProfId1",$mysoc->pays_code);
if ($pid1 == '-') $pid1=$langs->transcountry("ProfId1");
print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.'</td><td>';
- print $html->selectyesno('MAIN_PROFID1_IN_ADDRESS',isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0,1);
+ print $form->selectyesno('MAIN_PROFID1_IN_ADDRESS',isset($conf->global->MAIN_PROFID1_IN_ADDRESS)?$conf->global->MAIN_PROFID1_IN_ADDRESS:0,1);
print '</td></tr>';
// Show prof id 2 in address into pdf
@@ -124,7 +124,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
$pid2=$langs->transcountry("ProfId2",$mysoc->pays_code);
if ($pid2 == '-') $pid2=$langs->transcountry("ProfId2");
print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.'</td><td>';
- print $html->selectyesno('MAIN_PROFID2_IN_ADDRESS',isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0,1);
+ print $form->selectyesno('MAIN_PROFID2_IN_ADDRESS',isset($conf->global->MAIN_PROFID2_IN_ADDRESS)?$conf->global->MAIN_PROFID2_IN_ADDRESS:0,1);
print '</td></tr>';
// Show prof id 3 in address into pdf
@@ -132,7 +132,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
$pid3=$langs->transcountry("ProfId3",$mysoc->pays_code);
if ($pid3 == '-') $pid3=$langs->transcountry("ProfId3");
print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.'</td><td>';
- print $html->selectyesno('MAIN_PROFID3_IN_ADDRESS',isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0,1);
+ print $form->selectyesno('MAIN_PROFID3_IN_ADDRESS',isset($conf->global->MAIN_PROFID3_IN_ADDRESS)?$conf->global->MAIN_PROFID3_IN_ADDRESS:0,1);
print '</td></tr>';
// Show prof id 4 in address into pdf
@@ -140,7 +140,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
$pid4=$langs->transcountry("ProfId4",$mysoc->pays_code);
if ($pid4 == '-') $pid4=$langs->transcountry("ProfId4");
print '<tr '.$bc[$var].'><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.'</td><td>';
- print $html->selectyesno('MAIN_PROFID4_IN_ADDRESS',isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0,1);
+ print $form->selectyesno('MAIN_PROFID4_IN_ADDRESS',isset($conf->global->MAIN_PROFID4_IN_ADDRESS)?$conf->global->MAIN_PROFID4_IN_ADDRESS:0,1);
print '</td></tr>';
print '</table>';
@@ -156,7 +156,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
// Hide any PDF informations
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
- print $html->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
+ print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',(! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0,1);
print '</td></tr>';
print '</table>';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index a402ea2b82ba763361534196cb6567a0267b5c62..89fe985d15db6c61f04de08c548f5c428df668cc 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -110,7 +110,7 @@ if ($action == "deletenotif")
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader('',$langs->trans("WithdrawalsSetup"));
@@ -131,7 +131,7 @@ print "</tr>";
print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>';
print '<td align="left">';
print '<input type="hidden" name="nom0" value="PRELEVEMENT_USER">';
-print $html->select_users($conf->global->PRELEVEMENT_USER,'value0',1);
+print $form->select_users($conf->global->PRELEVEMENT_USER,'value0',1);
print '</td>';
print '</tr>';
@@ -145,7 +145,7 @@ print '</tr>';
// Bank account (from Banks module)
print '<tr class="impair"><td>'.$langs->trans("BankToReceiveWithdraw").'</td>';
print '<td align="left">';
-print $html->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1);
+print $form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT,'PRELEVEMENT_ID_BANKACCOUNT',0,"courant=1",1);
print '</td></tr>';
print '</table>';
print '<br>';
@@ -223,11 +223,11 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION)
print "</tr>\n";
print '<tr class="impair"><td align="left">';
- print $html->selectarray('user',$internalusers);// select_users(0,'user',0);
+ print $form->selectarray('user',$internalusers);// select_users(0,'user',0);
print '</td>';
print '<td>';
- print $html->selectarray('action',$actions);// select_users(0,'user',0);
+ print $form->selectarray('action',$actions);// select_users(0,'user',0);
print '</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php
index cea9e9ebecd6d1b1dc0db865773b57a7f8023846..fae20ebd30ac3aaef451b0b8cfdf90a317bb4f86 100644
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.php
@@ -171,7 +171,7 @@ if ($action == 'setmod')
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader();
@@ -264,7 +264,7 @@ if (is_resource($handle))
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '</tr>';
@@ -385,7 +385,7 @@ if (is_resource($handle))
$htmltooltip.='<br>'.$langs->trans("Logo").': '.yn($module->option_logo,1,1);
print '<td align="center">';
$link='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'order').'</a>';
- print $html->textwithpicto(' '.$link,$htmltooltip,-1,0);
+ print $form->textwithpicto(' '.$link,$htmltooltip,-1,0);
print '</td>';
print "</tr>\n";
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index c69c2f3f4fe278187e6aaace6c29c44ec8fa023a..014dd0998309796f5ca88a4901da12f2cb09f69f 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -250,7 +250,7 @@ if ($action == 'setmod')
llxHeader('',$langs->trans("PropalSetup"));
-$html=new Form($db);
+$form=new Form($db);
//if ($mesg) print $mesg;
@@ -349,7 +349,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
}
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print "</tr>\n";
@@ -486,7 +486,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">';
- print $html->textwithpicto('',$htmltooltip,1,0);
+ print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
print '<td align="center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'propal').'</a>';
@@ -538,7 +538,7 @@ print '<input type="hidden" name="action" value="setusecustomercontactasrecipien
print '<tr '.$bc[$var].'><td>';
print $langs->trans("UseCustomerContactAsPropalRecipientIfExist");
print '</td><td width="60" align="center">';
-print $html->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1);
+print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td></tr>\n";
@@ -554,7 +554,7 @@ if ($conf->commande->enabled)
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("ClassifiedInvoicedWithOrder").'</td>';
print '<td width="60" align="center">';
- print $html->selectyesno('value',$conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER,1);
+ print $form->selectyesno('value',$conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER,1);
print "</td>";
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</tr>';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 29e8533c8d9f5aeb0f24d118a6c3f3d3e5d9ea6a..b65674a07c644330784063c53ed6ba0fce731eb6 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -183,7 +183,7 @@ else if ($_GET["action"] == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
/*
* View
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader('',$langs->trans("Passwords"));
@@ -366,7 +366,7 @@ $var=!$var;
print "<tr ".$bc[$var].">";
print '<td colspan="3">';
$text = $langs->trans("ProtectAndEncryptPdfFiles");
-$desc = $html->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
+$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1);
print $desc;
print '</td>';
print '<td align="center" width="60">';
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 28a59e6c57e7353387e5851715b848851652a9e6..7cebab29a03a0cc44fcfe4f3faa2f6d304b73b38 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -210,8 +210,8 @@ if (function_exists("imagecreatefrompng"))
}
else
{
- $html = new Form($db);
- $desc = $html->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,'warning');
+ $form = new Form($db);
+ $desc = $form->textwithpicto('',$langs->transnoentities("EnableGDLibraryDesc"),1,'warning');
print $desc;
}
print "</td>";
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index efdcde116f62e72ebba9470123c3c547b88f0de2..a63e53006e433842f4ed8d4203faa65d22056b1f 100755
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -165,7 +165,7 @@ asort($listofmethods);
if ($action == 'edit')
{
- $html=new Form($db);
+ $form=new Form($db);
if (! count($listofmethods)) print '<div class="error">'.$langs->trans("NoSmsEngine").'</div>';
@@ -182,7 +182,7 @@ if ($action == 'edit')
// Disable
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_SMS").'</td><td>';
- print $html->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1);
+ print $form->selectyesno('MAIN_DISABLE_ALL_SMS',$conf->global->MAIN_DISABLE_ALL_SMS,1);
print '</td></tr>';
// Separator
@@ -192,7 +192,7 @@ if ($action == 'edit')
// Method
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_SMS_SENDMODE").'</td><td>';
- if (count($listofmethods)) print $html->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
+ if (count($listofmethods)) print $form->selectarray('MAIN_SMS_SENDMODE',$listofmethods,$conf->global->MAIN_SMS_SENDMODE,1);
else print '<font class="error">'.$langs->trans("None").'</font>';
print '</td></tr>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 3afe13683b824594e78d3e2a562fda422da6b5fe..df4e84ddb296d02da0418ad89d6aebc53914ac89 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -96,7 +96,7 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup');
print '<br>';
-$html=new Form($db);
+$form=new Form($db);
$var=true;
print '<table class="noborder" width="100%">';
@@ -118,7 +118,7 @@ print '<td width="160" align="right">';
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
-print $html->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
+print $form->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print '</form>';
print "</td>\n";
@@ -141,7 +141,7 @@ if ($conf->facture->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_BILL\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_BILL",$conf->global->STOCK_CALCULATE_ON_BILL,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
@@ -155,7 +155,7 @@ if ($conf->commande->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_VALIDATE_ORDER\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
@@ -169,7 +169,7 @@ if ($conf->expedition->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SHIPMENT\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_SHIPMENT",$conf->global->STOCK_CALCULATE_ON_SHIPMENT,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
@@ -191,7 +191,7 @@ if ($conf->fournisseur->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_BILL\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_BILL",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
@@ -205,7 +205,7 @@ if ($conf->fournisseur->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
@@ -218,7 +218,7 @@ if ($conf->fournisseur->enabled)
print "<form method=\"post\" action=\"stock.php\">";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER\">";
- print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1);
+ print $form->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n";
}
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 41388960bea3919517f9a85f153c49171acba25f..cbe1aa16322e30098dc065ae90fdcd21152b2e69 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -138,7 +138,7 @@ if ($action == 'setlevel')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup');
@@ -176,14 +176,14 @@ $var=!$var;
print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_FILE_ON" '.$option.' value="1" '.($syslog_file_on?' checked="checked"':'').'> '.$langs->trans("SyslogSimpleFile").'</td>';
print '<td width="250" nowrap="nowrap">'.$langs->trans("SyslogFilename").': <input type="text" class="flat" name="filename" '.$option.' size="60" value="'.$defaultsyslogfile.'">';
print '</td>';
-print "<td align=\"left\">".$html->textwithpicto('',$langs->trans("YouCanUseDOL_DATA_ROOT"));
+print "<td align=\"left\">".$form->textwithpicto('',$langs->trans("YouCanUseDOL_DATA_ROOT"));
print '</td></tr>';
$var=!$var;
print '<tr '.$bc[$var].'><td width="140"><input '.$bc[$var].' type="checkbox" name="SYSLOG_SYSLOG_ON" '.$option.' value="1" '.($syslog_syslog_on?' checked="checked"':'').'> '.$langs->trans("SyslogSyslog").'</td>';
print '<td width="250" nowrap="nowrap">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" '.$option.' value="'.$defaultsyslogfacility.'">';
print '</td>';
-print "<td align=\"left\">".$html->textwithpicto('','Only LOG_USER supported on Windows');
+print "<td align=\"left\">".$form->textwithpicto('','Only LOG_USER supported on Windows');
print '</td></tr>';
try
@@ -198,7 +198,7 @@ try
print '> '.$langs->trans("FirePHP").'</td>';
print '<td width="250" nowrap="nowrap">';
print '</td>';
- print "<td align=\"left\">".$html->textwithpicto('','FirePHP must be installed onto PHP and FirePHP plugin for Firefox must also be installed');
+ print "<td align=\"left\">".$form->textwithpicto('','FirePHP must be installed onto PHP and FirePHP plugin for Firefox must also be installed');
print '</td></tr>';
}
catch(Exception $e)
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 0c48f9675a911a6202f37216f922f93e6ff7c568..395011ee2b956d1702ae6561648f92d6a6ddf5ab 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -35,7 +35,7 @@ if (!$user->admin) accessforbidden();
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader();
@@ -122,8 +122,8 @@ else
$show=1;
}
if ($show==0) print $row[1];
- if ($show==1) print $html->textwithpicto($row[1],$text);
- if ($show==2) print $html->textwithpicto($row[1],$text,1,'warning');
+ if ($show==1) print $form->textwithpicto($row[1],$text);
+ if ($show==2) print $form->textwithpicto($row[1],$text,1,'warning');
print '</td>';
print '</tr>'."\n";
}
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 64faead5fc2b6ae8523c189b877b4038c8ca9684..9a110b89f2414b3a5c7f39438bcc2c06b3706ebd 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -117,7 +117,7 @@ if ($action == 'settaxmode')
*/
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans('TaxSetup'),$linkback,'setup');
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index bbb8b28660831f6e1cf535deeba071dd8d9822ff..0e12ed41b227f46f4edb0dfd35681e9ddb8b07a4 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -30,7 +30,7 @@ if (! $user->admin)
accessforbidden();
-$html=new Form($db);
+$form=new Form($db);
$formfile = new FormFile($db);
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 28f488a5f90570586930ee4be04318882b414289..aa3bbcefc658317801704e575af780a92f911395 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -221,7 +221,7 @@ function create_key_table($list)
}
-$html=new Form($db);
+$form=new Form($db);
print_fiche_titre('Dolibarr eAccelerator '.$info['version'].' control panel','','setup');
$var=true;
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index b25aa2e9be9aeaf8df02479254977f96fcea5bff..be59a528f2937c08881d164055549f117b25eff8 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -54,7 +54,7 @@ if ($file && ! $what)
llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad');
-$html=new Form($db);
+$form=new Form($db);
$formfile = new FormFile($db);
print_fiche_titre($langs->trans("Backup"),'','setup');
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 62f536bcba7be5f8a3d34d537d9adefb4d938dcc..feddec8462c8fc44d50b72b8cd9d5846c4d41bf1 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -112,7 +112,7 @@ if ($_REQUEST["action"]=='purge' && ! preg_match('/^confirm/i',$_REQUEST["choice
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
print_fiche_titre($langs->trans("Purge"),'','setup');
@@ -165,7 +165,7 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"]))
{
print '<br>';
$formquestion=array();
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?choice=allfiles',$langs->trans('Purge'),$langs->trans('ConfirmPurge').' '.img_warning(),'purge',$formquestion,'no',2);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?choice=allfiles',$langs->trans('Purge'),$langs->trans('ConfirmPurge').' '.img_warning(),'purge',$formquestion,'no',2);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index 16764593b8474844fd13aaa72a9d55b6062268cf..39f185c4a21c23d03a1206ba88e71c2fa8994761 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -40,7 +40,7 @@ if (!$user->admin)
llxHeader("","");
-$html = new Form($db);
+$form = new Form($db);
print_fiche_titre($langs->trans("TriggersAvailable"),'','setup');
diff --git a/htdocs/bookmarks/fiche.php b/htdocs/bookmarks/fiche.php
index 9a5243feeaacbb3d4ff9bfda7c9d28215cb46d9d..1e9a3cd23bc75ba46322011a71bdda9c5629056e 100644
--- a/htdocs/bookmarks/fiche.php
+++ b/htdocs/bookmarks/fiche.php
@@ -124,7 +124,7 @@ if ($_GET["action"] == 'delete')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
if ($action == 'create')
@@ -149,11 +149,11 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans("BehaviourOnClick").'</td><td>';
$liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow"));
- print $html->selectarray('target',$liste,1);
+ print $form->selectarray('target',$liste,1);
print '</td><td>'.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'</td></tr>';
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
- $html->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
+ $form->select_users(isset($_POST['userid'])?$_POST['userid']:$user->id,'userid',1);
print '</td><td> </td></tr>';
// Position
@@ -210,7 +210,7 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"]))
if ($_GET["action"] == 'edit')
{
$liste=array(1=>$langs->trans("OpenANewWindow"),0=>$langs->trans("ReplaceWindow"));
- print $html->selectarray('target',$liste,isset($_POST["target"])?$_POST["target"]:$bookmark->target);
+ print $form->selectarray('target',$liste,isset($_POST["target"])?$_POST["target"]:$bookmark->target);
}
else
{
@@ -222,7 +222,7 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"]))
print '<tr><td>'.$langs->trans("Owner").'</td><td>';
if ($_GET["action"] == 'edit' && $user->admin)
{
- $html->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
+ $form->select_users(isset($_POST['userid'])?$_POST['userid']:($bookmark->fk_user?$bookmark->fk_user:''),'userid',1);
}
else
{
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index b18bf124ae4f862c590223ad0c718a72c250dc1c..3938139b2f1cd0adfcef627491cf2d9654e78c9b 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -101,8 +101,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<p class="note_label">
<?php
echo $langs->trans("BankToPay"). "<br>";
- $html = new Form($db);
- $html->select_comptes($selected,'cashdeskbank',0,$filtre);
+ $form = new Form($db);
+ $form->select_comptes($selected,'cashdeskbank',0,$filtre);
?>
</p>
<p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index d1203ec56749061868420a6f3e56487b4cdef57f..21cf1ad4cc9718af0776cc2c0e9514d4e17ccab9 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -167,7 +167,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
* View
*/
-$html = new Form($db);
+$form = new Form($db);
/*
@@ -194,7 +194,7 @@ if ($socid)
print '<table class="border" width="100%">';
print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
- print $html->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom','','&type='.$type);
+ print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom','','&type='.$type);
print '</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
@@ -305,7 +305,7 @@ else if ($id || $ref)
// Ref
print "<tr>";
print '<td width="15%">'.$langs->trans("Ref").'</td><td>';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -367,7 +367,7 @@ else if ($id || $ref)
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur">';
- print $html->showrefnav($member,'rowid');
+ print $form->showrefnav($member,'rowid');
print '</td></tr>';
// Login
@@ -379,7 +379,7 @@ else if ($id || $ref)
// Morphy
print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>';
/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
- print $html->showphoto('memberphoto',$member);
+ print $form->showphoto('memberphoto',$member);
print '</td>';*/
print '</tr>';
@@ -425,7 +425,7 @@ else if ($id || $ref)
*/
function formCategory($db,$object,$typeid)
{
- global $user,$langs,$html,$bc;
+ global $user,$langs,$form,$bc;
if ($typeid == 0) $title = $langs->trans("ProductsCategoriesShort");
if ($typeid == 1) $title = $langs->trans("SuppliersCategoriesShort");
@@ -443,7 +443,7 @@ function formCategory($db,$object,$typeid)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td width="40%">';
print $langs->trans("ClassifyInCategory").' ';
- print $html->select_all_categories($typeid);
+ print $form->select_all_categories($typeid);
print '</td><td>';
print '<input type="submit" class="button" value="'.$langs->trans("Classify").'"></td>';
if ($user->rights->categorie->creer)
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index e513b901db02cf1bb4d13f672c93e18354914b91..efc432e7f94d7097aff4dc72cbd5670643b37262 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -109,7 +109,7 @@ dol_htmloutput_errors($mesg);
$categorie = new Categorie($db, $id);
-$html = new Form($db);
+$form = new Form($db);
print '<table class="notopnoleft" border="0" width="100%">';
@@ -141,7 +141,7 @@ print '</td></tr>';
// Parent category
print '<tr><td>'.$langs->trans("In").'</td><td>';
-print $html->select_all_categories($type,$categorie->id_mere,'catMere',64,$categorie->id);
+print $form->select_all_categories($type,$categorie->id_mere,'catMere',64,$categorie->id);
print '</td></tr>';
print '</table>';
diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
index 651132de78e2640b4b1e39e5166be4695541a670..893afea90e313280039098a932ad3bec4921b752 100644
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -176,7 +176,7 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
*/
llxHeader("","",$langs->trans("Categories"));
-$html = new Form($db);
+$form = new Form($db);
if ($user->rights->categorie->creer)
{
@@ -216,7 +216,7 @@ if ($user->rights->categorie->creer)
// Parent category
print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
- print $html->select_all_categories($type,$catorigin);
+ print $form->select_all_categories($type,$catorigin);
print '</td></tr>';
print '</table>';
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d6cb0166c96fd7043272f237c83da649a144448a..8dc601e996f60fce176cf2db3ea4aec2980bd8f9 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -41,7 +41,7 @@ $langs->load("categories");
*/
$categstatic = new Categorie($db);
-$html = new Form($db);
+$form = new Form($db);
if ($type == 0) $title=$langs->trans("ProductsCategoriesArea");
elseif ($type == 1) $title=$langs->trans("SuppliersCategoriesArea");
@@ -75,7 +75,7 @@ print $langs->trans("Name").':</td><td><input class="flat" type="text" size="20"
print '<tr '.$bc[0].'><td>';
print $langs->trans("SubCatOf").':</td><td>';
-print $html->select_all_categories('','subcatof');
+print $form->select_all_categories('','subcatof');
print '</td>';
print '<td><input type="submit" class="button" value="'.$langs->trans ("Search").'"></td></tr>';
*/
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 82f7b742bb3753456e8543d4acf046c463a2055d..76f65ac07a0f74b5da08115c9e41961810c84e81 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -83,7 +83,7 @@ if ($action == 'addthumb' && $_GET["file"])
llxHeader("","",$langs->trans("Categories"));
-$html = new Form($db);
+$form = new Form($db);
if (!empty($id) || !empty($ref))
{
@@ -105,7 +105,7 @@ if (!empty($id) || !empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 80c9cac9e065597f6dc8f1f95edde6d7c531f84a..88f5dcec26953eb540100287a34eba849fbfe50a 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -80,7 +80,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
* View
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("Categories"));
@@ -101,7 +101,7 @@ dol_fiche_head($head, 'card', $title, 0, 'category');
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type,$langs->trans('DeleteCategory'),$langs->trans('ConfirmDeleteCategory'),'confirm_delete');
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type,$langs->trans('DeleteCategory'),$langs->trans('ConfirmDeleteCategory'),'confirm_delete');
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index eef56b5d978d8ee431d8998f116ec6ed20694864..184f4acd3e8e6cb19d320ca5d5e14b2c89263574 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -385,7 +385,7 @@ if ($action == 'update')
$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
llxHeader('',$langs->trans("Agenda"),$help_url);
-$html = new Form($db);
+$form = new Form($db);
$htmlactions = new FormActions($db);
@@ -484,17 +484,17 @@ if ($action == 'create')
$datep=$actioncomm->datep;
if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0);
print '<tr><td width="30%" nowrap="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
- if (GETPOST("afaire") == 1) $html->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
- else if (GETPOST("afaire") == 2) $html->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend');
- else $html->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+ if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend');
+ else if (GETPOST("afaire") == 2) $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend');
+ else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
print '</td></tr>';
// Date end
$datef=$actioncomm->datef;
if (GETPOST('datef','int',1)) $datef=dol_stringtotime(GETPOST('datef','int',1),0);
print '<tr><td><span id="dateend"'.(GETPOST("actioncode") == 'AC_RDV'?' class="fieldrequired"':'').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
- if (GETPOST("afaire") == 1) $html->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
- else if (GETPOST("afaire") == 2) $html->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
- else $html->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ if (GETPOST("afaire") == 1) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ else if (GETPOST("afaire") == 2) $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ else $form->select_date($datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
print '</td></tr>';
// Status
@@ -524,12 +524,12 @@ if ($action == 'create')
// Affected by
print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
- $html->select_users(GETPOST("affectedto")?GETPOST("affectedto"):($actioncomm->usertodo->id > 0 ? $actioncomm->usertodo : $user),'affectedto',1);
+ $form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):($actioncomm->usertodo->id > 0 ? $actioncomm->usertodo : $user),'affectedto',1);
print '</td></tr>';
// Realised by
print '<tr><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td>';
- $html->select_users(GETPOST("doneby")?GETPOST("doneby"):($percent==100?$actioncomm->userdone:0),'doneby',1);
+ $form->select_users(GETPOST("doneby")?GETPOST("doneby"):($percent==100?$actioncomm->userdone:0),'doneby',1);
print '</td></tr>';
print '</table>';
@@ -547,7 +547,7 @@ if ($action == 'create')
}
else
{
- print $html->select_societes('','socid','',1,1);
+ print $form->select_societes('','socid','',1,1);
}
print '</td></tr>';
@@ -555,7 +555,7 @@ if ($action == 'create')
if (GETPOST("contactid") > 0 || GETPOST("socid") > 0)
{
print '<tr><td nowrap>'.$langs->trans("ActionOnContact").'</td><td>';
- $html->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1);
+ $form->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1);
print '</td></tr>';
}
@@ -656,7 +656,7 @@ if ($id)
// Confirmation suppression action
if ($action == 'delete')
{
- $ret=$html->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1);
+ $ret=$form->form_confirm("fiche.php?id=".$id,$langs->trans("DeleteAction"),$langs->trans("ConfirmDeleteAction"),"confirm_delete",'','',1);
if ($ret == 'html') print '<br>';
}
@@ -721,15 +721,15 @@ if ($id)
// Date start
print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans("DateActionStart").'</td><td colspan="3">';
- if (GETPOST("afaire") == 1) $html->select_date($act->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
- else if (GETPOST("afaire") == 2) $html->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
- else $html->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+ if (GETPOST("afaire") == 1) $form->select_date($act->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart');
+ else if (GETPOST("afaire") == 2) $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
+ else $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
- if (GETPOST("afaire") == 1) $html->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
- else if (GETPOST("afaire") == 2) $html->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
- else $html->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ if (GETPOST("afaire") == 1) $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ else if (GETPOST("afaire") == 2) $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
+ else $form->select_date($act->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
print '</td></tr>';
// Status
@@ -750,12 +750,12 @@ if ($id)
// Affected to
print '<tr><td nowrap>'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
- print $html->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1);
+ print $form->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1);
print '</td></tr>';
// Realised by
print '<tr><td nowrap>'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
- print $html->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1);
+ print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1);
print '</td></tr>';
print '</table><br>';
@@ -765,12 +765,12 @@ if ($id)
// Company
print '<tr><td width="30%">'.$langs->trans("ActionOnCompany").'</td>';
print '<td>';
- print $html->select_societes($act->societe->id,'socid','',1,1);
+ print $form->select_societes($act->societe->id,'socid','',1,1);
print '</td>';
// Contact
print '<td>'.$langs->trans("Contact").'</td><td width="30%">';
- print $html->selectarray("contactid", $act->societe->contact_array(), $act->contact->id, 1);
+ print $form->selectarray("contactid", $act->societe->contact_array(), $act->contact->id, 1);
print '</td></tr>';
// Project
@@ -823,7 +823,7 @@ if ($id)
// Ref
print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref','');
+ print $form->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref','');
print '</td></tr>';
// Type
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 2cecb22451598a78ecc9e468e2f5106ed2f5ef44..54a24e1c44b99fc9af698f5c873d5ab31fadfcf1 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -62,7 +62,7 @@ llxHeader();
print_fiche_titre($langs->trans("NewProp"));
-$html=new Form($db);
+$form=new Form($db);
// Add new proposal
@@ -137,7 +137,7 @@ if ($_GET["action"] == 'create')
// Contacts
print "<tr><td>".$langs->trans("DefaultContact")."</td><td colspan=\"2\">\n";
- $html->select_contacts($soc->id,$setcontact,'contactidp',1);
+ $form->select_contacts($soc->id,$setcontact,'contactidp',1);
print '</td></tr>';
// Ligne info remises tiers
@@ -153,7 +153,7 @@ if ($_GET["action"] == 'create')
// Date
print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
- $html->select_date('','','','','',"addprop");
+ $form->select_date('','','','','',"addprop");
print '</td></tr>';
// Validaty duration
@@ -161,22 +161,22 @@ if ($_GET["action"] == 'create')
// Terms of payment
print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
- $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
+ $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
print '</td></tr>';
// Mode of payment
print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
- $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+ $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print '</td></tr>';
// What trigger creation
print '<tr><td>'.$langs->trans('Source').'</td><td>';
- $html->select_demand_reason($propal->demand_reason,'demand_reason_id',"SRC_PROP",1);
+ $form->select_demand_reason($propal->demand_reason,'demand_reason_id',"SRC_PROP",1);
print '</td></tr>';
// Delivery delay
print '<tr><td>'.$langs->trans('AvailabilityPeriod').'</td><td colspan="2">';
- $html->select_availability($propal->availability,'availability_id','',1);
+ $form->select_availability($propal->availability,'availability_id','',1);
print '</td></tr>';
// Delivery date (or manufacturing)
@@ -188,12 +188,12 @@ if ($_GET["action"] == 'create')
$syear = date("Y", $tmpdte);
$smonth = date("m", $tmpdte);
$sday = date("d", $tmpdte);
- $html->select_date($syear."-".$smonth."-".$sday,'liv_','','','',"addprop");
+ $form->select_date($syear."-".$smonth."-".$sday,'liv_','','','',"addprop");
}
else
{
$datepropal=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
- $html->select_date($datepropal,'liv_','','','',"addprop");
+ $form->select_date($datepropal,'liv_','','','',"addprop");
}
print '</td></tr>';
@@ -202,7 +202,7 @@ if ($_GET["action"] == 'create')
{
print '<tr><td>'.$langs->trans('DeliveryAddress').'</td>';
print '<td colspan="3">';
- $numaddress = $html->select_address($soc->fk_delivery_address, $_GET['socid'],'fk_address',1);
+ $numaddress = $form->select_address($soc->fk_delivery_address, $_GET['socid'],'fk_address',1);
if ($numaddress==0)
{
print ' <a href=../comm/address.php?socid='.$soc->id.'&action=create>'.$langs->trans("AddAddress").'</a>';
@@ -215,7 +215,7 @@ if ($_GET["action"] == 'create')
print '<td>'.$langs->trans("DefaultModel").'</td>';
print '<td colspan="2">';
$liste=ModelePDFPropales::liste_modeles($db);
- print $html->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF);
+ print $form->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF);
print "</td></tr>";
// Project
@@ -284,7 +284,7 @@ if ($_GET["action"] == 'create')
$liste_propal[$row[0]]=$propalRefAndSocName;
$i++;
}
- print $html->selectarray("copie_propal",$liste_propal, 0);
+ print $form->selectarray("copie_propal",$liste_propal, 0);
}
else
{
@@ -316,9 +316,9 @@ if ($_GET["action"] == 'create')
print '<tr><td>';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
- $html->select_produits('',"idprod".$i,'',$conf->product->limit_size,$soc->price_level);
+ $form->select_produits('',"idprod".$i,'',$conf->product->limit_size,$soc->price_level);
else
- $html->select_produits('',"idprod".$i,'',$conf->product->limit_size);
+ $form->select_produits('',"idprod".$i,'',$conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="2" name="remise'.$i.'" value="'.$soc->remise_client.'">%</td>';
diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index f3a04d23eb22bafada0f08f1443e2ad6d9304621..c05429e453651efb8a4931834d467b2738771eff 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -428,8 +428,8 @@ else
// Confirmation delete
if ($_GET["action"] == 'delete')
{
- $html = new Form($db);
- $ret=$html->form_confirm($_SERVER['PHP_SELF']."?socid=".$address->socid."&id=".$_GET["id"],$langs->trans("DeleteAddress"),$langs->trans("ConfirmDeleteAddress"),"confirm_delete");
+ $form = new Form($db);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF']."?socid=".$address->socid."&id=".$_GET["id"],$langs->trans("DeleteAddress"),$langs->trans("ConfirmDeleteAddress"),"confirm_delete");
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index f310d23ca193223875c6ffcbf87fc618a9d353cb..9355bb0d491a122c345f5af7cf76313e2f817222 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -294,7 +294,7 @@ if ($socid > 0)
// Conditions de reglement par defaut
$langs->load('bills');
- $html = new Form($db);
+ $form = new Form($db);
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('PaymentConditions');
@@ -304,11 +304,11 @@ if ($socid > 0)
print '</td><td colspan="3">';
if ($_GET['action'] == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->cond_reglement,'cond_reglement_id',-1,1);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->cond_reglement,'cond_reglement_id',-1,1);
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->cond_reglement,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->cond_reglement,'none');
}
print "</td>";
print '</tr>';
@@ -323,11 +323,11 @@ if ($socid > 0)
print '</td><td colspan="3">';
if ($_GET['action'] == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->mode_reglement,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->mode_reglement,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->mode_reglement,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$objsoc->id,$objsoc->mode_reglement,'none');
}
print "</td>";
print '</tr>';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 234ffddbfcd344a6be582c98e272fe769fe9e036..b220e311ed78c553475ca18db1fe3f6efcc4ee77 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -78,7 +78,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'del_bookmark')
$now=dol_now();
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$companystatic=new Societe($db);
if ($conf->propal->enabled) $propalstatic=new Propal($db);
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 8b4516bfd638a729b6fc4d8818f7d942b84c68aa..b4d9aa44d4dcd8d09b0b595a68a38791c56bc0e7 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -158,7 +158,7 @@ if ($_POST["button_removefilter"])
llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing');
-$html = new Form($db);
+$form = new Form($db);
$mil = new Mailing($db);
@@ -173,7 +173,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($mil,'id');
+ print $form->showrefnav($mil,'id');
print '</td></tr>';
print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$mil->titre.'</td></tr>';
@@ -195,7 +195,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
{
$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $html->textwithpicto($nbemail,$text,1,'warning');
+ print $form->textwithpicto($nbemail,$text,1,'warning');
}
else
{
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 6628b385e9a05c4a953e46a2a028138170d32956..b1f625a34753c79513a605cee84e7fb8d369283c 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -596,7 +596,7 @@ if (! empty($_POST["cancel"]))
$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
llxHeader('',$langs->trans("Mailing"),$help_url);
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$mil = new Mailing($db);
@@ -658,21 +658,21 @@ else
// Confirmation de la validation du mailing
if ($_GET["action"] == 'valid')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("ValidMailing"),$langs->trans("ConfirmValidMailing"),"confirm_valid",'','',1);
if ($ret == 'html') print '<br>';
}
// Confirm reset
if ($_GET["action"] == 'reset')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$mil->ref),"confirm_reset",'','',2);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("ResetMailing"),$langs->trans("ConfirmResetMailing",$mil->ref),"confirm_reset",'','',2);
if ($ret == 'html') print '<br>';
}
// Confirm delete
if ($_GET["action"] == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$mil->id,$langs->trans("DeleteAMailing"),$langs->trans("ConfirmDeleteMailing"),"confirm_delete",'','',1);
if ($ret == 'html') print '<br>';
}
@@ -709,7 +709,7 @@ else
}
$text.=$langs->trans('ConfirmSendingEmailing').'<br>';
$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$_REQUEST['id'],$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,260);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$_REQUEST['id'],$langs->trans('SendMailing'),$text,'sendallconfirmed',$formquestion,'',1,260);
if ($ret == 'html') print '<br>';
}
}
@@ -718,22 +718,22 @@ else
print '<tr><td width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($mil,'id');
+ print $form->showrefnav($mil,'id');
print '</td></tr>';
// Description
- print '<tr><td>'.$html->editfieldkey("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer).'</td><td colspan="3">';
- print $html->editfieldval("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer);
+ print '<tr><td>'.$form->editfieldkey("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer).'</td><td colspan="3">';
+ print $form->editfieldval("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer);
print '</td></tr>';
// From
- print '<tr><td>'.$html->editfieldkey("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').'</td><td colspan="3">';
- print $html->editfieldval("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
+ print '<tr><td>'.$form->editfieldkey("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').'</td><td colspan="3">';
+ print $form->editfieldval("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
print '</td></tr>';
// Errors to
- print '<tr><td>'.$html->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').'</td><td colspan="3">';
- print $html->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
+ print '<tr><td>'.$form->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').'</td><td colspan="3">';
+ print $form->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email');
print '</td></tr>';
// Status
@@ -749,12 +749,12 @@ else
if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
{
$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $html->textwithpicto($nbemail,$text,1,'warning');
+ print $form->textwithpicto($nbemail,$text,1,'warning');
}
else
{
$text=$langs->trans('NotEnoughPermissions');
- print $html->textwithpicto($nbemail,$text,1,'warning');
+ print $form->textwithpicto($nbemail,$text,1,'warning');
}
}
@@ -779,7 +779,7 @@ else
array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true)
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $html->form_confirm($_SERVER["PHP_SELF"].'?id='.$mil->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$mil->ref),'confirm_clone',$formquestion,'yes');
+ $form->form_confirm($_SERVER["PHP_SELF"].'?id='.$mil->id,$langs->trans('CloneEMailing'),$langs->trans('ConfirmCloneEMailing',$mil->ref),'confirm_clone',$formquestion,'yes');
print '<br>';
}
@@ -966,7 +966,7 @@ else
if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
{
$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $html->textwithpicto($nbemail,$text,1,'warning');
+ print $form->textwithpicto($nbemail,$text,1,'warning');
}
else
{
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 632120ac5ecebc0d65fa81500f187f01d0b306d2..685e88a16decdd1a6c77381bb15eb0a39fae9bb7 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -41,7 +41,7 @@ accessforbidden();
llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing');
-$html = new Form($db);
+$form = new Form($db);
$mil = new Mailing($db);
diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php
index c8a6954b4432ee75042e8d957947f1a83f26a64d..967d29035176fe8af4aa430e60418fc4b47fd40d 100644
--- a/htdocs/comm/mailing/liste.php
+++ b/htdocs/comm/mailing/liste.php
@@ -59,7 +59,7 @@ $filteremail=$_REQUEST["filteremail"]?$_REQUEST["filteremail"]:'';
llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing');
-$html = new Form($db);
+$form = new Form($db);
if ($filteremail)
{
@@ -158,7 +158,7 @@ if ($result)
if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
{
$text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $html->textwithpicto($nbemail,$text,1,'warning');
+ print $form->textwithpicto($nbemail,$text,1,'warning');
}
else
{
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 2cb0bafa50f23320a32da69edcf214dc22effc3d..833d7e804439740e6a0265cbdbd77e0301ab8150 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -987,7 +987,7 @@ if ($action == 'down' && $user->rights->propale->creer)
llxHeader('',$langs->trans('Proposal'),'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$companystatic=new Societe($db);
@@ -1023,10 +1023,10 @@ if ($id > 0 || ! empty($ref))
//'text' => $langs->trans("ConfirmClone"),
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
//array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
- array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $html->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
+ array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
}
/*
@@ -1034,7 +1034,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp'), 'confirm_delete','',0,1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp'), 'confirm_delete','',0,1);
}
/*
@@ -1042,7 +1042,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'ask_deleteline')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
}
/*
@@ -1077,7 +1077,7 @@ if ($id > 0 || ! empty($ref))
$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid);
}
- if (! $error) $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
+ if (! $error) $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
}
if (! $formconfirm)
@@ -1096,7 +1096,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Ref client
@@ -1149,7 +1149,7 @@ if ($id > 0 || ! empty($ref))
// Remise dispo de type non avoir
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
}
}
if ($absolute_creditnote)
@@ -1173,7 +1173,7 @@ if ($id > 0 || ! empty($ref))
print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate">';
- $html->select_date($object->date,'re','','',0,"editdate");
+ $form->select_date($object->date,'re','','',0,"editdate");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1218,7 +1218,7 @@ if ($id > 0 || ! empty($ref))
print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setecheance">';
- $html->select_date($object->fin_validite,'ech','','','',"editecheance");
+ $form->select_date($object->fin_validite,'ech','','','',"editecheance");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1247,11 +1247,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print '</td>';
print '</tr>';
@@ -1270,7 +1270,7 @@ if ($id > 0 || ! empty($ref))
print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">';
- $html->select_date($object->date_livraison,'liv_','','','',"editdate_livraison");
+ $form->select_date($object->date_livraison,'liv_','','','',"editdate_livraison");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1295,11 +1295,11 @@ if ($id > 0 || ! empty($ref))
if ($action == 'editdelivery_address')
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'fk_address','propal',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'fk_address','propal',$object->id);
}
else
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'none','propal',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid'),'none','propal',$object->id);
}
print '</td></tr>';
}
@@ -1315,11 +1315,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editavailability')
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
}
else
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
}
print '</td>';
@@ -1336,11 +1336,11 @@ if ($id > 0 || ! empty($ref))
//print $object->demand_reason_id;
if ($action == 'editdemandreason')
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
}
else
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
}
print '</td>';
@@ -1357,11 +1357,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -1379,11 +1379,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print '</td></tr>';
}
@@ -1837,7 +1837,7 @@ else
print '</td>';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre" align="right">';
- $html->select_propal_statut($viewstatut,1);
+ $form->select_propal_statut($viewstatut,1);
print '</td>';
print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '</td>';
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 0efde17b23c399e69c2584e7cbf64ae1694e6da0..59213b04692431a8e79b78c76001c0f25c6402e6 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'propale', $id, 'propal');
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 9ba449fee5c62db0b9bd5ff7ca0f2b4ab0c67487..b6fe67d41225a8ec29f3f6259fa5eb7b785cefd9 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -118,7 +118,7 @@ if ($action == 'deleteline' && $user->rights->propale->creer)
llxHeader('', $langs->trans("Proposal"), "Propal");
-$html = new Form($db);
+$form = new Form($db);
$formcompany= new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
- print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Ref client
@@ -222,7 +222,7 @@ if ($id > 0 || ! empty($ref))
print '<td>';
// On recupere les id des users deja selectionnes
//$userAlreadySelected = $propal->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($propal, '', 'type','internal');
@@ -252,7 +252,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td>';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 05860909553b09070ae7bbbfe904c99b31e2d6b0..93eb16b07621903361f0b4575b5622c08b12dbd0 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -120,7 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -149,7 +149,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Ref client
@@ -181,7 +181,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index bb577f66daa402f941bf1a01e81c000e460df475..ae58515b3a49429d1b57e7ac90ab639da95a505a 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -47,7 +47,7 @@ if ($user->societe_id > 0)
*/
$propalstatic=new Propal($db);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$help_url="EN:Module_Commercial_Proposals|FR:Module_Propositions_commerciales|ES:Módulo Presupuestos";
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 18fb187033d5cb72d8f49ff89c78a98b241e5e4f..646cdb413581f1874ae82bd9cc003e67870a008d 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -90,7 +90,7 @@ if ($_POST['action'] == 'update' && $user->rights->propale->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET["id"];
$ref= $_GET["ref"];
@@ -115,7 +115,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="3">';
- print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Ref client
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 20708e1520768b41c062edae3542cce5f3829a47..a76fd8c27863b545113e8bff2640d61210a4fe2a 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -52,7 +52,7 @@ $result=restrictedArea($user,'commande',$id,'');
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index ebfb90552e7a47b2bbfc8b759c18af0301b41cde..94dee98896b68aff396495096a5e0eff4109dab8 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -113,7 +113,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer)
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -149,7 +149,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print "</td></tr>";
// Ref commande client
@@ -214,7 +214,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
//$userAlreadySelected = $commande->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionne car on doit pouvoir le selectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($commande, '', 'type','internal');
@@ -244,7 +244,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 5c2e43f04316023f0374ba928de364a2cc0ad897..2853ae6b0c35281efe613abbce4bc858b49767f8 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -123,7 +123,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -150,7 +150,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print '</td></tr>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
@@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 146a44ac99153900cf1b54a9a8a4c21b2e47f0bb..845ba65506f983884e19f661891fe6f7c87985af 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1095,7 +1095,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$formorder = new FormOrder($db);
@@ -1201,7 +1201,7 @@ if ($action == 'create' && $user->rights->commande->creer)
* Contact de la commande
*/
print "<tr><td>".$langs->trans("DefaultContact").'</td><td colspan="2">';
- $html->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
+ $form->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
print '</td></tr>';
// Ligne info remises tiers
@@ -1217,7 +1217,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Date
print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
- $html->select_date('','re','','','',"crea_commande",1,1);
+ $form->select_date('','re','','','',"crea_commande",1,1);
print '</td></tr>';
// Date de livraison
@@ -1230,37 +1230,37 @@ if ($action == 'create' && $user->rights->commande->creer)
{
$datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
}
- $html->select_date($datedelivery,'liv_','','','',"crea_commande",1,1);
+ $form->select_date($datedelivery,'liv_','','','',"crea_commande",1,1);
print "</td></tr>";
// Delivery address
if ($conf->global->COMMANDE_ADD_DELIVERY_ADDRESS)
{
- // Link to edit: $html->form_address($_SERVER['PHP_SELF'].'?action=create','',$soc->id,'adresse_livraison_id','commande','');
+ // Link to edit: $form->form_address($_SERVER['PHP_SELF'].'?action=create','',$soc->id,'adresse_livraison_id','commande','');
print '<tr><td nowrap="nowrap">'.$langs->trans('DeliveryAddress').'</td><td colspan="2">';
- $numaddress = $html->select_address($soc->fk_delivery_address, $socid,'fk_address',1);
+ $numaddress = $form->select_address($soc->fk_delivery_address, $socid,'fk_address',1);
print ' <a href="../comm/address.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddAddress").'</a>';
print '</td></tr>';
}
// Conditions de reglement
print '<tr><td nowrap="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
- $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1);
+ $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id',-1,1);
print '</td></tr>';
// Mode de reglement
print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
- $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+ $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print '</td></tr>';
// Delivery delay
print '<tr><td>'.$langs->trans('AvailabilityPeriod').'</td><td colspan="2">';
- $html->select_availability($propal->availability,'availability_id','',1);
+ $form->select_availability($propal->availability,'availability_id','',1);
print '</td></tr>';
// What trigger creation
print '<tr><td>'.$langs->trans('Source').'</td><td colspan="2">';
- $html->select_demand_reason((GETPOST("origin")=='propal'?'SRC_COMM':''),'demand_reason_id','',1);
+ $form->select_demand_reason((GETPOST("origin")=='propal'?'SRC_COMM':''),'demand_reason_id','',1);
print '</td></tr>';
// Project
@@ -1287,7 +1287,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// pdf
include_once(DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php');
$liste=ModelePDFCommandes::liste_modeles($db);
- print $html->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF);
+ print $form->selectarray('model',$liste,$conf->global->COMMANDE_ADDON_PDF);
print "</td></tr>";
// Note publique
@@ -1366,9 +1366,9 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<tr><td>';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
- print $html->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
+ print $form->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
else
- print $html->select_produits('','idprod'.$i,'',$conf->product->limit_size);
+ print $form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="'.$soc->remise_client.'">%</td></tr>';
@@ -1435,7 +1435,7 @@ else
*/
if ($action == 'delete')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
}
/*
@@ -1473,7 +1473,7 @@ else
array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)));
}
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1);
}
/*
@@ -1481,7 +1481,7 @@ else
*/
if ($action == 'close')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_close', '', 0, 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_close', '', 0, 1);
}
/*
@@ -1489,7 +1489,7 @@ else
*/
if ($action == 'cancel')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $langs->trans('ConfirmCancelOrder'), 'confirm_cancel', '', 0, 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $langs->trans('ConfirmCancelOrder'), 'confirm_cancel', '', 0, 1);
}
/*
@@ -1497,7 +1497,7 @@ else
*/
if ($action == 'ask_deleteline')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
}
// Clone confirmation
@@ -1508,10 +1508,10 @@ else
//'text' => $langs->trans("ConfirmClone"),
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
//array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
- array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $html->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
+ array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
}
if (! $formconfirm)
@@ -1541,7 +1541,7 @@ else
// Ref
print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
@@ -1595,7 +1595,7 @@ else
// Remise dispo de type non avoir
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
}
}
if ($absolute_creditnote)
@@ -1619,7 +1619,7 @@ else
print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate">';
- $html->select_date($object->date,'order_','','','',"setdate");
+ $form->select_date($object->date,'order_','','','',"setdate");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1644,7 +1644,7 @@ else
print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">';
- $html->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
+ $form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1672,11 +1672,11 @@ else
if ($action == 'editdelivery_adress')
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'fk_address','commande',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'fk_address','commande',$object->id);
}
else
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'none','commande',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$socid,'none','commande',$object->id);
}
print '</td></tr>';
}
@@ -1691,11 +1691,11 @@ else
print '</td><td colspan="2">';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id',1);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id',1);
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none',1);
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none',1);
}
print '</td>';
@@ -1711,11 +1711,11 @@ else
print '</td><td colspan="2">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -1729,11 +1729,11 @@ else
print '</td><td colspan="2">';
if ($action == 'editavailability')
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
}
else
{
- $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
+ $form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
}
print '</td></tr>';
@@ -1747,11 +1747,11 @@ else
print '</td><td colspan="2">';
if ($_GET['action'] == 'editdemandreason')
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
}
else
{
- $html->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
+ $form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
}
// Removed because using dictionnary is an admin feature, not a user feature. Ther is already the "star" to show info to admin users.
// This is to avoid too heavy screens and have an uniform look and feel for all screens.
@@ -1773,11 +1773,11 @@ else
//print "$object->id, $object->socid, $object->fk_project";
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print '</td></tr>';
}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 3c3b8a0d70931abafe57f3b3a8567abbc716bd26..2a3c6d911752f4cc9c47e0418e5974d07a039e07 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -47,7 +47,7 @@ if ($user->societe_id > 0)
*/
$commandestatic=new Commande($db);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo Pedidos de clientes";
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index c4a1a6af40c050b6b9096c2946551330c4b1bab4..054499be00132bea318942f19191e782a6b4356a 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -69,7 +69,7 @@ $viewstatut=GETPOST('viewstatut');
$now=dol_now();
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$companystatic = new Societe($db);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index dfd1be920184bb1491af71848c8fe3bddf1057e1..17d71af6cb7674a59cc7b728273a81f42e6f4d3c 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -81,7 +81,7 @@ if ($_POST["action"] == 'update' && $user->rights->commande->creer)
llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="18%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print "</td></tr>";
// Ref commande client
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 8f4c72389f13727c0c2885ffa8488012d327aa23..c3e37e57a2100ad52fb47e391456555b5ae5316c 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -129,7 +129,7 @@ $paymentstatic=new Paiement($db);
$paymentsupplierstatic=new PaiementFourn($db);
$paymentvatstatic=new TVA($db);
-$html = new Form($db);
+$form = new Form($db);
if ($account || $_GET["ref"])
{
@@ -271,7 +271,7 @@ if ($account || $_GET["ref"])
// Ref
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print '</td></tr>';
// Label
@@ -316,7 +316,7 @@ if ($account || $_GET["ref"])
if ($action == 'delete')
{
$text=$langs->trans('ConfirmDeleteTransaction');
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
if ($ret == 'html') print '<br>';
}
@@ -354,10 +354,10 @@ if ($account || $_GET["ref"])
print '<tr '.$bc[false].'>';
print '<td nowrap="nowrap" colspan="2">';
- $html->select_date($dateop,'op',0,0,0,'transaction');
+ $form->select_date($dateop,'op',0,0,0,'transaction');
print '</td>';
print '<td nowrap="nowrap">';
- $html->select_types_paiements((isset($_POST["operation"])?$_POST["operation"]:''),'operation','1,2',2,1);
+ $form->select_types_paiements((isset($_POST["operation"])?$_POST["operation"]:''),'operation','1,2',2,1);
print '</td><td>';
print '<input name="num_chq" class="flat" type="text" size="4" value="'.(isset($_POST["num_chq"])?$_POST["num_chq"]:'').'"></td>';
print '<td colspan="2">';
@@ -409,7 +409,7 @@ if ($account || $_GET["ref"])
print '<td>';
//$filtertype=array('TIP'=>'TIP','PRE'=>'PRE',...)
$filtertype='';
- print $html->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8);
+ print $form->select_types_paiements($_REQUEST['paiementtype'],'paiementtype',$filtertype,2,1,1,8);
print '</td>';
print '<td><input type="text" class="flat" name="req_nb" value="'.$req_nb.'" size="2"></td>';
print '<td><input type="text" class="flat" name="req_desc" value="'.$_REQUEST["req_desc"].'" size="24"></td>';
@@ -475,8 +475,8 @@ if ($account || $_GET["ref"])
$now=dol_now();
$nows=dol_print_date($now,'%Y%m%d');
- //$html->load_cache_types_paiements();
- //$html->cache_types_paiements
+ //$form->load_cache_types_paiements();
+ //$form->cache_types_paiements
$var=true;
diff --git a/htdocs/compta/bank/admin/bank.php b/htdocs/compta/bank/admin/bank.php
index 0802a931d706f531fd2c939e0f7fc9ad43d4891f..e9c205f27761ab71898b3767da643ad657aaeb37 100644
--- a/htdocs/compta/bank/admin/bank.php
+++ b/htdocs/compta/bank/admin/bank.php
@@ -80,7 +80,7 @@ if ($action == 'setbankorder')
llxHeader("",$langs->trans("BankSetupModule"));
-$html=new Form($db);
+$form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup');
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index c7f9af67970e4f19fa2dd01351a5e6a23a804a42..2ba2d61417ca73b56c620300d331f5a09bec8509 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -191,7 +191,7 @@ $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("Se
llxHeader();
$form = new Form($db);
-$htmlcompany = new FormCompany($db);
+$formcompany = new FormCompany($db);
/* ************************************************************************** */
/* */
@@ -273,7 +273,7 @@ if ($action == 'create')
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
if ($selectedcode)
{
- $htmlcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:'',$selectedcode,'account_departement_id');
+ $formcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:'',$selectedcode,'account_departement_id');
}
else
{
@@ -544,7 +544,7 @@ else
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
if ($selectedcode)
{
- $htmlcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:$account->fk_departement,$selectedcode,'account_departement_id');
+ $formcompany->select_departement(isset($_POST["account_departement_id"])?$_POST["account_departement_id"]:$account->fk_departement,$selectedcode,'account_departement_id');
}
else
{
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 9f500eea3832551f84c0aeaf5048a2d543a341c8..0f0e16af275e687f2632bc9045516fe25507f447 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -42,7 +42,7 @@ $orig_account=GETPOST("orig_account");
$accountid=GETPOST('accountid');
$confirm=GETPOST('confirm');
-$html = new Form($db);
+$form = new Form($db);
/*
* Actions
@@ -244,7 +244,7 @@ if ($result)
// Confirmations
if ($action == 'delete_categ')
{
- $ret=$html->form_confirm("ligne.php?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
+ $ret=$form->form_confirm("ligne.php?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
if ($ret == 'html') print '<br>';
}
@@ -259,7 +259,7 @@ if ($result)
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref")."</td>";
print '<td colspan="4">';
- print $html->showrefnav($bankline,'rowid','',1,'rowid','rowid');
+ print $form->showrefnav($bankline,'rowid','',1,'rowid','rowid');
print '</td>';
print '</tr>';
@@ -350,7 +350,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '<td colspan="3">';
- print $html->select_types_paiements($objp->fk_type,"value",'',2);
+ print $form->select_types_paiements($objp->fk_type,"value",'',2);
print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
if ($objp->receiptid)
{
@@ -404,7 +404,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '<td colspan="3">';
- print $html->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
+ print $form->select_date($db->jdate($objp->do),'dateo','','','','update',1,0,1,$objp->rappro);
print '</td>';
}
else
@@ -420,7 +420,7 @@ if ($result)
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
print '<td colspan="3">';
- print $html->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
+ print $form->select_date($db->jdate($objp->dv),'datev','','','','update',1,0,1,$objp->rappro);
if (! $objp->rappro)
{
print ' ';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 0db2c4ec81611281444ccb5f57cf54569a089e5f..c36cfb0fd40c95802ee5d5c093116c1ead1f17ab 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -70,7 +70,7 @@ $pagenext = $page + 1;
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
// Load account
@@ -113,7 +113,7 @@ if (! isset($_GET["num"]))
// Ref
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print '</td></tr>';
// Label
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 528111982e09cebddf370e06af1e2970280e8982..a5e8743de4c9e005e9059514e2603a5fd88c66ed 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -68,7 +68,7 @@ $bankaccountstatic=new Account($db);
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($vline) $viewline = $vline;
else $viewline = 50;
@@ -168,7 +168,7 @@ if ($resql)
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>';
print '<td class="liste_titre" align="center">';
- $html->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
+ $form->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
print '</td>';
print '<td class="liste_titre"><input type="text" class="flat" name="req_nb" value="'.GETPOST("req_nb").'" size="2"></td>';
print '<td class="liste_titre">';
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 6a6a1580f64b6bef61c47d7ae6a5cb4d1f617b1b..0d924bbc0d532b8f71438609e670afcf9fc01d64 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -61,7 +61,7 @@ $facturestatic=new Facture($db);
$facturefournstatic=new FactureFournisseur($db);
$socialcontribstatic=new ChargeSociales($db);
-$html = new Form($db);
+$form = new Form($db);
if ($_REQUEST["account"] || $_REQUEST["ref"])
{
@@ -99,7 +99,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Ref
print '<tr><td valign="top" width="25%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($acct,'ref','',1,'ref');
+ print $form->showrefnav($acct,'ref','',1,'ref');
print '</td></tr>';
// Label
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 8c6fc905e30c903d6b4b1de473f4d8de9cb54824..ed05f6e067b38b2c05a6e9b6a50ca1634f3030cd 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -131,7 +131,7 @@ if ($_POST["action"] == 'add')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
print_fiche_titre($langs->trans("BankTransfer"));
@@ -153,15 +153,15 @@ print '</tr>';
$var=false;
print '<tr '.$bc[$var].'><td>';
-print $html->select_comptes($_POST['account_from'],'account_from',0,'',1);
+print $form->select_comptes($_POST['account_from'],'account_from',0,'',1);
print "</td>";
print "<td>\n";
-print $html->select_comptes($_POST['account_to'],'account_to',0,'',1);
+print $form->select_comptes($_POST['account_to'],'account_to',0,'',1);
print "</td>\n";
print "<td>";
-$html->select_date($dateo,'','','','','add');
+$form->select_date($dateo,'','','','','add');
print "</td>\n";
print '<td><input name="label" class="flat" type="text" size="40" value="'.$_POST["label"].'"></td>';
print '<td><input name="amount" class="flat" type="text" size="8" value="'.$_POST["amount"].'"></td>';
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 0051d74f56a4b2c5ff6e238a1541b9980555f268..4b41aabd622b135b27e1079cc4903e064d27fa5c 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -244,9 +244,9 @@ if ($_REQUEST['action'] == 'builddoc')
llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones');
-$html=new Form($db);
+$form=new Form($db);
$formfile = new FormFile($db);
-$htmlcompany = new FormCompany($db);
+$formcompany = new FormCompany($db);
/* ************************************************************************** */
@@ -272,7 +272,7 @@ if ($_GET["action"] == 'create')
// Date
print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
- $html->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
+ $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1);
print '</td>';
print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
@@ -283,7 +283,7 @@ if ($_GET["action"] == 'create')
print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.$_POST["amount"].'" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
- print $html->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+ print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.$_POST["societe"].'" size="40"></td></tr>';
@@ -294,16 +294,16 @@ if ($_GET["action"] == 'create')
// Zip / Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" value="'.$_POST["pays"].'" size="40"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.$_POST["email"].'" size="40"></td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
- $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
+ $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
print "</td></tr>\n";
if ($conf->projet->enabled)
@@ -357,7 +357,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
// Date
print "<tr>".'<td width="25%" class="fieldrequired">'.$langs->trans("Date").'</td><td>';
- $html->select_date($don->date,'','','','',"update");
+ $form->select_date($don->date,'','','','',"update");
print '</td>';
print '<td rowspan="'.$nbrows.'" valign="top">'.$langs->trans("Comments").' :<br>';
@@ -368,7 +368,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
- print $html->selectyesno("public",1,1);
+ print $form->selectyesno("public",1,1);
print "</td>";
print "</tr>\n";
@@ -381,16 +381,16 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
// Zip / Town
print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
- print $htmlcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
+ print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectpays_id','departement_id'),6);
print ' ';
- print $htmlcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
+ print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectpays_id','departement_id'));
print '</tr>';
print "<tr>".'<td>'.$langs->trans("Country").'</td><td><input type="text" name="pays" size="40" value="'.$don->pays.'"></td></tr>';
print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" size="40" value="'.$don->email.'"></td></tr>';
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
- $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
+ $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1);
print "</td></tr>\n";
print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$don->getLibStatut(4).'</td></tr>';
@@ -443,7 +443,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
// Ref
print "<tr>".'<td>'.$langs->trans("Ref").'</td><td colspan="2">';
- print $html->showrefnav($don,'rowid','',1,'rowid','ref','');
+ print $form->showrefnav($don,'rowid','',1,'rowid','ref','');
print '</td>';
print '</tr>';
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 25cd3a251f503d6ef5f72f3a7ce3288a0073bd71..37ce3d68ad7dbe658de12ced271eafafc911e0bc 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1421,7 +1421,7 @@ if (GETPOST('action') == 'builddoc') // En get ou en post
llxHeader('',$langs->trans('Bill'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$now=dol_now();
@@ -1603,7 +1603,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="0"'.(GETPOST('type')==0?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -1611,7 +1611,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -1621,7 +1621,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="4"'.(GETPOST('type')==4?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
print $desc;
print '</td></tr>'."\n";
}
@@ -1646,7 +1646,7 @@ if ($action == 'create')
$text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
}
$text.='</select>';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -1671,7 +1671,7 @@ if ($action == 'create')
$text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
}
$text.='</select>';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
//.' ('.$langs->trans("FeatureNotYetAvailable").')',$langs->transnoentities("InvoiceAvoirDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -1694,17 +1694,17 @@ if ($action == 'create')
// Date invoice
print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
- $html->select_date($dateinvoice,'','','','',"add",1,1);
+ $form->select_date($dateinvoice,'','','','',"add",1,1);
print '</td></tr>';
// Payment term
print '<tr><td nowrap>'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
- $html->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
+ $form->select_conditions_paiements(isset($_POST['cond_reglement_id'])?$_POST['cond_reglement_id']:$cond_reglement_id,'cond_reglement_id');
print '</td></tr>';
// Payment mode
print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
- $html->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
+ $form->select_types_paiements(isset($_POST['mode_reglement_id'])?$_POST['mode_reglement_id']:$mode_reglement_id,'mode_reglement_id');
print '</td></tr>';
// Project
@@ -1725,7 +1725,7 @@ if ($action == 'create')
print '<td>';
include_once(DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php');
$liste=ModelePDFFactures::liste_modeles($db);
- print $html->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
+ print $form->selectarray('model',$liste,$conf->global->FACTURE_ADDON_PDF);
print "</td></tr>";
// Public note
@@ -1816,9 +1816,9 @@ if ($action == 'create')
print '<td>';
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
- $html->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
+ $form->select_produits('','idprod'.$i,'',$conf->product->limit_size,$soc->price_level);
else
- $html->select_produits('','idprod'.$i,'',$conf->product->limit_size);
+ $form->select_produits('','idprod'.$i,'',$conf->product->limit_size);
print '</td>';
print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
print '<td nowrap="nowrap"><input type="text" size="1" name="remise_percent'.$i.'" value="'.$soc->remise_client.'">%</td>';
@@ -1831,12 +1831,12 @@ if ($action == 'create')
print '<td class="nobordernopadding" nowrap="nowrap">';
print $langs->trans('From').' ';
print '</td><td class="nobordernopadding" nowrap="nowrap">';
- print $html->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add");
print '</td></tr>';
print '<td class="nobordernopadding" nowrap="nowrap">';
print $langs->trans('to').' ';
print '</td><td class="nobordernopadding" nowrap="nowrap">';
- print $html->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
+ print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add");
print '</td></tr></table>';
print '</td>';
}
@@ -1926,14 +1926,14 @@ else
if ($action == 'converttoreduc')
{
$text=$langs->trans('ConfirmConvertToReduc');
- $formconfirm=$html->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('ConvertToReduc'),$text,'confirm_converttoreduc','',"yes",2);
+ $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('ConvertToReduc'),$text,'confirm_converttoreduc','',"yes",2);
}
// Confirmation to delete invoice
if ($action == 'delete')
{
$text=$langs->trans('ConfirmDeleteBill');
- $formconfirm=$html->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('DeleteBill'),$text,'confirm_delete','',0,1);
+ $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('DeleteBill'),$text,'confirm_delete','',0,1);
}
// Confirmation de la validation
@@ -1966,13 +1966,13 @@ else
$text.=$notify->confirmMessage('NOTIFY_VAL_FAC',$object->socid);
}
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ValidateBill'),$text,'confirm_valid','',"yes",($conf->notification->enabled?0:2));
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ValidateBill'),$text,'confirm_valid','',"yes",($conf->notification->enabled?0:2));
}
// Confirmation du classement paye
if ($action == 'paid' && $resteapayer <= 0)
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ClassifyPaid'),$langs->trans('ConfirmClassifyPaidBill',$object->ref),'confirm_paid','',"yes",1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ClassifyPaid'),$langs->trans('ConfirmClassifyPaidBill',$object->ref),'confirm_paid','',"yes",1);
}
if ($action == 'paid' && $resteapayer > 0)
{
@@ -1986,8 +1986,8 @@ else
$close[$i]['label']=$langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");$i++;
// Texte
$i=0;
- $close[$i]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++;
- $close[$i]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++;
+ $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++;
+ $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++;
// arrayreasons[code]=reason
foreach($close as $key => $val)
{
@@ -2001,7 +2001,7 @@ else
array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'size' => '100')
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ClassifyPaid'),$langs->trans('ConfirmClassifyPaidPartially',$object->ref),'confirm_paid_partially',$formquestion,"yes");
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ClassifyPaid'),$langs->trans('ConfirmClassifyPaidPartially',$object->ref),'confirm_paid_partially',$formquestion,"yes");
}
// Confirmation du classement abandonne
@@ -2028,8 +2028,8 @@ else
$close[1]['label']=$langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
$close[2]['label']=$langs->trans("ConfirmClassifyAbandonReasonOtherDesc");
// Texte
- $close[1]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$object->ref),$close[1]['label'],1);
- $close[2]['reason']=$html->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"),$close[2]['label'],1);
+ $close[1]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$object->ref),$close[1]['label'],1);
+ $close[2]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyAbandonReasonOther"),$close[2]['label'],1);
// arrayreasons
$arrayreasons[$close[1]['code']]=$close[1]['reason'];
$arrayreasons[$close[2]['code']]=$close[2]['reason'];
@@ -2041,14 +2041,14 @@ else
array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'size' => '100')
);
- $formconfirm=$html->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('CancelBill'),$langs->trans('ConfirmCancelBill',$object->ref),'confirm_canceled',$formquestion,"yes");
+ $formconfirm=$form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id,$langs->trans('CancelBill'),$langs->trans('ConfirmCancelBill',$object->ref),'confirm_canceled',$formquestion,"yes");
}
}
// Confirmation de la suppression d'une ligne produit
if ($action == 'ask_deleteline')
{
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
}
// Clone confirmation
@@ -2060,7 +2060,7 @@ else
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1)
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $formconfirm=$html->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes',1);
+ $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$object->ref),'confirm_clone',$formquestion,'yes',1);
}
if (! $formconfirm)
@@ -2091,7 +2091,7 @@ else
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
print '</td></tr>';
// Third party
@@ -2105,7 +2105,7 @@ else
print '</td><td colspan="5">';
if ($action == 'editthirdparty')
{
- $html->form_thirdparty($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,'socid');
+ $form->form_thirdparty($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,'socid');
}
else
{
@@ -2185,7 +2185,7 @@ else
{
$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie));
$text2=$langs->trans("AbsoluteDiscountUse");
- print $html->textwithpicto($text,$text2);
+ print $form->textwithpicto($text,$text2);
}
}
}
@@ -2194,7 +2194,7 @@ else
// Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' ('.$addabsolutediscount.')');
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' ('.$addabsolutediscount.')');
}
}
else
@@ -2214,7 +2214,7 @@ else
if ($object->statut == 0 && $object->type != 3)
{
$text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie));
- print $html->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
+ print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
}
else
{
@@ -2226,7 +2226,7 @@ else
// Remise dispo de type avoir
$filter='fk_facture_source IS NOT NULL';
if (! $absolute_discount) print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filter, $resteapayer);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filter, $resteapayer);
}
}
if (! $absolute_discount && ! $absolute_creditnote)
@@ -2257,7 +2257,7 @@ else
{
if ($action == 'editinvoicedate')
{
- $html->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date,'invoicedate');
+ $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date,'invoicedate');
}
else
{
@@ -2387,7 +2387,7 @@ else
if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'discount_vat')
{
print '<tr><td colspan="2" align="right" nowrap="1">';
- print $html->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
+ print $form->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1);
print '</td><td align="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td> </td></tr>';
$resteapayeraffiche=0;
}
@@ -2395,7 +2395,7 @@ else
if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'badcustomer')
{
print '<tr><td colspan="2" align="right" nowrap="1">';
- print $html->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1);
+ print $form->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1);
print '</td><td align="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td> </td></tr>';
//$resteapayeraffiche=0;
}
@@ -2403,7 +2403,7 @@ else
if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'product_returned')
{
print '<tr><td colspan="2" align="right" nowrap="1">';
- print $html->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1);
+ print $form->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1);
print '</td><td align="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td> </td></tr>';
$resteapayeraffiche=0;
}
@@ -2413,7 +2413,7 @@ else
print '<tr><td colspan="2" align="right" nowrap="1">';
$text=$langs->trans("HelpAbandonOther");
if ($object->close_note) $text.='<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
- print $html->textwithpicto($langs->trans("Abandoned").':',$text,-1);
+ print $form->textwithpicto($langs->trans("Abandoned").':',$text,-1);
print '</td><td align="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td> </td></tr>';
$resteapayeraffiche=0;
}
@@ -2452,7 +2452,7 @@ else
{
if ($action == 'editpaymentterm')
{
- $html->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm');
+ $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm');
}
else
{
@@ -2478,11 +2478,11 @@ else
{
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'none');
}
}
else
@@ -2501,11 +2501,11 @@ else
print '</td><td colspan="3">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -2561,11 +2561,11 @@ else
print '</td><td colspan="3">';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->socid,$object->fk_project,'none');
}
print '</td>';
print '</tr>';
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index bb0db249e391f4969bb73b5c94117d69dc086cf0..b8f76d5c24b0c90c64facdf6cb96f1b40022cf6e 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -50,7 +50,7 @@ $now=dol_now();
llxHeader('',$langs->trans("Bill"),'Facture');
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
@@ -162,7 +162,7 @@ if ($id > 0 || ! empty($ref))
{
$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie));
$text2=$langs->trans("AbsoluteDiscountUse");
- print $html->textwithpicto($text,$text2);
+ print $form->textwithpicto($text,$text2);
}
}
}
@@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref))
// Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' - '.$addabsolutediscount);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' - '.$addabsolutediscount);
}
}
else
@@ -191,7 +191,7 @@ if ($id > 0 || ! empty($ref))
if ($object->statut == 0 && $object->type != 3)
{
$text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie));
- print $html->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
+ print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
}
else
{
@@ -203,7 +203,7 @@ if ($id > 0 || ! empty($ref))
// Remise dispo de type avoir
$filter='fk_facture_source IS NOT NULL';
if (! $absolute_discount) print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filter, $resteapayer);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filter, $resteapayer);
}
}
if (! $absolute_discount && ! $absolute_creditnote)
@@ -238,7 +238,7 @@ if ($id > 0 || ! empty($ref))
{
if ($action == 'editpaymentterm')
{
- $html->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm');
+ $form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->date_lim_reglement,'paymentterm');
}
else
{
@@ -254,7 +254,7 @@ if ($id > 0 || ! empty($ref))
// Conditions reglement
print '<tr><td>'.$langs->trans("PaymentConditionsShort").'</td><td colspan="5">';
- $html->form_conditions_reglement($_SERVER["PHP_SELF"]."?facid=$object->id",$object->cond_reglement_id,"none");
+ $form->form_conditions_reglement($_SERVER["PHP_SELF"]."?facid=$object->id",$object->cond_reglement_id,"none");
print '</td>';
print '</td></tr>';
@@ -268,11 +268,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->mode_reglement_id,'none');
}
print '</td>';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index f826d45485819024648a41604741e96077282dd3..1787baa22084b19d18d8b2582bafa4fed6f30aca 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -112,7 +112,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->facture->creer)
llxHeader('', $langs->trans("Bill"), "Facture");
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -157,7 +157,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($facture,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($facture,'ref','',1,'facnumber','ref',$morehtmlref);
print '</td></tr>';
// Customer
@@ -209,7 +209,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
// Ge get ids of alreadey selected users
//$userAlreadySelected = $facture->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($facture, '', 'type','internal');
@@ -239,7 +239,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td>';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 14a47995a1bf4b41a2a50812289ae82f4d5c7213..17c0e3bdb8c5a8338551878bba87d1eb4ec1c9b5 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -124,7 +124,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET['facid']?$_GET['facid']:$_GET['id'];
$ref= $_GET['ref'];
@@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref);
print '</td></tr>';
// Company
@@ -184,7 +184,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?facid='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?facid='.$id.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index fe73d5f2bcc80163e9391207bfe826708e7e2c1d..e227ff8ae7fc82058e62910d9594d4fb9bd665fc 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -94,7 +94,7 @@ if ($_REQUEST["action"] == 'delete' && $user->rights->facture->supprimer)
llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-rec');
-$html = new Form($db);
+$form = new Form($db);
/*
* Create mode
@@ -135,11 +135,11 @@ if ($_GET["action"] == 'create')
print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->cond_reglement_id,'none');
print "</td></tr>";
print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$facture->id,$facture->mode_reglement_id,'none');
print "</td></tr>";
if ($conf->projet->enabled)
@@ -234,7 +234,7 @@ if ($_GET["action"] == 'create')
$text=$product_static->getNomUrl(1);
$text.= ' - '.$objp->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
@@ -353,7 +353,7 @@ else
print '<tr><td>'.$langs->trans("Customer").'</td>';
print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
print "<td>". $langs->trans("PaymentConditions") ." : ";
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
print "</td></tr>";
print "<tr><td>".$langs->trans("Author")."</td><td colspan=\"3\">".$author->getFullName($langs)."</td>";
@@ -368,7 +368,7 @@ else
}
print $langs->trans("PaymentMode") ." : ";
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
print "</td></tr>";
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
@@ -435,7 +435,7 @@ else
$text=$product_static->getNomUrl(1);
$text.= ' - '.$fac->lines[$i]->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($fac->lines[$i]->desc));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($fac->lines[$i]->date_start,$fac->lines[$i]->date_end);
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 8bfa5d7507216f3b7b6467e0cf11e420522ec63e..9641c2d2e59b80eb57f2785d07f9f8c25045ccbd 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -138,7 +138,7 @@ if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid");
llxHeader('',$title);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
?>
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 90b338b8ce68e4e0c6aa3810f5417722664d5b2a..ea22971c1bfefb4c2cbbc44b6d967bf876c0c1dc 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -91,7 +91,7 @@ if ($_POST["action"] == 'update' && $user->rights->facture->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET['facid'];
$ref= $_GET['ref'];
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
print '</td></tr>';
// Company
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index a6b603d6d7bee3915d2eb73a70b9cc5f2e5d1a72..8291b5ab37ebcf51a691e14ddde4f4746a4e0d92 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -90,7 +90,7 @@ $now=dol_now();
llxHeader('',$langs->trans("Bill"));
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
@@ -155,7 +155,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
dol_print_error('',$discount->error);
}
- print $html->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
+ print $form->showrefnav($fac,'ref','',1,'facnumber','ref',$morehtmlref);
print "</td></tr>";
// Third party
@@ -227,7 +227,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
$text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie));
$text2=$langs->trans("AbsoluteDiscountUse");
- print $html->textwithpicto($text,$text2);
+ print $form->textwithpicto($text,$text2);
}
}
}
@@ -236,7 +236,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
// Remise dispo de type non avoir
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$fac->id,0,'remise_id',$soc->id,$absolute_discount,$filter,$resteapayer);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$fac->id,0,'remise_id',$soc->id,$absolute_discount,$filter,$resteapayer);
}
}
if ($absolute_creditnote > 0)
@@ -247,7 +247,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
if ($fac->statut == 0 && $fac->type != 3)
{
$text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie));
- print $html->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
+ print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse"));
}
else print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'.';
}
@@ -256,7 +256,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
// Remise dispo de type avoir
$filter='fk_facture_source IS NOT NULL';
if (! $absolute_discount) print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$fac->id,0,'remise_id_for_payment',$soc->id,$absolute_creditnote,$filter,$resteapayer);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$fac->id,0,'remise_id_for_payment',$soc->id,$absolute_creditnote,$filter,$resteapayer);
}
}
if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
@@ -275,7 +275,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
if ($_GET['action'] == 'editinvoicedate')
{
- $html->form_date($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->date,'invoicedate');
+ $form->form_date($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->date,'invoicedate');
}
else
{
@@ -301,7 +301,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
if ($_GET['action'] == 'editpaymentterm')
{
- $html->form_date($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->date_lim_reglement,'paymentterm');
+ $form->form_date($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->date_lim_reglement,'paymentterm');
}
else
{
@@ -327,11 +327,11 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
if ($_GET['action'] == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->cond_reglement_id,'none');
}
}
else
@@ -350,11 +350,11 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
print '</td><td colspan="3">';
if ($_GET['action'] == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->mode_reglement_id,'none');
}
print '</td></tr>';
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index b5652adf2a9762547b72a59344d236d94725bcfe..4166a4ab1306c217bd9e72c8f24603db07337bf6 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -87,7 +87,7 @@ $now=dol_now();
$facturestatic=new Facture($db);
$facturesupplierstatic=new FactureFournisseur($db);
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$thirdpartystatic = new Societe($db);
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index f48dda6de05ca245203c365e7ed763c71aa2abc3..621287c39e49475ddbbf6f4282486bf054879d40 100755
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -55,7 +55,7 @@ if ($user->societe_id > 0)
llxHeader('','','');
-$html=new Form($db);
+$form=new Form($db);
$year_current = strftime("%Y",dol_now());
$pastmonth = strftime("%m",dol_now()) - 1;
@@ -78,7 +78,7 @@ $nom=$langs->trans("PurchasesJournal");
//$nomlink=;
$builddate=time();
$description=$langs->trans("DescPurchasesJournal");
-$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS);
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 6d42ecbe1330b3af1d2cac685a9dfd5eb7db5d3a..3357078459c0429fe19402b8d57b555bdeabf599 100755
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -54,7 +54,7 @@ if ($user->societe_id > 0)
llxHeader('','','');
-$html=new Form($db);
+$form=new Form($db);
// Put here content of your page
// ...
@@ -80,7 +80,7 @@ $nom=$langs->trans("SellsJournal");
//$nomlink=;
$builddate=time();
$description=$langs->trans("DescSellsJournal");
-$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink);
$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_PAYS);
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 6f2bbae30295f3d4bf738b94ab6d31b89f2c24ca..4e2f110e0ce14c9b35dff2c6daed3c2bb0890c4b 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -83,7 +83,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* View
*/
-$html=new Form($db);
+$form=new Form($db);
$company_static=new Societe($db);
$morequerystring='';
@@ -105,7 +105,7 @@ $fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
if ($modetax==1) // Calculate on invoice for goods and services
{
$nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->pays_code);
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$description=$langs->trans("RulesVATDue");
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
@@ -122,7 +122,7 @@ if ($modetax==1) // Calculate on invoice for goods and services
if ($modetax==0) // Invoice for goods, payment for services
{
$nom=$langs->transcountry("LT2ReportByCustomersInInputOutputMode",$mysoc->pays_code);
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$description=$langs->trans("RulesVATIn");
if ($conf->global->MAIN_MODULE_COMPTABILITE) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch;
diff --git a/htdocs/compta/localtax/fiche.php b/htdocs/compta/localtax/fiche.php
index b27fe6f63b272a64c969686d141ec69fecbe0d34..585fd9057e5ed781946b7dc6676bed4d88448b02 100644
--- a/htdocs/compta/localtax/fiche.php
+++ b/htdocs/compta/localtax/fiche.php
@@ -127,7 +127,7 @@ if ($_GET["action"] == 'delete')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($id)
{
@@ -155,11 +155,11 @@ if ($_GET["action"] == 'create')
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
- print $html->select_date($datep,"datep",'','','','add');
+ print $form->select_date($datep,"datep",'','','','add');
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
- print $html->select_date($datev,"datev",'','','','add');
+ print $form->select_date($datev,"datev",'','','','add');
print '</td></tr>';
// Label
@@ -171,11 +171,11 @@ if ($_GET["action"] == 'create')
if ($conf->banque->enabled)
{
print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
- $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
+ $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
- $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
+ $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
print "</td>\n";
print "</tr>";
}
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index f929c9aa712d859749dff4ee6e127c1d27a88c74..6eaccc3fa33c506389b2bd9c5167591a29e0d123 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -208,7 +208,7 @@ if ($action == 'confirm_paiement' && $confirm == 'yes')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
@@ -355,7 +355,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
$datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0) : $datepayment);
- $html->select_date($datepayment,'','','',0,"add_paiement",1,1);
+ $form->select_date($datepayment,'','','',0,"add_paiement",1,1);
print '</td>';
print '<td>'.$langs->trans('Comments').'</td></tr>';
@@ -364,7 +364,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
// Payment mode
print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
- $html->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2);
+ $form->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2);
print "</td>\n";
print '<td rowspan="'.$rowspan.'" valign="top">';
print '<textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_4.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td>';
@@ -394,7 +394,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
print '<td>';
- $html->select_comptes($accountid,'accountid',0,'',2);
+ $form->select_comptes($accountid,'accountid',0,'',2);
print '</td>';
}
else
@@ -604,7 +604,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
}
- $html->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
+ $form->form_confirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
}
print "</form>\n";
diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php
index a2933c0959a8e5f0ced2c8a5b9422225340777dc..a67c000f748a31ea96d1bff2c3afbe3b9246cfc2 100644
--- a/htdocs/compta/paiement/cheque/fiche.php
+++ b/htdocs/compta/paiement/cheque/fiche.php
@@ -229,7 +229,7 @@ if (GETPOST('removefilter'))
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
@@ -269,7 +269,7 @@ else
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$remisecheque->id, $langs->trans("DeleteCheckReceipt"), $langs->trans("ConfirmDeleteCheckReceipt"), 'confirm_delete','','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$remisecheque->id, $langs->trans("DeleteCheckReceipt"), $langs->trans("ConfirmDeleteCheckReceipt"), 'confirm_delete','','',1);
if ($ret == 'html') print '<br>';
}
@@ -279,7 +279,7 @@ else
if ($action == 'valide')
{
$facid = $_GET['facid'];
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$remisecheque->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide','','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$remisecheque->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide','','',1);
if ($ret == 'html') print '<br>';
}
}
@@ -304,10 +304,10 @@ if ($action == 'new')
//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
// Filter
print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>';
- print $html->select_date($filterdate,'fd',0,0,1,'',1,1);
+ print $form->select_date($filterdate,'fd',0,0,1,'',1,1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
- print $html->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
+ print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1);
print '</td></tr>';
print '</table>';
print '<center>';
@@ -448,7 +448,7 @@ else
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="2" >';
- print $html->showrefnav($remisecheque,'ref',$linkback, 1, 'number');
+ print $form->showrefnav($remisecheque,'ref',$linkback, 1, 'number');
print "</td>";
print "</tr>\n";
@@ -466,7 +466,7 @@ else
print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate">';
- $html->select_date($object->date_bordereau,'datecreate_','','','',"setdate");
+ $form->select_date($object->date_bordereau,'datecreate_','','','',"setdate");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index b0b9dc690dfb241f66cabe2f3d7c309ce2a5d93f..ff20b8166acc93e5c613e2aa0f7a6d3e472afc64 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -174,7 +174,7 @@ if ($result <= 0)
exit;
}
-$html = new Form($db);
+$form = new Form($db);
$h=0;
@@ -195,7 +195,7 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"), 0, 'p
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
if ($ret == 'html') print '<br>';
}
@@ -205,7 +205,7 @@ if ($action == 'delete')
if ($action == 'valide')
{
$facid = $_GET['facid'];
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
if ($ret == 'html') print '<br>';
}
@@ -219,8 +219,8 @@ print '<table class="border" width="100%">';
print '<tr><td valign="top" width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$paiement->id.'</td></tr>';
// Date payment
-print '<tr><td valign="top">'.$html->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement).'</td><td colspan="3">';
-print $html->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement,'day');
+print '<tr><td valign="top">'.$form->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement).'</td><td colspan="3">';
+print $form->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement,'day');
print '</td></tr>';
// Payment type (VIR, LIQ, ...)
@@ -228,16 +228,16 @@ $labeltype=$langs->trans("PaymentType".$paiement->type_code)!=("PaymentType".$pa
print '<tr><td valign="top">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype.'</td></tr>';
// Payment numero
-print '<tr><td valign="top">'.$html->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
-print $html->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
+print '<tr><td valign="top">'.$form->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+print $form->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
print '</td></tr>';
// Amount
print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Note
-print '<tr><td valign="top">'.$html->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement).'</td><td colspan="3">';
-print $html->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement,'text');
+print '<tr><td valign="top">'.$form->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement).'</td><td colspan="3">';
+print $form->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement,'text');
print '</td></tr>';
// Bank account
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index a39bb7b9cb111ddce77d59e3a0fed956c79d1c74..2e3d9df41dd8fdf4f439a90b1b1128375c9992e7 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -149,7 +149,7 @@ if ($_POST["action"] == 'add_payment')
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Formulaire de creation d'un paiement de charge
@@ -207,12 +207,12 @@ if ($_GET["action"] == 'create')
print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0;
- $html->select_date($datepayment,'','','','',"add_payment",1,1);
+ $form->select_date($datepayment,'','','','',"add_payment",1,1);
print "</td>";
print '<td>'.$langs->trans("Comments").'</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
- $html->select_types_paiements(isset($_POST["paiementtype"])?$_POST["paiementtype"]:$charge->paiementtype, "paiementtype");
+ $form->select_types_paiements(isset($_POST["paiementtype"])?$_POST["paiementtype"]:$charge->paiementtype, "paiementtype");
print "</td>\n";
print '<td rowspan="3" valign="top"><textarea name="comment" wrap="soft" cols="40" rows="'.ROWS_3.'"></textarea></td></tr>';
@@ -220,7 +220,7 @@ if ($_GET["action"] == 'create')
print '<tr>';
print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
print '<td>';
- $html->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
+ $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list
print '</td></tr>';
print '<tr><td>'.$langs->trans('Numero');
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 577fe00342b5bf83e78f2c2f74ceea626500c5f7..6c4a53fbb5154f3df09f390f589349375dc82a78 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -124,7 +124,7 @@ if ($result <= 0)
exit;
}
-$html = new Form($db);
+$form = new Form($db);
$h=0;
@@ -146,7 +146,7 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribution"), 0,
*/
if ($_GET['action'] == 'delete')
{
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2);
if ($ret == 'html') print '<br>';
}
@@ -156,7 +156,7 @@ if ($_GET['action'] == 'delete')
if ($_GET['action'] == 'valide')
{
$facid = $_GET['facid'];
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
if ($ret == 'html') print '<br>';
}
@@ -169,7 +169,7 @@ print '<table class="border" width="100%">';
// Ref
print '<tr><td valign="top" width="140">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
-print $html->showrefnav($paiement,'id','',1,'rowid','id');
+print $form->showrefnav($paiement,'id','',1,'rowid','id');
print '</td></tr>';
// Date
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index c9d27ba934688b538359a36c02b557e7101ceb4e..67d7baee6efeca736b623ad019c603ad68fdd648 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -41,7 +41,7 @@ $result = restrictedArea($user, 'prelevement', $id);
llxHeader('','Bon de prelevement');
-$html = new Form($db);
+$form = new Form($db);
if ($id > 0 || ! empty($ref))
{
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index abe3798fc6ad9322d4b2ca02cc50058dea2f4a43..4b76e9c3a02d88354efece46031c47fcb6dea0ea 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -110,7 +110,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
llxHeader('',$langs->trans("WithdrawalReceipt"));
-$html = new Form($db);
+$form = new Form($db);
if ($id)
{
@@ -128,7 +128,7 @@ if ($id)
if ($action == 'credite')
{
- $ret=$html->form_confirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
+ $ret=$form->form_confirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
if ($ret == 'html') print '<br>';
}
@@ -181,10 +181,10 @@ if ($id)
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
- print $html->select_date('','','','','',"userfile");
+ print $form->select_date('','','','','',"userfile");
print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
- print $html->selectarray("methode",$bon->methodes_trans);
+ print $form->selectarray("methode",$bon->methodes_trans);
print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
@@ -204,7 +204,7 @@ if ($id)
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
- print $html->select_date('','','','','',"infocredit");
+ print $form->select_date('','','','','',"infocredit");
print '</td></tr>';
print '</table><br>';
print '<center><input type="submit" class="button" value="'.$langs->trans("ClassCredited").'">';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 7dec4ce5f60b33dd3d6febe3fb13004da163864d..0914abbdc65e846bf0d1d99f1e262b5c505fe9f8 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -151,7 +151,7 @@ if ($id)
if ($action == 'rejet' && $user->rights->prelevement->bons->credit)
{
- $html = new Form($db);
+ $form = new Form($db);
$soc = new Societe($db);
$soc->fetch($lipre->socid);
@@ -169,25 +169,25 @@ if ($id)
//Select yes/no
print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?</td>';
print '<td colspan="2" class="valid">';
- print $html->selectyesno("confirm",1,0);
+ print $form->selectyesno("confirm",1,0);
print '</td></tr>';
//Date
print '<tr><td class="valid">'.$langs->trans("RefusedData").'</td>';
print '<td colspan="2" class="valid">';
- print $html->select_date('','','','','',"confirm_rejet");
+ print $form->select_date('','','','','',"confirm_rejet");
print '</td></tr>';
//Reason
print '<tr><td class="valid">'.$langs->trans("RefusedReason").'</td>';
print '<td class="valid">';
- print $html->selectarray("motif", $rej->motifs);
+ print $form->selectarray("motif", $rej->motifs);
print '</td></tr>';
//Facturer
print '<tr><td class="valid">'.$langs->trans("RefusedInvoicing").'</td>';
print '<td class="valid" colspan="2">';
- print $html->selectarray("facturer", $rej->facturer);
+ print $form->selectarray("facturer", $rej->facturer);
print '</td></tr>';
print '</table><br>';
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 519ae0960d58f2e1e11a0b32c83f9bd1c26330e0..a379d7a57916f2d052fd891459f75dd5e76aa90e 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -110,7 +110,7 @@ $now=gmmktime();
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$societestatic=new Societe($db);
@@ -142,7 +142,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="25%">'.$langs->trans('Ref').'</td><td colspan="5">';
- print $html->showrefnav($object,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($object,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Ref client
@@ -216,11 +216,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print '</td>';
@@ -235,11 +235,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -257,11 +257,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print '</td></tr>';
}
@@ -385,7 +385,7 @@ if ($id > 0 || ! empty($ref))
$text=$product_static->getNomUrl(1);
$text.= ' - '.$objp->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($objp->date_start,$objp->date_end);
@@ -624,7 +624,7 @@ else
print '<input class="flat" type="text" size="10" name="search_montant_ht" value="'.$_GET['search_montant_ht'].'">';
print '</td>';
print '<td class="liste_titre" align="right">';
- $html->select_propal_statut($viewstatut);
+ $form->select_propal_statut($viewstatut);
print '</td>';
print '<td class="liste_titre" align="right"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '</td>';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 9d24bbe3c48c875b40fa1a38377bcd9953367464..8cc9a91858e79535627c0c5789dbe9d6d715f3e1 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -98,14 +98,14 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete de rapport
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("AnnualByCompaniesDueDebtMode");
$nom.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=RECETTES-DEPENSES">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
$description=$langs->trans("RulesResultDue");
$builddate=time();
@@ -114,8 +114,8 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("AnnualByCompaniesInputOutputMode");
$nom.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=CREANCES-DETTES">','</a>').')';
- //$period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',1,1,0,'',1,0,1);
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ //$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
$description=$langs->trans("RulesResultInOut");
$builddate=time();
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 35f3e1aedfed754a7f088cb377e8904350841be1..df660159417f7c53c0c6cf3abea103add3992547 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -55,7 +55,7 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index e173fb38739f1316e722cc245f1b4486c40a6cd1..565f5a933bdd3371b5ac10836b56e1c25e17bc50 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -169,7 +169,7 @@ if ($_GET["action"] == 'update' && ! $_POST["cancel"] && $user->rights->tax->cha
llxHeader('',$langs->trans("SocialContribution"));
-$html = new Form($db);
+$form = new Form($db);
// Mode creation
if ($_GET["action"] == 'create')
@@ -213,18 +213,18 @@ if ($_GET["action"] == 'create')
// Type
print '<td align="left">';
- $html->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1);
+ $form->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1);
print '</td>';
// Date end period
print '<td align="center">';
- print $html->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
+ print $form->select_date(! empty($dateperiod)?$dateperiod:'-1', 'period', 0, 0, 0, 'charge', 1);
print '</td>';
print '<td align="right"><input type="text" size="6" name="amount" class="flat"></td>';
print '<td align="center">';
- print $html->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
+ print $form->select_date(! empty($dateech)?$dateech:'-1', 'ech', 0, 0, 0, 'charge', 1);
print '</td>';
print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
@@ -264,13 +264,13 @@ if ($chid > 0)
if ($_GET["action"] == 'paid')
{
$text=$langs->trans('ConfirmPaySocialContribution');
- print $html->formconfirm($_SERVER["PHP_SELF"]."?id=".$cha->id,$langs->trans('PaySocialContribution'),$text,"confirm_paid",'','',2);
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$cha->id,$langs->trans('PaySocialContribution'),$text,"confirm_paid",'','',2);
}
if ($_GET['action'] == 'delete')
{
$text=$langs->trans('ConfirmDeleteSocialContribution');
- print $html->formconfirm($_SERVER['PHP_SELF'].'?id='.$cha->id,$langs->trans('DeleteSocialContribution'),$text,'confirm_delete','','',2);
+ print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$cha->id,$langs->trans('DeleteSocialContribution'),$text,'confirm_delete','','',2);
}
if ($_GET['action'] == 'edit')
@@ -283,7 +283,7 @@ if ($chid > 0)
// Ref
print "<tr><td>".$langs->trans("Ref").'</td><td colspan="2">';
- print $html->showrefnav($cha,'id');
+ print $form->showrefnav($cha,'id');
print "</td></tr>";
// Label
@@ -306,7 +306,7 @@ if ($chid > 0)
print "<td>";
if ($_GET['action'] == 'edit')
{
- print $html->select_date($cha->periode, 'period', 0, 0, 0, 'charge', 1);
+ print $form->select_date($cha->periode, 'period', 0, 0, 0, 'charge', 1);
}
else
{
@@ -382,7 +382,7 @@ if ($chid > 0)
if ($_GET['action'] == 'edit')
{
print '<tr><td>'.$langs->trans("DateDue")."</td><td>";
- print $html->select_date($cha->date_ech, 'ech', 0, 0, 0, 'charge', 1);
+ print $form->select_date($cha->date_ech, 'ech', 0, 0, 0, 'charge', 1);
print "</td></tr>";
}
else {
diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php
index ec0d62868586b997f26348cf152ed0025f585a9c..398e06e73d64c7537a53e6ccf16f8c56cbd2a377 100644
--- a/htdocs/compta/sociales/index.php
+++ b/htdocs/compta/sociales/index.php
@@ -68,7 +68,7 @@ else
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$sql = "SELECT s.rowid as id, s.fk_type as type, ";
@@ -155,7 +155,7 @@ if ($resql)
print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_label" value="'.GETPOST("search_label").'"></td>';
// Type
print '<td class="liste_titre" align="left">';
- $html->select_type_socialcontrib($typeid,'typeid',1,16,0);
+ $form->select_type_socialcontrib($typeid,'typeid',1,16,0);
print '</td>';
// Period end date
print '<td class="liste_titre"> </td>';
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index da20dd3a7cd0babf1690d2d3666fa6348f9bef18..c0f2a76c933b9f09bafbe727cfc8381aa65d7897 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -99,14 +99,14 @@ else
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$nom.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink="<a href='".$_SERVER["PHP_SELF"]."?year=".($year-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year+1)."&modecompta=".$modecompta."'>".img_next()."</a>";
$description=$langs->trans("RulesCADue");
$builddate=time();
@@ -115,7 +115,7 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice");
$nom.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink="<a href='".$_SERVER["PHP_SELF"]."?year=".($year-1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year+1)."&modecompta=".$modecompta."'>".img_next()."</a>";
$description=$langs->trans("RulesCAIn");
$builddate=time();
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 4fbdbd7eaeda75079a5f178cdeff5b0057c376fc..521045f151611a65f21fcff96b844c2311019501 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -102,14 +102,14 @@ else
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete de rapport
if ($modecompta=="CREANCES-DETTES")
{
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$nom.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=RECETTES-DEPENSES">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
$description=$langs->trans("RulesCADue");
$builddate=time();
@@ -118,7 +118,7 @@ if ($modecompta=="CREANCES-DETTES")
else {
$nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties");
$nom.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=CREANCES-DETTES">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
$description=$langs->trans("RulesCAIn");
$builddate=time();
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index a243cfedc34497a50f439e816a1ed6793ebcaae3..52c571298ce88536f7103344b8d74cb7c90312ca 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -54,7 +54,7 @@ if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
*/
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
// Affiche en-tete du rapport
if ($modecompta=="CREANCES-DETTES")
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 2a407140eb84767a28b5434e0613ed2f8a137d56..c6ee70849bf206553949fbccccc1e0bde238e964 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -88,7 +88,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
* View
*/
-$html=new Form($db);
+$form=new Form($db);
$company_static=new Societe($db);
$morequerystring='';
@@ -111,7 +111,7 @@ if ($modetax==1) // Calculate on invoice for goods and services
{
$nom=$langs->trans("VATReportByCustomersInDueDebtMode");
//$nom.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATDue");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
@@ -134,7 +134,7 @@ if ($modetax==0) // Invoice for goods, payment for services
{
$nom=$langs->trans("VATReportByCustomersInInputOutputMode");
//$nom.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATIn");
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
index a771790cf470147c2b27404ae0d3f93c2f486c01..f2667f697e19c7ebd7a75c108e25b84c97f23ac3 100644
--- a/htdocs/compta/tva/fiche.php
+++ b/htdocs/compta/tva/fiche.php
@@ -126,7 +126,7 @@ if ($_GET["action"] == 'delete')
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($id)
{
@@ -154,11 +154,11 @@ if ($_GET["action"] == 'create')
print "<tr>";
print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
- print $html->select_date($datep,"datep",'','','','add');
+ print $form->select_date($datep,"datep",'','','','add');
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("DateValue").'</td><td>';
- print $html->select_date($datev,"datev",'','','','add');
+ print $form->select_date($datev,"datev",'','','','add');
print '</td></tr>';
// Label
@@ -170,11 +170,11 @@ if ($_GET["action"] == 'create')
if ($conf->banque->enabled)
{
print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
- $html->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
+ $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Affiche liste des comptes courant
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
- $html->select_types_paiements($_POST["paiementtype"], "paiementtype");
+ $form->select_types_paiements($_POST["paiementtype"], "paiementtype");
print "</td>\n";
print "</tr>";
}
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index c45a609d5a3d69ca576089ccfcf1339fb4f25b25..a74c8ae4a1eb2105e9e059a595cc1ffb8687bab7 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -104,7 +104,7 @@ foreach($listofparams as $param)
llxHeader('','','','',0,0,'','',$morequerystring);
-$html=new Form($db);
+$form=new Form($db);
$company_static=new Societe($db);
$invoice_customer=new Facture($db);
@@ -125,7 +125,7 @@ $fsearch.=' <input type="hidden" name="modetax" value="'.$modetax.'">';
if ($modetax==1) // Calculate on invoice for goods and services
{
$nom=$langs->trans("VATReportByQuartersInDueDebtMode");
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$prevyear=$year_start; $prevquarter=$q;
if ($prevquarter > 1) $prevquarter--;
else { $prevquarter=4; $prevyear--; }
@@ -155,7 +155,7 @@ if ($modetax==1) // Calculate on invoice for goods and services
if ($modetax==0) // Invoice for goods, payment for services
{
$nom=$langs->trans("VATReportByQuartersInInputOutputMode");
- $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1);
+ $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
$prevyear=$year_start; $prevquarter=$q;
if ($prevquarter > 1) $prevquarter--;
else { $prevquarter=4; $prevyear--; }
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 514ca3a29a331b7ddb58ee33852542b12d9d5500..35e9f68e9ce012eb057189cff22336d7fd9e300b 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -477,14 +477,14 @@ else
// Date To Birth
print '<tr><td width="20%">'.$langs->trans("DateToBirth").'</td><td width="30%">';
- $html=new Form($db);
+ $form=new Form($db);
if ($object->birthday)
{
- print $html->select_date($object->birthday,'birthday',0,0,0,"perso");
+ print $form->select_date($object->birthday,'birthday',0,0,0,"perso");
}
else
{
- print $html->select_date('','birthday',0,0,1,"perso");
+ print $form->select_date('','birthday',0,0,1,"perso");
}
print '</td>';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 9b6481b309ba23c20c2632248ed8e90f67307ce0..50376df2e5c4e1410122e5a7c1cc10501252a961 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -131,8 +131,8 @@ if ($_GET["action"] == 'edit')
// Date To Birth
print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>';
- $html=new Form($db);
- print $html->select_date($contact->birthday,'birthday',0,0,1,"perso");
+ $form=new Form($db);
+ print $form->select_date($contact->birthday,'birthday',0,0,1,"perso");
print '</td>';
print '<td colspan="2">'.$langs->trans("Alert").': ';
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index bee4163db93bbcaf42541b6d4e3b0097ac8d65ee..938010289ee96ef7493b3ae1ea83dcbd8d243fa3 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -108,7 +108,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->contrat->creer)
llxHeader('', $langs->trans("ContractCard"), "Contrat");
-$html = new Form($db);
+$form = new Form($db);
$formcompany= new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -208,7 +208,7 @@ if ($id > 0)
print '<td colspan="1">';
//$userAlreadySelected = $contrat->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($contrat, '', 'type','internal');
@@ -238,7 +238,7 @@ if ($id > 0)
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index c8a7e6b6b0c1e1a261f128d75e7e0d20e5c4b378..528106c56e7edbee698ea84cb9478381f9842153 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -102,7 +102,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
*
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("CardProduct".$product->type));
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index beccf9a85f841308b44100f412bfdcc7bae2772c..33496cef4a0eae8afa45e849e92d4af2f648a784 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -464,7 +464,7 @@ if ($action == 'confirm_move' && $_REQUEST["confirm"] == 'yes')
llxHeader('',$langs->trans("ContractCard"),"Contrat");
$form = new Form($db);
-$html = new Form($db);
+$form = new Form($db);
$objectlignestatic=new ContratLigne($db);
@@ -644,7 +644,7 @@ else
// Ref du contrat
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($object,'ref','',1,'ref','ref','');
+ print $form->showrefnav($object,'ref','',1,'ref','ref','');
print "</td></tr>";
// Customer
@@ -918,7 +918,7 @@ else
*/
if ($_REQUEST["action"] == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == $_GET["rowid"])
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".$_GET["rowid"],$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".$_GET["rowid"],$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1);
if ($ret == 'html') print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
}
@@ -938,7 +938,7 @@ else
'text' => $langs->trans("ConfirmMoveToAnotherContractQuestion"),
array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid));
- $html->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".$_GET["rowid"],$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
+ $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".$_GET["rowid"],$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
}
@@ -950,7 +950,7 @@ else
$dateactstart = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dol_mktime(12, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$comment = $_POST["comment"];
- $html->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
+ $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
}
@@ -962,7 +962,7 @@ else
$dateactstart = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dol_mktime(12, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$comment = $_POST["comment"];
- $html->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
+ $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1);
print '<table class="notopnoleftnoright" width="100%"><tr '.$bc[false].' height="6"><td></td></tr></table>';
}
@@ -1049,11 +1049,11 @@ else
}
print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
- print $html->select_date($dateactstart,'',$usehm,$usehm,'',"active");
+ print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active");
print '</td>';
print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
- print $html->select_date($dateactend,"end",$usehm,$usehm,'',"active");
+ print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active");
print '</td>';
print '<td align="center" rowspan="2" valign="middle">';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 8c4cc75f7218c03f81d0cb40885fc7f78b809871..6554e5ad8c1537eb8c5eff975267a4726cbc1e25 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -88,7 +88,7 @@ if ($_POST["action"] == 'update' && $user->rights->contrat->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"])
{
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index fc392775744b07b7421ddecebc581cfa5c3a0060..20f12c521803ab88d9881e356dc13a1039f13302 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -63,10 +63,10 @@ class CMailFile
var $bodyCSS;
// Image
- var $html;
+ var $form;
var $image_boundary;
var $atleastoneimage=0;
- var $html_images=array();
+ var $form_images=array();
var $images_encoded=array();
var $image_types = array('gif' => 'image/gif',
'jpg' => 'image/jpeg',
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index dbeaf148e0b582a550fd2949506264f5625bac5d..2d8e94c53bd36845d15a2885edd6c923d47b8411 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1829,7 +1829,7 @@ abstract class CommonObject
function formAddPredefinedProduct($dateSelector,$seller,$buyer,$hookmanager=false)
{
global $conf,$langs,$object;
- global $html,$bcnd,$var;
+ global $form,$bcnd,$var;
// Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/predefinedproductline_create.tpl.php');
@@ -1848,7 +1848,7 @@ abstract class CommonObject
function formAddFreeProduct($dateSelector,$seller,$buyer,$hookmanager=false)
{
global $conf,$langs,$object;
- global $html,$bcnd,$var;
+ global $form,$bcnd,$var;
// Use global variables + $dateSelector + $seller and $buyer
include(DOL_DOCUMENT_ROOT.'/core/tpl/freeproductline_create.tpl.php');
@@ -1951,7 +1951,7 @@ abstract class CommonObject
function printLine($action='viewline',$line,$var=true,$num=0,$i=0,$dateSelector=0,$seller,$buyer,$selected=0,$hookmanager=false)
{
global $conf,$langs,$user;
- global $html,$bc,$bcdd;
+ global $form,$bc,$bcdd;
$element = $this->element;
if ($element == 'propal') $element = 'propale'; // To work with non standard path
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 082078bf5e78f8101335d6545204572d4a8e3b08..a1a452a939dc8110364dba6d04ccd00665a2c396 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -358,7 +358,7 @@ class FormFile
$headershown=1;
- $html = new Form($db);
+ $form = new Form($db);
$buttonlabeltoshow=$buttonlabel;
if (empty($buttonlabel)) $buttonlabel=$langs->trans('Generate');
@@ -381,7 +381,7 @@ class FormFile
$arraykeys=array_keys($modellist);
$modelselected=$arraykeys[0];
}
- $out.= $html->selectarray('model',$modellist,$modelselected,$showempty,0,0);
+ $out.= $form->selectarray('model',$modellist,$modelselected,$showempty,0,0);
$out.= '</td>';
}
else
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 9ee9b57981f36c81d403e14dd365b651805fe96c..f99e7cd698f7b9a4d8e97fd6587200bc2343ac58 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -183,7 +183,7 @@ class Interfaces
{
global $conf, $langs;
- $html = new Form($this->db);
+ $form = new Form($this->db);
$files = array();
$modules = array();
@@ -285,7 +285,7 @@ class Interfaces
if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
}
- $triggers[$j]['info'] = $html->textwithpicto('',$text);
+ $triggers[$j]['info'] = $form->textwithpicto('',$text);
$j++;
}
return $triggers;
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 17488f64de17b389d18daec91ccc3bf29161a7b6..e3c9f5e8ef2e1b79f24aebb819d8d61361fbc5b5 100755
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -82,17 +82,17 @@ function ConvertToXmlAttribute( $value )
* Check whether given extension is in html etensions list
*
* @param string $ext
- * @param array $htmlExtensions
+ * @param array $formExtensions
* @return boolean
*/
-function IsHtmlExtension( $ext, $htmlExtensions )
+function IsHtmlExtension( $ext, $formExtensions )
{
- if ( !$htmlExtensions || !is_array( $htmlExtensions ) )
+ if ( !$formExtensions || !is_array( $formExtensions ) )
{
return false ;
}
$lcaseHtmlExtensions = array();
- foreach ( $htmlExtensions as $key => $val )
+ foreach ( $formExtensions as $key => $val )
{
$lcaseHtmlExtensions[$key] = strtolower( $val );
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4c822b7aa64d2e012ad08551c86c1d9ed59b3916..3e7fcea0c35b411d05dedb46545c4522d65d7c1a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3070,7 +3070,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0)
* Fonction utilisee dans les pdf et les pages html
*
* @param float $amount Montant a formater
- * @param string $html Type de formatage, html ou pas (par defaut)
+ * @param string $form Type de formatage, html ou pas (par defaut)
* @param Translate $outlangs Objet langs pour formatage text
* @param int $trunc 1=Tronque affichage si trop de decimales,0=Force le non troncage
* @param int $rounding Minimum number of decimal. If not defined we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOTAL)
@@ -3079,7 +3079,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0)
*
* @see price2num Revert function of price
*/
-function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerounding=-1)
+function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerounding=-1)
{
global $langs,$conf;
@@ -3098,7 +3098,7 @@ function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
if ($outlangs->trans("SeparatorDecimal") != "SeparatorDecimal") $dec=$outlangs->trans("SeparatorDecimal");
if ($outlangs->trans("SeparatorThousand")!= "SeparatorThousand") $thousand=$outlangs->trans("SeparatorThousand");
if ($thousand == 'None') $thousand='';
- //print "amount=".$amount." html=".$html." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
+ //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
//print "amount=".$amount."-";
$amount = str_replace(',','.',$amount); // should be useless
@@ -3126,7 +3126,7 @@ function price($amount, $html=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou
if ($forcerounding >= 0) $nbdecimal = $forcerounding;
// Format number
- if ($html)
+ if ($form)
{
$output=preg_replace('/\s/',' ',number_format($amount, $nbdecimal, $dec, $thousand));
}
@@ -3165,7 +3165,7 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
if ($langs->trans("SeparatorDecimal") != "SeparatorDecimal") $dec=$langs->trans("SeparatorDecimal");
if ($langs->trans("SeparatorThousand")!= "SeparatorThousand") $thousand=$langs->trans("SeparatorThousand");
if ($thousand == 'None') $thousand='';
- //print "amount=".$amount." html=".$html." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
+ //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
// Convert value to universal number format (no thousand separator, '.' as decimal separator)
if ($alreadysqlnb != 1) // If not a PHP number or unknown, we change format
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 1788d56308b9bbd936db92ce476b714602579c78..c27329d01926f9d38ee148410b58652c120f1c83 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -55,11 +55,11 @@ function dol_print_file($langs,$filename,$searchalt=0)
// Test if file is in lang directory
foreach($langs->dir as $searchdir)
{
- $htmlfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);
- dol_syslog('functions2::dol_print_file search file '.$htmlfile, LOG_DEBUG);
- if (is_readable($htmlfile))
+ $formfile=($searchdir."/langs/".$langs->defaultlang."/".$filename);
+ dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
+ if (is_readable($formfile))
{
- $content=file_get_contents($htmlfile);
+ $content=file_get_contents($formfile);
$isutf8=utf8_check($content);
if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
@@ -70,13 +70,13 @@ function dol_print_file($langs,$filename,$searchalt=0)
if ($searchalt) {
// Test si fichier dans repertoire de la langue alternative
- if ($langs->defaultlang != "en_US") $htmlfilealt = $searchdir."/langs/en_US/".$filename;
- else $htmlfilealt = $searchdir."/langs/fr_FR/".$filename;
- dol_syslog('functions2::dol_print_file search alt file '.$htmlfilealt, LOG_DEBUG);
- //print 'getcwd='.getcwd().' htmlfilealt='.$htmlfilealt.' X '.file_exists(getcwd().'/'.$htmlfilealt);
- if (is_readable($htmlfilealt))
+ if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
+ else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+ dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
+ //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
+ if (is_readable($formfilealt))
{
- $content=file_get_contents($htmlfilealt);
+ $content=file_get_contents($formfilealt);
$isutf8=utf8_check($content);
if (! $isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 22b2997b5ca014381c2fc345643ce133b07fc235..41c3f72fbc27aa28ce84e8ed4954cba42dbb155b 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -545,7 +545,7 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$imageColorPending = $imageDir . "therm_color_pending.png";
$imageColorIntent = $imageDir . "therm_color_intent.png";
- $htmlThermTop = '
+ $formThermTop = '
<!-- Thermometer Begin -->
<table cellpadding="0" cellspacing="4" border="0">
<tr><td>
@@ -557,10 +557,10 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
<td>
<table cellpadding="0" cellspacing="0" border="0">';
- $htmlSection = '
+ $formSection = '
<tr><td><img src="{image}" width="26" height="{height}" border="0"></td></tr>';
- $htmlThermbottom = '
+ $formThermbottom = '
</table>
</td>
<td><img src="' . $imageIndex . '" width="32" height="200" border="0"></td>
@@ -578,7 +578,7 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$legendaPending = "€ " . round($pendingValue);
$legendaIntent = "€ " . round($intentValue);
$legendaTotal = "€ " . round($actualValue + $pendingValue + $intentValue);
- $htmlLegenda = '
+ $formLegenda = '
<table cellpadding="0" cellspacing="0" border="0">
<tr><td><img src="' . $imageColorActual . '" width="9" height="9"> </td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Paid").':<br>' . $legendaActual . '</b></font></td></tr>
@@ -621,14 +621,14 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
// start writing the html (from bottom to top)
// bottom
- $thermometer = $htmlThermbottom;
+ $thermometer = $formThermbottom;
// actual
$sectionHeight = round(($actualValue / $maximumValue) * $height);
$totalHeight = $totalHeight + $sectionHeight;
if ( $sectionHeight > 0 )
{
- $section = $htmlSection;
+ $section = $formSection;
$section = str_replace("{image}", $imageMiddleActual, $section);
$section = str_replace("{height}", $sectionHeight, $section);
$thermometer = $section . $thermometer;
@@ -639,7 +639,7 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$totalHeight = $totalHeight + $sectionHeight;
if ( $sectionHeight > 0 )
{
- $section = $htmlSection;
+ $section = $formSection;
$section = str_replace("{image}", $imageMiddlePending, $section);
$section = str_replace("{height}", $sectionHeight, $section);
$thermometer = $section . $thermometer;
@@ -650,7 +650,7 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$totalHeight = $totalHeight + $sectionHeight;
if ( $sectionHeight > 0 )
{
- $section = $htmlSection;
+ $section = $formSection;
$section = str_replace("{image}", $imageMiddleIntent, $section);
$section = str_replace("{height}", $sectionHeight, $section);
$thermometer = $section . $thermometer;
@@ -660,16 +660,16 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$sectionHeight = $height- $totalHeight;
if ( $sectionHeight > 0 )
{
- $section = $htmlSection;
+ $section = $formSection;
$section = str_replace("{image}", $imageMiddleGoal, $section);
$section = str_replace("{height}", $sectionHeight, $section);
$thermometer = $section . $thermometer;
}
// top
- $thermometer = $htmlThermTop . $thermometer;
+ $thermometer = $formThermTop . $thermometer;
- return $thermometer . $htmlLegenda;
+ return $thermometer . $formLegenda;
}
?>
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index de6b38c669cff26213789b80d78c79f8993702a3..26eb692c8bd3a392dbc51ca60b63fea60cf4fd27 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -100,7 +100,7 @@ function delivery_prepare_head($object)
function show_list_sending_receive($origin='commande',$origin_id,$filter='')
{
global $db, $conf, $langs, $bc;
- global $html;
+ global $form;
$product_static=new Product($db);
$expedition=new Expedition($db);
@@ -175,7 +175,7 @@ function show_list_sending_receive($origin='commande',$origin_id,$filter='')
$text=$product_static->getNomUrl(1);
$text.= ' - '.$objp->product;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($objp->date_start,$objp->date_end);
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 9ddefa83def38e8c199758a82df25076b8dbcf4a..c0bb1c5eb7bf618ef069e85b92f68d62d4190fda 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -306,17 +306,17 @@ function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter=''
$date=date("r");
// Print header
- $html='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
- fwrite($fichier, $html);
+ $form='<?xml version="1.0" encoding="'.$langs->charset_output.'"?>';
+ fwrite($fichier, $form);
fwrite($fichier, "\n");
- $html='<rss version="2.0">';
- fwrite($fichier, $html);
+ $form='<rss version="2.0">';
+ fwrite($fichier, $form);
fwrite($fichier, "\n");
- $html="<channel>\n<title>".$title."</title>\n";
- fwrite($fichier, $html);
+ $form="<channel>\n<title>".$title."</title>\n";
+ fwrite($fichier, $form);
- $html='<description><![CDATA['.$desc.'.]]></description>'."\n".
+ $form='<description><![CDATA['.$desc.'.]]></description>'."\n".
// '<language>fr</language>'."\n".
'<copyright>Dolibarr</copyright>'."\n".
'<lastBuildDate>'.$date.'</lastBuildDate>'."\n".
@@ -324,10 +324,10 @@ function build_rssfile($format,$title,$desc,$events_array,$outputfile,$filter=''
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',$dolibarr_main_url_root);
$url=$urlwithouturlroot.DOL_URL_ROOT.'/public/agenda/agendaexport.php?format=rss&exportkey='.urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
- $html.='<link><![CDATA['.$url.']]></link>'."\n";
+ $form.='<link><![CDATA['.$url.']]></link>'."\n";
- //print $html;
- fwrite($fichier, $html);
+ //print $form;
+ fwrite($fichier, $form);
foreach ($events_array as $date => $event)
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 1a5a06c0ec0c071e7c899701466ae14c87bfdcb7..2fff5557cfb0db3658210183d08007d65fc3e85e 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -114,28 +114,28 @@ class html_cerfafr extends ModeleDon
{
// Defini contenu
$donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
- $html = implode('', file($donmodel));
- $html = str_replace('__REF__',$id,$html);
- $html = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$html);
- $html = str_replace('__IP__',$user->ip,$html);
- $html = str_replace('__AMOUNT__',$don->amount,$html);
- $html = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie),$html);
- $html = str_replace('__CURRENCYCODE__',$conf->monnaie,$html);
- $html = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$html);
- $html = str_replace('__MAIN_INFO_SOCIETE_ADRESSE__',$mysoc->address,$html);
- $html = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$html);
- $html = str_replace('__MAIN_INFO_SOCIETE_VILLE__',$mysoc->town,$html);
- $html = str_replace('__DONATOR_NAME__',$don->nom,$html);
- $html = str_replace('__DONATOR_ADDRESS__',$don->adresse,$html);
- $html = str_replace('__DONATOR_ZIP__',$don->cp,$html);
- $html = str_replace('__DONATOR_TOWN__',$don->ville,$html);
- $html = str_replace('__PAYMENTMODE_LIB__ ',$don->modepaiement,$html);
- $html = str_replace('__NOW__',dol_print_date($now,'',false,$outputlangs),$html);
+ $form = implode('', file($donmodel));
+ $form = str_replace('__REF__',$id,$form);
+ $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form);
+ $form = str_replace('__IP__',$user->ip,$form);
+ $form = str_replace('__AMOUNT__',$don->amount,$form);
+ $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie),$form);
+ $form = str_replace('__CURRENCYCODE__',$conf->monnaie,$form);
+ $form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
+ $form = str_replace('__MAIN_INFO_SOCIETE_ADRESSE__',$mysoc->address,$form);
+ $form = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$form);
+ $form = str_replace('__MAIN_INFO_SOCIETE_VILLE__',$mysoc->town,$form);
+ $form = str_replace('__DONATOR_NAME__',$don->nom,$form);
+ $form = str_replace('__DONATOR_ADDRESS__',$don->adresse,$form);
+ $form = str_replace('__DONATOR_ZIP__',$don->cp,$form);
+ $form = str_replace('__DONATOR_TOWN__',$don->ville,$form);
+ $form = str_replace('__PAYMENTMODE_LIB__ ',$don->modepaiement,$form);
+ $form = str_replace('__NOW__',dol_print_date($now,'',false,$outputlangs),$form);
// Sauve fichier sur disque
dol_syslog("html_cerfafr::write_file $file");
$handle=fopen($file,"w");
- fwrite($handle,$html);
+ fwrite($handle,$form);
fclose($handle);
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php
index 88a58b73ff70dfda1ea225e13321db1e8839e4f4..77e9274e5d296a5f864cac006e0bcd86e0a73388 100644
--- a/htdocs/core/tpl/freeproductline_create.tpl.php
+++ b/htdocs/core/tpl/freeproductline_create.tpl.php
@@ -43,7 +43,7 @@
<tr <?php echo $bcnd[$var]; ?>>
<td>
<?php
- echo $html->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
+ echo $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1);
if (($conf->product->enabled && $conf->service->enabled) || (empty($conf->product->enabled) && empty($conf->service->enabled))) echo '<br>';
if (is_object($hookmanager))
@@ -64,7 +64,7 @@
<td align="right">
<?php
if ($buyer->tva_assuj == "0") echo '<input type="hidden" name="np_tva_tx" value="0">0';
- else echo $html->load_tva('np_tva_tx', (isset($_POST["np_tva_tx"])?$_POST["np_tva_tx"]:-1), $seller, $buyer);
+ else echo $form->load_tva('np_tva_tx', (isset($_POST["np_tva_tx"])?$_POST["np_tva_tx"]:-1), $seller, $buyer);
?>
</td>
<td align="right"><input type="text" size="5" name="np_price" value="<?php echo (isset($_POST["np_price"])?$_POST["np_price"]:''); ?>"></td>
@@ -78,9 +78,9 @@
<td colspan="9">
<?php
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
- echo $html->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+ echo $form->select_date('','date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
echo ' '.$langs->trans('to').' ';
- echo $html->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
+ echo $form->select_date('','date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addproduct");
?>
</td>
</tr>
diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php
index d0105076068c9eeb955ab428775f7ce59c83428e..91c4824536a371d778bb2376a73e1b3b0ad6dbbd 100644
--- a/htdocs/core/tpl/freeproductline_edit.tpl.php
+++ b/htdocs/core/tpl/freeproductline_edit.tpl.php
@@ -53,7 +53,7 @@
?>
</td>
- <td align="right"><?php echo $html->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?></td>
+ <td align="right"><?php echo $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?></td>
<td align="right"><input size="6" type="text" class="flat" name="subprice" value="<?php echo price($line->subprice,0,'',0); ?>"></td>
@@ -81,9 +81,9 @@
<tr <?php echo $bc[$var]; ?>>
<td colspan="9"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
<?php
- echo $html->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne");
+ echo $form->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne");
echo ' '.$langs->trans('to').' ';
- echo $html->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne");
+ echo $form->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne");
?>
</td>
</tr>
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index fe12db9716f57df5917d96df21a25b85206059fa..b327460f5fe7ab9f8e25e4a41efc802a89759e95 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -51,7 +51,7 @@
<td colspan="3">
<?php
- $html->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level);
+ $form->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level);
if (is_object($hookmanager))
{
@@ -78,9 +78,9 @@
<td colspan="9">
<?php
echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
- echo $html->select_date('','date_start_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
+ echo $form->select_date('','date_start_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
echo ' '.$langs->trans('to').' ';
- echo $html->select_date('','date_end_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
+ echo $form->select_date('','date_end_predef',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,1,"addpredefinedproduct");
?>
</td>
</tr>
diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
index 6eb06b6ddd92a2645b815ff6be18e2eea767ebae..589a4ece078c388cf3360dcf5ecb1390db2a92f2 100644
--- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php
@@ -63,7 +63,7 @@
?>
</td>
- <td align="right"><?php echo $html->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?></td>
+ <td align="right"><?php echo $form->load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?></td>
<td align="right">
<input size="6" type="text" class="flat" name="subprice" value="<?php echo price($line->subprice,0,'',0); ?>" />
@@ -93,9 +93,9 @@
<tr <?php echo $bc[$var]; ?>>
<td colspan="9"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
<?php
- echo $html->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne");
+ echo $form->select_date($line->date_start,'date_start',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_start?0:1,"updateligne");
echo ' '.$langs->trans('to').' ';
- echo $html->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne");
+ echo $form->select_date($line->date_end,'date_end',$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE,$line->date_end?0:1,"updateligne");
?>
</td>
</tr>
diff --git a/htdocs/core/tpl/predefinedproductline_view.tpl.php b/htdocs/core/tpl/predefinedproductline_view.tpl.php
index 614219a0399efec8099d58b0957ad2cd066b6d53..09a61c177e2c9130d648363d4296c64edeefaab9 100644
--- a/htdocs/core/tpl/predefinedproductline_view.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_view.tpl.php
@@ -23,7 +23,7 @@
<td>
<a name="<?php echo $line->id; ?>"></a>
<?php
- echo $html->textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):''));
+ echo $form->textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):''));
// Show range
print_date_range($line->date_start, $line->date_end);
diff --git a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
index ba13ac15bf8be067d912ab7b3addb72f957ee372..107206e8e7cf9a9ff2a5905dc7721c377cebb547 100644
--- a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
+++ b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php
@@ -24,7 +24,7 @@
<div class="td firstcol">
<a name="<?php echo $line->id; ?>"></a>
<?php
- echo $html->textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):''));
+ echo $form->textwithtooltip($text,$description,3,'','',$i,0,($line->fk_parent_line?img_picto('', 'rightarrow'):''));
// Show range
print_date_range($line->date_start, $line->date_end);
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index 973ee2a4e4a5c742ac79e5afd1d97478afa3d3bc..40a49587f972627fa387755a508c753addf1f7f2 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -115,7 +115,7 @@ print_fiche_titre($langs->trans("ECMAutoOrg"));
*/
if ($_GET['action'] == 'delete_file')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 5bd0780811296b744946920e93898bc98c2cc0ee..3db618616fc781b4e88237d7f471e891438fbcca 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -476,7 +476,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
llxHeader('',$langs->trans('Sending'),'Expedition');
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$formproduct = new FormProduct($db);
@@ -563,7 +563,7 @@ if ($action == 'create')
print '<tr><td class="fieldrequired">'.$langs->trans("DateDeliveryPlanned").'</td>';
print '<td colspan="3">';
//print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed.
- print $html->select_date($object->date_livraison?$object->date_livraison:-1,'date_delivery',1,1);
+ print $form->select_date($object->date_livraison?$object->date_livraison:-1,'date_delivery',1,1);
print "</td>\n";
print '</tr>';
@@ -575,7 +575,7 @@ if ($action == 'create')
print '<td colspan="3">';
if (!empty($object->fk_delivery_address))
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$_GET['socid'],'none','commande',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$_GET['socid'],'none','commande',$object->id);
}
print '</td></tr>'."\n";
}
@@ -608,7 +608,7 @@ if ($action == 'create')
print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
print '<td colspan="3">';
$expe->fetch_delivery_methods();
- print $html->selectarray("expedition_method_id",$expe->meths,$_POST["expedition_method_id"],1,0,0,"",1);
+ print $form->selectarray("expedition_method_id",$expe->meths,$_POST["expedition_method_id"],1,0,0,"",1);
print "</td></tr>\n";
// Tracking number
@@ -682,7 +682,7 @@ if ($action == 'create')
$text=$product_static->getNomUrl(1);
$text.= ' - '.$line->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->desc));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($db->jdate($line->date_start),$db->jdate($line->date_end));
@@ -861,7 +861,7 @@ else
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteSending'),$langs->trans("ConfirmDeleteSending",$object->ref),'confirm_delete','',0,1);
if ($ret == 'html') print '<br>';
}
@@ -879,7 +879,7 @@ else
{
$numref = $object->ref;
}
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$langs->trans("ConfirmValidateSending",$numref),'confirm_valid','',0,1);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$langs->trans("ConfirmValidateSending",$numref),'confirm_valid','',0,1);
if ($ret == 'html') print '<br>';
}
/*
@@ -887,7 +887,7 @@ else
*/
if ($action == 'annuler')
{
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);
if ($ret == 'html') print '<br>';
}
@@ -935,7 +935,7 @@ else
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="3">';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print '</td></tr>';
// Customer
@@ -991,7 +991,7 @@ else
print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">';
- $html->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
+ $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1010,14 +1010,14 @@ else
print '<td colspan="3">';
if (!empty($object->fk_delivery_address))
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->deliveryaddress->socid,'none','shipment',$object->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->deliveryaddress->socid,'none','shipment',$object->id);
}
print '</td></tr>'."\n";
}
// Weight
- print '<tr><td>'.$html->editfieldkey("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
- print $html->editfieldval("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer);
+ print '<tr><td>'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer);
print $object->weight_units?measuring_units_string($object->weight_units,"weight"):'';
print '</td></tr>';
@@ -1044,20 +1044,20 @@ else
print '</tr>';
// Width
- print '<tr><td>'.$html->editfieldkey("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
- print $html->editfieldval("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer);
+ print '<tr><td>'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer);
print $object->trueWidth?measuring_units_string($object->width_units,"size"):'';
print '</td></tr>';
// Height
- print '<tr><td>'.$html->editfieldkey("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
- print $html->editfieldval("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer);
+ print '<tr><td>'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer);
print $object->trueHeight?measuring_units_string($object->height_units,"size"):'';
print '</td></tr>';
// Depth
- print '<tr><td>'.$html->editfieldkey("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
- print $html->editfieldval("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer);
+ print '<tr><td>'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer);
print $object->trueDepth?measuring_units_string($object->depth_units,"size"):'';
print '</td></tr>';
@@ -1081,7 +1081,7 @@ else
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setexpedition_method_id">';
$object->fetch_delivery_methods();
- print $html->selectarray("expedition_method_id",$object->meths,$object->expedition_method_id,1,0,0,"",1);
+ print $form->selectarray("expedition_method_id",$object->meths,$object->expedition_method_id,1,0,0,"",1);
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -1098,8 +1098,8 @@ else
print '</tr>';
// Tracking Number
- print '<tr><td>'.$html->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
- print $html->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,'id',$object->id,$user->rights->expedition->creer,'string',$object->tracking_number);
+ print '<tr><td>'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,'id',$object->id,$user->rights->expedition->creer).'</td><td colspan="3">';
+ print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,'id',$object->id,$user->rights->expedition->creer,'string',$object->tracking_number);
print '</td></tr>';
print "</table>\n";
@@ -1149,7 +1149,7 @@ else
$text.= ' - '.$lines[$i]->label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($lines[$i]->description));
//print $description;
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
print_date_range($lines[$i]->date_start,$lines[$i]->date_end);
if ($conf->global->PRODUIT_DESC_IN_FORM)
{
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index da3148bc41c63a41ec84768542e067ae20ab81e8..dc143d7c2e217987bfa4a7ac2ed70b66ea884660 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -117,7 +117,7 @@ if ($_POST['action'] == 'setconditions' && $user->rights->commande->creer)
}
-$html = new Form($db);
+$form = new Form($db);
$formproduct = new FormProduct($db);
$formfile = new FormFile($db);
@@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($_GET["action"] == 'cloture')
{
- $ret=$html->form_confirm($_SERVER['PHP_SELF']."?id=".$_GET["id"],$langs->trans("CloseOrder"),$langs->trans("ConfirmCloseOrder"),"confirm_cloture");
+ $ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$_GET["id"],$langs->trans("CloseOrder"),$langs->trans("ConfirmCloseOrder"),"confirm_cloture");
if ($ret == 'html') print '<br>';
}
@@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="18%">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
@@ -221,7 +221,7 @@ if ($id > 0 || ! empty($ref))
// Remise dispo de type non avoir
$filter='fk_facture_source IS NULL';
print '<br>';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$commande->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
+ $form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$commande->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
}
}
if ($absolute_creditnote)
@@ -259,7 +259,7 @@ if ($id > 0 || ! empty($ref))
print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdatedelivery">';
- $html->select_date($commande->date_livraison>0?$commande->date_livraison:-1,'liv_','','','',"setdatedelivery");
+ $form->select_date($commande->date_livraison>0?$commande->date_livraison:-1,'liv_','','','',"setdatedelivery");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
@@ -287,11 +287,11 @@ if ($id > 0 || ! empty($ref))
if ($_GET['action'] == 'editdelivery_adress')
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'delivery_address_id','commande',$commande->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'delivery_address_id','commande',$commande->id);
}
else
{
- $html->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
+ $form->form_address($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->fk_delivery_address,$_GET['socid'],'none','commande',$commande->id);
}
print '</td></tr>';
}
@@ -307,11 +307,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="2">';
if ($_GET['action'] == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->cond_reglement_id,'none');
}
print '</td></tr>';
@@ -325,11 +325,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="2">';
if ($_GET['action'] == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$commande->id,$commande->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -346,11 +346,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="2">';
if ($_GET['action'] == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$commande->id, $commande->socid, $commande->fk_project, 'none');
}
print '</td></tr>';
}
@@ -451,7 +451,7 @@ if ($id > 0 || ! empty($ref))
$text=$product_static->getNomUrl(1);
$text.= ' - '.$objp->product_label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($objp->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($db->jdate($objp->date_start),$db->jdate($objp->date_end));
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index f01e40c607dac57ffd7b880c3fa453e158bd54b1..569d04408fd3107a27799c3a709954da80db2c90 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -75,7 +75,7 @@ $objexport=new Export($db);
$objexport->load_arrays($user,$datatoexport);
$objmodelexport=new ModeleExports();
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
$sqlusedforexport='';
@@ -438,7 +438,7 @@ if ($step == 2 && $datatoexport)
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left().'</a></td>';
print '<td>';
//print $text.'-'.$htmltext."<br>";
- print $html->textwithpicto($text,$htmltext);
+ print $form->textwithpicto($text,$htmltext);
//print ' ('.$code.')';
print '</td>';
$bit=1;
@@ -448,7 +448,7 @@ if ($step == 2 && $datatoexport)
// Fields not selected
print '<td>';
//print $text.'-'.$htmltext."<br>";
- print $html->textwithpicto($text,$htmltext);
+ print $form->textwithpicto($text,$htmltext);
//print ' ('.$code.')';
print '</td>';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=selectfield&field='.$code.'">'.img_right().'</a></td>';
@@ -580,7 +580,7 @@ if ($step == 3 && $datatoexport)
$tablename=getablenamefromfield($code,$sqlmaxforexport);
$htmltext ='<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
$htmltext.='<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./','',$code)."<br>";
- print $html->textwithpicto($text,$htmltext);
+ print $form->textwithpicto($text,$htmltext);
//print ' ('.$code.')';
print '</td>';
@@ -754,7 +754,7 @@ if ($step == 4 && $datatoexport)
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_picto_common($key,$objmodelexport->getPicto($key)).'</td>';
$text=$objmodelexport->getDriverDesc($key);
- print '<td>'.$html->textwithpicto($objmodelexport->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$form->textwithpicto($objmodelexport->getDriverLabel($key),$text).'</td>';
print '<td>'.$objmodelexport->getLibLabel($key).'</td><td align="right">'.$objmodelexport->getLibVersion($key).'</td></tr>'."\n";
}
print '</table>';
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 264c62e2af904cfe339272b1b3600138256d2327..c28ade3f739a37b8ead3a121c1e9879e2a4de938 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -39,7 +39,7 @@ $export->load_arrays($user);
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones');
@@ -75,7 +75,7 @@ foreach($liste as $key => $val)
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
$text=$model->getDriverDesc($key);
- print '<td>'.$html->textwithpicto($model->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
print '<td>'.$model->getLibLabel($key).'</td>';
print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
print '</tr>';
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index e8fd2d76e1c9d1a47aaa1c0ac4e20ee462f39d04..5d713eda2ca6a5254fa958d45c6b3a3d911ffce3 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index a5893d6f4195776ae7a2031cd11de6cd02b80137..34a3a03068ee7259c919f1b2638d523ed85b0108 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -112,7 +112,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->ficheinter->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -199,7 +199,7 @@ if ($id > 0)
print '<td colspan="1">';
//$userAlreadySelected = $fichinter->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($fichinter, '', 'type','internal');
@@ -229,7 +229,7 @@ if ($id > 0)
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 872d191cd1faf6af07871e96ec8453666762bf87..6d69c65dcdf7754462b68d0280ab27adbaa91180 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -102,7 +102,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
*
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("InterventionCard"));
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 764e02bba0bbf48a51cee863faa6f43d0f1c042d..2622e58c6f26374514a7d63a5baee6786379ce6d 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -87,7 +87,7 @@ if ($action == 'update' && $user->rights->ficheinter->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($fichinterid)
{
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 08f6244a93ce0889a8e46f7bbd1a783f1c3ee129..0f3e6ea5dffcfe8ca8b5e56b548a970d867ea1b6 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -114,7 +114,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->commande->creer)
llxHeader('', $langs->trans("Order"), "Commande");
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -151,7 +151,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
@@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
//$userAlreadySelected = $commande->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($commande, '', 'type','internal');
@@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 32474ba8af8082539e4bd6dd777ee9af7ac7873b..d5dfa87637127356546258447a2efffaa83d2278 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -103,7 +103,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
-$html = new Form($db);
+$form = new Form($db);
$warehouse_static = new Entrepot($db);
$now=dol_now();
@@ -138,7 +138,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
@@ -284,7 +284,7 @@ if ($id > 0 || ! empty($ref))
print '<td align="right">';
if (count($listwarehouses))
{
- print $html->selectarray("entrepot_".$i, $listwarehouses, '', $disabled, 0, 0, '', 0, 0, $disabled);
+ print $form->selectarray("entrepot_".$i, $listwarehouses, '', $disabled, 0, 0, '', 0, 0, $disabled);
}
else
{
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 31d2ef5749a06680e2bbc50bc5fc9df13bed2b50..1fb86272c3a1a7d9581cc96ed862d9707c21d2aa 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -118,7 +118,7 @@ if ($action=='delete')
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$id = $_GET['id'];
$ref= $_GET['ref'];
@@ -153,7 +153,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="35%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index a535f62b1f2962b26edbc16151d97c34da1b6921..033c988fbc33bbc5fed5801f14f6ddfe91a4be29 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -763,7 +763,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$formorder = new FormOrder($db);
$productstatic = new Product($db);
@@ -800,7 +800,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
if ($ret == 'html') print '<br>';
}
@@ -824,7 +824,7 @@ if ($id > 0 || ! empty($ref))
$text.=$notify->confirmMessage(3,$object->socid);
}
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
if ($ret == 'html') print '<br>';
}
/*
@@ -832,7 +832,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'approve')
{
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", '', 1, 1);
+ $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", '', 1, 1);
if ($ret == 'html') print '<br>';
}
/*
@@ -840,7 +840,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'refuse')
{
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
if ($ret == 'html') print '<br>';
}
/*
@@ -848,7 +848,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'cancel')
{
- $ret=$html->form_confirm("fiche.php?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -858,7 +858,7 @@ if ($id > 0 || ! empty($ref))
if ($action == 'commande')
{
$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- $ret=$html->form_confirm("fiche.php?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
+ $ret=$form->form_confirm("fiche.php?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
if ($ret == 'html') print '<br>';
}
@@ -867,7 +867,7 @@ if ($id > 0 || ! empty($ref))
*/
if ($action == 'delete_product_line')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
if ($ret == 'html') print '<br>';
}
@@ -889,7 +889,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($object,'ref','',1,'ref','ref');
+ print $form->showrefnav($object,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
@@ -933,7 +933,7 @@ if ($id > 0 || ! empty($ref))
// Conditions de reglement par defaut
$langs->load('bills');
- $html = new Form($db);
+ $form = new Form($db);
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('PaymentConditions');
@@ -943,18 +943,18 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="2">';
if ($action == 'editconditions')
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'cond_reglement_id');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'cond_reglement_id');
}
else
{
- $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none');
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id,'none');
}
print "</td>";
print '</tr>';
// Mode of payment
$langs->load('bills');
- $html = new Form($db);
+ $form = new Form($db);
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans('PaymentMode');
@@ -964,11 +964,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="2">';
if ($action == 'editmode')
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
}
else
{
- $html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+ $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
}
print '</td></tr>';
@@ -986,11 +986,11 @@ if ($id > 0 || ! empty($ref))
//print "$object->id, $object->socid, $object->fk_project";
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
}
print '</td>';
print '</tr>';
@@ -1077,7 +1077,7 @@ if ($id > 0 || ! empty($ref))
$text=$product_static->getNomUrl(1,'supplier');
$text.= ' - '.$product_static->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($line->date_start,$line->date_end);
@@ -1152,7 +1152,7 @@ if ($id > 0 || ! empty($ref))
$text=$product_static->getNomUrl(1,'supplier');
$text.= ' - '.$product_static->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($line->date_start,$line->date_end);
@@ -1160,7 +1160,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print $html->select_type_of_lines($line->product_type,'type',1);
+ print $form->select_type_of_lines($line->product_type,'type',1);
if ($conf->product->enabled && $conf->service->enabled) print '<br>';
}
@@ -1173,7 +1173,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td>';
- print $html->load_tva('tva_tx',$line->tva_tx);
+ print $form->load_tva('tva_tx',$line->tva_tx);
print '</td>';
print '<td align="right"><input size="5" type="text" name="pu" value="'.price($line->subprice).'"></td>';
print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
@@ -1213,7 +1213,7 @@ if ($id > 0 || ! empty($ref))
print '<td>';
$forceall=1;
- print $html->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
+ print $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
if ($forceall || ($conf->product->enabled && $conf->service->enabled)
|| (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
@@ -1226,7 +1226,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td align="center">';
- print $html->load_tva('tva_tx',($_POST["tva_tx"]?$_POST["tva_tx"]:-1),$soc,$mysoc);
+ print $form->load_tva('tva_tx',($_POST["tva_tx"]?$_POST["tva_tx"]:-1),$soc,$mysoc);
print '</td>';
print '<td align="right"><input type="text" name="pu" size="5" value="'.$_POST["pu"].'"></td>';
print '<td align="right"><input type="text" name="qty" value="'.($_POST["qty"]?$_POST["qty"]:'1').'" size="2"></td>';
@@ -1264,7 +1264,7 @@ if ($id > 0 || ! empty($ref))
$var=!$var;
print '<tr '.$bc[$var].'>';
print '<td colspan="3">';
- $html->select_produits_fournisseurs($object->fourn_id,'','idprodfournprice','',$filtre);
+ $form->select_produits_fournisseurs($object->fourn_id,'','idprodfournprice','',$filtre);
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
@@ -1419,7 +1419,7 @@ if ($id > 0 || ! empty($ref))
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
- print $html->select_date($date_com,'','','','',"commande");
+ print $form->select_date($date_com,'','','','',"commande");
print '</td></tr>';
print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
@@ -1444,7 +1444,7 @@ if ($id > 0 || ! empty($ref))
print '<table class="border" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
- print $html->select_date('','','','','',"commande");
+ print $form->select_date('','','','','',"commande");
print "</td></tr>\n";
print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
@@ -1455,7 +1455,7 @@ if ($id > 0 || ! empty($ref))
$liv['nev'] = $langs->trans("NeverReceived");
$liv['can'] = $langs->trans("Canceled");
- print $html->selectarray("type",$liv);
+ print $form->selectarray("type",$liv);
print '</td></tr>';
print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php
index a28f3ee4b0d6f09e258c619fe1ceea1f89e39e29..46c95b95aa413b8df11fd1db768d979e962c3a08 100644
--- a/htdocs/fourn/commande/history.php
+++ b/htdocs/fourn/commande/history.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'commande_fournisseur', $id,'');
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$now=gmmktime();
@@ -78,7 +78,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index efef39c24b7f96c1a0570c032b14e72e6e87cbc1..9fa487512ee8ec9cdea57fec1a99e02ff78d3fa9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -62,7 +62,7 @@ if ($_POST["action"] == 'updatenote' && $user->rights->fournisseur->commande->cr
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
-$html = new Form($db);
+$form = new Form($db);
/* *************************************************************************** */
/* */
@@ -104,7 +104,7 @@ if ($id > 0 || ! empty($ref))
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 25274ccf72dc75b027b9d70e82a868a3990ca7b0..2b5ccbf7cc34aa5adf1d24997f9c2afce2c49439 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -114,7 +114,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->fournisseur->facture->cree
llxHeader('', $langs->trans("Bill"), "Facture");
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -146,7 +146,7 @@ if ($id > 0)
// Reference du facture
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref);
print "</td></tr>";
// Ref supplier
@@ -200,7 +200,7 @@ if ($id > 0)
print '<td colspan="1">';
//$userAlreadySelected = $facture->getListContactId('internal'); // On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
- $html->select_users($user->id,'contactid',0,$userAlreadySelected);
+ $form->select_users($user->id,'contactid',0,$userAlreadySelected);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($facture, '', 'type','internal');
@@ -230,7 +230,7 @@ if ($id > 0)
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index b0c0ab10a2e93e2f3de6826df4766ee45a7a498d..e91bd47a35c19a3682c9fa091ff2bcb95f797eb0 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -119,7 +119,7 @@ if ($action=='delete')
* Affichage
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader();
@@ -150,7 +150,7 @@ if ($facid > 0)
// Ref
print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref);
print '</td>';
print "</tr>\n";
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 4298fcb8598a4efc438682d2047e04c4996a557e..3297961786b0a34e0671f040cb1fec3aba100744 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -855,7 +855,7 @@ if ($action == 'remove_file')
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
llxHeader('','','');
@@ -943,7 +943,7 @@ if ($action == 'create')
}
else
{
- $html->select_societes((empty($_GET['socid'])?'':$_GET['socid']),'socid','s.fournisseur = 1',1);
+ $form->select_societes((empty($_GET['socid'])?'':$_GET['socid']),'socid','s.fournisseur = 1',1);
}
print '</td>';
@@ -958,7 +958,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="0"'.($_POST['type']==0?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -967,7 +967,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="3"'.($_POST['type']==3?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -977,7 +977,7 @@ if ($action == 'create')
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="4"'.($_POST['type']==4?' checked="checked"':'').'>';
print '</td><td valign="middle">';
- $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1);
print $desc;
print '</td></tr>'."\n";
}
@@ -1002,7 +1002,7 @@ if ($action == 'create')
$text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
}
$text.='</select>';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
print $desc;
print '</td></tr>';
@@ -1027,7 +1027,7 @@ if ($action == 'create')
$text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
}
$text.='</select>';
- $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+ $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
//.' ('.$langs->trans("FeatureNotYetAvailable").')',$langs->transnoentities("InvoiceAvoirDesc"),1);
print $desc;
print '</td></tr>'."\n";
@@ -1040,12 +1040,12 @@ if ($action == 'create')
// Date invoice
print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td>';
- $html->select_date($dateinvoice,'','','','',"add",1,1);
+ $form->select_date($dateinvoice,'','','','',"add",1,1);
print '</td></tr>';
// Due date
print '<tr><td>'.$langs->trans('DateMaxPayment').'</td><td>';
- $html->select_date($datedue,'ech','','','',"add",1,1);
+ $form->select_date($datedue,'ech','','','',"add",1,1);
print '</td></tr>';
print '<tr><td>'.$langs->trans('NotePublic').'</td>';
@@ -1101,7 +1101,7 @@ if ($action == 'create')
print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
print '<td align="right"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
print '<td align="right">';
- print $html->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
+ print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
print '</td>';
print '<td align="right"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td>';
print '<td align="right"><input type="text" size="8" name="amountttc'.$i.'" value=""></td></tr>';
@@ -1147,7 +1147,7 @@ else
// Confirmation de la suppression d'une ligne produit
if ($action == 'confirm_delete_line')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?facid='.$fac->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline', '', 1, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?facid='.$fac->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline', '', 1, 1);
if ($ret == 'html') print '<br>';
}
@@ -1160,21 +1160,21 @@ else
//array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1)
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?facid='.$fac->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$fac->ref),'confirm_clone',$formquestion,'yes', 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?facid='.$fac->id,$langs->trans('CloneInvoice'),$langs->trans('ConfirmCloneInvoice',$fac->ref),'confirm_clone',$formquestion,'yes', 1);
if ($ret == 'html') print '<br>';
}
// Confirmation de la validation
if ($action == 'valid')
{
- $ret=$html->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('ValidateBill'), $langs->trans('ConfirmValidateBill', $fac->ref), 'confirm_valid', '', 0, 1);
+ $ret=$form->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('ValidateBill'), $langs->trans('ConfirmValidateBill', $fac->ref), 'confirm_valid', '', 0, 1);
if ($ret == 'html') print '<br>';
}
// Confirmation set paid
if ($action == 'paid')
{
- $ret=$html->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $fac->ref), 'confirm_paid', '', 0, 1);
+ $ret=$form->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $fac->ref), 'confirm_paid', '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -1183,7 +1183,7 @@ else
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
+ $ret=$form->form_confirm('fiche.php?facid='.$fac->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -1195,13 +1195,13 @@ else
// Ref
print '<tr><td nowrap="nowrap" width="20%">'.$langs->trans("Ref").'</td><td colspan="4">';
- print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
print '</td>';
print "</tr>\n";
// Ref supplier
- print '<tr><td>'.$html->editfieldkey("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="4">';
- print $html->editfieldval("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer));
+ print '<tr><td>'.$form->editfieldkey("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="4">';
+ print $form->editfieldval("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer));
print '</td></tr>';
// Third party
@@ -1250,8 +1250,8 @@ else
// Label
- print '<tr><td>'.$html->editfieldkey("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="3">';
- print $html->editfieldval("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer));
+ print '<tr><td>'.$form->editfieldkey("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).'</td><td colspan="3">';
+ print $form->editfieldval("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer));
print '</td>';
/*
@@ -1333,13 +1333,13 @@ else
print '</tr>';
// Date
- print '<tr><td>'.$html->editfieldkey("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).'</td><td colspan="3">';
- print $html->editfieldval("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day');
+ print '<tr><td>'.$form->editfieldkey("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).'</td><td colspan="3">';
+ print $form->editfieldval("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day');
print '</td>';
// Due date
- print '<tr><td>'.$html->editfieldkey("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).'</td><td colspan="3">';
- print $html->editfieldval("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day');
+ print '<tr><td>'.$form->editfieldkey("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).'</td><td colspan="3">';
+ print $form->editfieldval("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day');
print '</td>';
// Status
@@ -1388,11 +1388,11 @@ else
print '</td><td colspan="3">';
if ($action == 'classify')
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->fk_project,'projectid');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->fk_project,'projectid');
}
else
{
- $html->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->fk_project,'none');
+ $form->form_project($_SERVER['PHP_SELF'].'?facid='.$fac->id,$fac->socid,$fac->fk_project,'none');
}
print '</td>';
print '</tr>';
@@ -1455,7 +1455,7 @@ else
}
else
{
- print $html->select_type_of_lines($fac->lines[$i]->product_type,'type',1);
+ print $form->select_type_of_lines($fac->lines[$i]->product_type,'type',1);
if ($conf->product->enabled && $conf->service->enabled) print '<br>';
}
@@ -1469,7 +1469,7 @@ else
// VAT
print '<td align="right">';
- print $html->load_tva('tauxtva',$fac->lines[$i]->tva_tx,$societe,$mysoc);
+ print $form->load_tva('tauxtva',$fac->lines[$i]->tva_tx,$societe,$mysoc);
print '</td>';
// Unit price
@@ -1504,7 +1504,7 @@ else
$text=$product_static->getNomUrl(1);
$text.= ' - '.$product_static->libelle;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($fac->lines[$i]->description));
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
// Show range
print_date_range($fac->lines[$i]->date_start,$fac->lines[$i]->date_end);
@@ -1585,7 +1585,7 @@ else
print '<td>';
$forceall=1; // For suppliers, we always show all types
- print $html->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
+ print $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
if ($forceall || ($conf->product->enabled && $conf->service->enabled)
|| (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
@@ -1598,7 +1598,7 @@ else
print '</td>';
print '<td align="right">';
- print $html->load_tva('tauxtva',($_POST["tauxtva"]?$_POST["tauxtva"]:-1),$societe,$mysoc);
+ print $form->load_tva('tauxtva',($_POST["tauxtva"]?$_POST["tauxtva"]:-1),$societe,$mysoc);
print '</td>';
print '<td align="right">';
print '<input size="4" name="amount" type="text">';
@@ -1642,7 +1642,7 @@ else
$var=! $var;
print '<tr '.$bc[$var].'>';
print '<td colspan="4">';
- $html->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre);
+ $form->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre);
print '</td>';
print '<td align="right"><input type="text" name="qty" value="1" size="1"></td>';
print '<td> </td>';
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 0fe0af9422c7acd77a3f66e9688e26a42afdb2fc..8059b2f75ea04408c577bb0606ba3d6577eaec9e 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -95,7 +95,7 @@ if ($mode == 'search')
*/
$now=gmmktime();
-$html=new Form($db);
+$form=new Form($db);
$htmlother=new FormOther($db);
llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index ea40e32c645abc00edf33e842e8698ee1c0e36b6..b8809771abc881a153eec0bb249b7136d046ec2c 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -84,7 +84,7 @@ if ($_POST["action"] == 'update' && $user->rights->fournisseur->facture->creer)
* View
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader();
@@ -101,7 +101,7 @@ if ($_GET["facid"])
// Ref
print '<tr><td width="20%" nowrap="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
print '</td>';
print "</tr>\n";
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 6ec8bf2654ab6029864c5148c55fa83bf16afb46..04171f596a5a67baeb5552fa495cb77e508ff34d 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -179,7 +179,7 @@ $invoicesupplierstatic = new FactureFournisseur($db);
llxHeader();
-$html=new Form($db);
+$form=new Form($db);
if ($action == 'create' || $action == 'add_paiement')
{
@@ -228,11 +228,11 @@ if ($action == 'create' || $action == 'add_paiement')
print $supplierstatic->getNomUrl(1,'supplier');
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
- $html->select_date($dateinvoice,'','','','',"addpaiement",1,1);
+ $form->select_date($dateinvoice,'','','','',"addpaiement",1,1);
print '</td>';
print '<td>'.$langs->trans('Comments').'</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
- $html->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid');
+ $form->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid');
print '</td>';
print '<td rowspan="3" valign="top">';
print '<textarea name="comment" wrap="soft" cols="60" rows="'._ROWS_3.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td></tr>';
@@ -240,7 +240,7 @@ if ($action == 'create' || $action == 'add_paiement')
if ($conf->banque->enabled)
{
print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
- $html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2);
+ $form->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2);
print '</td></tr>';
}
else
@@ -438,10 +438,10 @@ if (! $_GET['action'] && ! $_POST['action'])
print '<input class="fat" type="text" size="6" name="search_company" value="'.$_REQUEST["search_company"].'">';
print '</td>';
print '<td>';
- $html->select_types_paiements($_REQUEST["search_paymenttype"],'search_paymenttype','',2,1,1);
+ $form->select_types_paiements($_REQUEST["search_paymenttype"],'search_paymenttype','',2,1,1);
print '</td>';
print '<td>';
- $html->select_comptes($_REQUEST["search_account"],'search_account',0,'',1);
+ $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1);
print '</td>';
print '<td align="right">';
print '<input class="fat" type="text" size="4" name="search_amount" value="'.$_REQUEST["search_amount"].'">';
diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php
index 566925423650cffac08d78e5d537238a6553721f..0f65dac448cf77ad4ddf9f5dcdcd18300c56212c 100644
--- a/htdocs/fourn/paiement/fiche.php
+++ b/htdocs/fourn/paiement/fiche.php
@@ -138,7 +138,7 @@ if ($action == 'setdate' && !empty($_POST['dateday']))
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$h=0;
@@ -163,7 +163,7 @@ if ($result > 0)
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete');
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete');
if ($ret == 'html') print '<br>';
}
@@ -172,7 +172,7 @@ if ($result > 0)
*/
if ($action == 'valide')
{
- $ret=$html->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
+ $ret=$form->form_confirm('fiche.php?id='.$paiement->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
if ($ret == 'html') print '<br>';
}
@@ -182,16 +182,16 @@ if ($result > 0)
print '<td valign="top" width="20%" colspan="2">'.$langs->trans('Ref').'</td><td colspan="3">'.$paiement->id.'</td></tr>';
// Date payment
- print '<tr><td valign="top" colspan="2">'.$html->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
- print $html->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'day');
+ print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'day');
print '</td></tr>';
// Payment mode
print '<tr><td valign="top" colspan="2">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$paiement->type_libelle.'</td></tr>';
// Payment numero
- print '<tr><td valign="top" colspan="2">'.$html->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
- print $html->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
+ print '<tr><td valign="top" colspan="2">'.$form->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string');
print '</td></tr>';
// Amount
@@ -203,8 +203,8 @@ if ($result > 0)
}
// Note
- print '<tr><td valign="top"" colspan="2">'.$html->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
- print $html->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer,'text');
+ print '<tr><td valign="top"" colspan="2">'.$form->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
+ print $form->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer,'text');
print '</td></tr>';
// Bank account
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 1f14a967de88faedcde450ad27b25d179848d2f6..5fd717a6b47c583dccc3cfecfa073587fd5ba805 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -79,7 +79,7 @@ $objimport->load_arrays($user,($step==1?'':$datatoimport));
$objmodelimport=new ModeleImports();
-$html = new Form($db);
+$form = new Form($db);
$htmlother = new FormOther($db);
$formfile = new FormFile($db);
@@ -421,7 +421,7 @@ if ($step == 2 && $datatoimport)
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_picto_common($key,$objmodelimport->getPicto($key)).'</td>';
$text=$objmodelimport->getDriverDesc($key);
- print '<td>'.$html->textwithpicto($objmodelimport->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabel($key),$text).'</td>';
print '<td align="center"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a></td>';
// Action button
print '<td align="right">';
@@ -478,7 +478,7 @@ if ($step == 3 && $datatoimport)
print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print '</td><td align="right" nowrap="nowrap" width="100"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>';
print '</td></tr>';
@@ -679,7 +679,7 @@ if ($step == 4 && $datatoimport)
print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print '</td></tr>';
// File to import
@@ -838,7 +838,7 @@ if ($step == 4 && $datatoimport)
}
$htmltext.=$langs->trans("FieldTitle").": <b>".$langs->trans($newlabel)."</b><br>";
$htmltext.=$langs->trans("Table")." -> ".$langs->trans("Field").': <b>'.$tablename." -> ".preg_replace('/^.*\./','',$code)."</b><br>";
- print $html->textwithpicto($more,$htmltext);
+ print $form->textwithpicto($more,$htmltext);
print '</td>';
print '</tr>';
@@ -1087,7 +1087,7 @@ if ($step == 5 && $datatoimport)
print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print '</td></tr>';
// File to import
@@ -1413,7 +1413,7 @@ if ($step == 6 && $datatoimport)
print '<tr><td width="25%">'.$langs->trans("SourceFileFormat").'</td>';
print '<td>';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print '</td></tr>';
// File to import
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index d24a8eb1854148e4cf4b1a86b590fa35e1eb08a8..b4f4476faf25b63c45c5f618ba619afc62a30815 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -37,7 +37,7 @@ $import->load_arrays($user);
* View
*/
-$html=new Form($db);
+$form=new Form($db);
llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones');
@@ -71,7 +71,7 @@ foreach($liste as $key)
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).'</td>';
$text=$model->getDriverDesc($key);
- print '<td>'.$html->textwithpicto($model->getDriverLabel($key),$text).'</td>';
+ print '<td>'.$form->textwithpicto($model->getDriverLabel($key),$text).'</td>';
print '<td>'.$model->getLibLabel($key).'</td>';
print '<td nowrap="nowrap" align="right">'.$model->getLibVersion($key).'</td>';
print '</tr>';
diff --git a/htdocs/includes/nusoap/lib/Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php
index 2cab8aa05289891df77724a580976ac6001cb2a9..55b32be55b1fa14727b6e3886973d8f1eea601aa 100755
--- a/htdocs/includes/nusoap/lib/Mail/mime.php
+++ b/htdocs/includes/nusoap/lib/Mail/mime.php
@@ -475,16 +475,16 @@ class Mail_mime
$null = null;
$attachments = !empty($this->_parts) ? true : false;
- $html_images = !empty($this->_html_images) ? true : false;
- $html = !empty($this->_htmlbody) ? true : false;
- $text = (!$html AND !empty($this->_txtbody)) ? true : false;
+ $form_images = !empty($this->_html_images) ? true : false;
+ $form = !empty($this->_htmlbody) ? true : false;
+ $text = (!$form AND !empty($this->_txtbody)) ? true : false;
switch (true) {
case $text AND !$attachments:
$message =& $this->_addTextPart($null, $this->_txtbody);
break;
- case !$text AND !$html AND $attachments:
+ case !$text AND !$form AND $attachments:
$message =& $this->_addMixedPart();
for ($i = 0; $i < count($this->_parts); $i++) {
$this->_addAttachmentPart($message, $this->_parts[$i]);
@@ -499,7 +499,7 @@ class Mail_mime
}
break;
- case $html AND !$attachments AND !$html_images:
+ case $form AND !$attachments AND !$form_images:
if (isset($this->_txtbody)) {
$message =& $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->_txtbody);
@@ -509,7 +509,7 @@ class Mail_mime
}
break;
- case $html AND !$attachments AND $html_images:
+ case $form AND !$attachments AND $form_images:
if (isset($this->_txtbody)) {
$message =& $this->_addAlternativePart($null);
$this->_addTextPart($message, $this->_txtbody);
@@ -524,7 +524,7 @@ class Mail_mime
}
break;
- case $html AND $attachments AND !$html_images:
+ case $form AND $attachments AND !$form_images:
$message =& $this->_addMixedPart();
if (isset($this->_txtbody)) {
$alt =& $this->_addAlternativePart($message);
@@ -538,7 +538,7 @@ class Mail_mime
}
break;
- case $html AND $attachments AND $html_images:
+ case $form AND $attachments AND $form_images:
$message =& $this->_addMixedPart();
if (isset($this->_txtbody)) {
$alt =& $this->_addAlternativePart($message);
diff --git a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php
index 65852f2304f9332d2bdd3d69a936416ba9142dd2..6a155c19396353584e19b5b82b01315ee8891323 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/tcpdf.php
@@ -73,7 +73,7 @@
// dullus for text Justification.
// Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
// Patrick Benny for text stretch suggestion on Cell().
-// Johannes G�ntert for JavaScript support.
+// Johannes G�ntert for JavaScript support.
// Denis Van Nuffelen for Dynamic Form.
// Jacek Czekaj for multibyte justification
// Anthony Ferrara for the reintroduction of legacy image methods.
@@ -84,7 +84,7 @@
// Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
// Moritz Wagner and Andreas Wurmser for graphic functions.
// Andrew Whitehead for core fonts support.
-// Esteban Jo�l Mar�n for OpenType font conversion.
+// Esteban Jo�l Mar�n for OpenType font conversion.
// Teus Hagen for several suggestions and fixes.
// Yukihiro Nakadaira for CID-0 CJK fonts fixes.
// Kosmas Papachristos for some CSS improvements.
@@ -1029,7 +1029,7 @@ class TCPDF {
* @access protected
* @since 4.0.021 (2008-08-24)
*/
- protected $htmlvspace = 0;
+ protected $formvspace = 0;
/**
* Array of Spot colors
@@ -1129,14 +1129,14 @@ class TCPDF {
* @access protected
* @since 4.4.003 (2008-12-09)
*/
- protected $htmlLinkColorArray = array(0, 0, 255);
+ protected $formLinkColorArray = array(0, 0, 255);
/**
* Default font style to add to html links
* @access protected
* @since 4.4.003 (2008-12-09)
*/
- protected $htmlLinkFontStyle = 'U';
+ protected $formLinkFontStyle = 'U';
/**
* Counts the number of pages.
@@ -6322,7 +6322,7 @@ class TCPDF {
* @param float $cellpadding Internal cell padding, if empty uses default cell padding.
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Alexander Escalona Fern�ndez, Nicola Asuni
+ * @author Alexander Escalona Fern�ndez, Nicola Asuni
* @access public
* @since 4.5.011
*/
@@ -6426,7 +6426,7 @@ class TCPDF {
* @param float $cellpadding Internal cell padding, if empty uses default cell padding.
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Nicola Asuni, Alexander Escalona Fern�ndez
+ * @author Nicola Asuni, Alexander Escalona Fern�ndez
* @access public
*/
public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@@ -12597,7 +12597,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param float $x1 Abscissa of control point 1.
* @param float $y1 Ordinate of control point 1.
@@ -12613,7 +12613,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param float $x2 Abscissa of control point 2.
* @param float $y2 Ordinate of control point 2.
@@ -12627,7 +12627,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param float $x1 Abscissa of control point 1.
* @param float $y1 Ordinate of control point 1.
@@ -14021,7 +14021,7 @@ class TCPDF {
* Adds a javascript
* @param string $script Javascript code
* @access public
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes G�ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
public function IncludeJS($script) {
@@ -14046,7 +14046,7 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @access protected
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes G�ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _putjavascript() {
@@ -15784,7 +15784,7 @@ class TCPDF {
* @param array $col1 first color (Grayscale, RGB or CMYK components).
* @param array $col2 second color (Grayscale, RGB or CMYK components).
* @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @access public
*/
@@ -15802,7 +15802,7 @@ class TCPDF {
* @param array $col1 first color (Grayscale, RGB or CMYK components).
* @param array $col2 second color (Grayscale, RGB or CMYK components).
* @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @access public
*/
@@ -15825,7 +15825,7 @@ class TCPDF {
* @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @access public
*/
@@ -15910,7 +15910,7 @@ class TCPDF {
* @param float $y ordinate of the top left corner of the rectangle.
* @param float $w width of the rectangle.
* @param float $h height of the rectangle.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @access protected
*/
@@ -17279,19 +17279,19 @@ class TCPDF {
// remove empty blocks
$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
// replace media type parenthesis
- $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
- $cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
+ $cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
// trim string
$cssdata = trim($cssdata);
// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
$cssblocks = array();
$matches = array();
- if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
+ if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
foreach ($matches[1] as $key => $type) {
$cssblocks[$type] = $matches[2][$key];
}
// remove media blocks
- $cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
}
// keep 'all' and 'print' media, other media types are discarded
if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
@@ -17855,25 +17855,25 @@ class TCPDF {
/**
* Returns the HTML DOM array.
- * @param string $html html code
+ * @param string $form html code
* @return array
* @access protected
* @since 3.2.000 (2008-06-20)
*/
- protected function getHtmlDomArray($html) {
+ protected function getHtmlDomArray($form) {
// array of CSS styles ( selector => properties).
$css = array();
// get CSS array defined at previous call
$matches = array();
- if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) {
if (isset($matches[1][0])) {
$css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0])));
}
- $html = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $html);
+ $form = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $form);
}
// extract external CSS files
$matches = array();
- if (preg_match_all('/<link([^\>]*)>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<link([^\>]*)>/isU', $form, $matches) > 0) {
foreach ($matches[1] as $key => $link) {
$type = array();
if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
@@ -17894,7 +17894,7 @@ class TCPDF {
}
// extract style tags
$matches = array();
- if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $form, $matches) > 0) {
foreach ($matches[1] as $key => $media) {
$type = array();
preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
@@ -17909,90 +17909,90 @@ class TCPDF {
// create a special tag to contain the CSS array (used for table content)
$csstagarray = '<cssarray>'.htmlentities(serialize($css)).'</cssarray>';
// remove head and style blocks
- $html = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $html);
- $html = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $html);
+ $form = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $form);
+ $form = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $form);
// define block tags
$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
// define self-closing tags
$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
// remove all unsupported tags (the line below lists all supported tags)
- $html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
+ $form = strip_tags($form, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
//replace some blank characters
- $html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
- $html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
- $html = preg_replace('@(\r\n|\r)@', "\n", $html);
+ $form = preg_replace('/<pre/', '<xre', $form); // preserve pre tag
+ $form = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $form);
+ $form = preg_replace('@(\r\n|\r)@', "\n", $form);
$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
- $html = strtr($html, $repTable);
+ $form = strtr($form, $repTable);
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</pre>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 6));
- while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html_b)) {
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</pre>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 6));
+ while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $form_b)) {
// preserve newlines on <pre> tag
- $html_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $html_b);
+ $form_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $form_b);
}
- while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $html_b)) {
+ while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $form_b)) {
// preserve spaces on <pre> tag
- $html_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2 \\3</pre>", $html_b);
+ $form_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2 \\3</pre>", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 6);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 6);
+ $offset = strlen($form_a.$form_b);
}
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</textarea>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 11));
- while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $html_b)) {
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</textarea>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 11));
+ while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $form_b)) {
// preserve newlines on <textarea> tag
- $html_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $html_b);
- $html_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $html_b);
+ $form_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $form_b);
+ $form_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 11);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 11);
+ $offset = strlen($form_a.$form_b);
}
- $html = preg_replace('/([\s]*)<option/si', '<option', $html);
- $html = preg_replace('/<\/option>([\s]*)/si', '</option>', $html);
+ $form = preg_replace('/([\s]*)<option/si', '<option', $form);
+ $form = preg_replace('/<\/option>([\s]*)/si', '</option>', $form);
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 9));
- while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $html_b)) {
- $html_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $html_b);
- $html_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $html_b);
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</option>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 9));
+ while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $form_b)) {
+ $form_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $form_b);
+ $form_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 9);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 9);
+ $offset = strlen($form_a.$form_b);
}
- if (preg_match("'</select'si", $html)) {
- $html = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $html);
- $html = preg_replace("'#!NwL!#</select>'si", "\" />", $html);
+ if (preg_match("'</select'si", $form)) {
+ $form = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $form);
+ $form = preg_replace("'#!NwL!#</select>'si", "\" />", $form);
}
- $html = str_replace("\n", ' ', $html);
+ $form = str_replace("\n", ' ', $form);
// restore textarea newlines
- $html = str_replace('<TBR>', "\n", $html);
+ $form = str_replace('<TBR>', "\n", $form);
// remove extra spaces from code
- $html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $html);
- $html = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $html);
- $html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
- $html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
- $html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $html);
- $html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html);
- $html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
- $html = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $html);
- $html = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1> </li>', $html);
- $html = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1"> </font><img', $html);
- $html = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1> ', $html); // preserve some spaces
- $html = preg_replace('/[\s]<\/([^\>]*)>/', ' </\\1>', $html); // preserve some spaces
- $html = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $html); // replace multiple spaces with a single space
+ $form = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $form);
+ $form = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $form);
+ $form = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $form);
+ $form = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $form);
+ $form = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $form);
+ $form = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $form);
+ $form = preg_replace('/<xre/', '<pre', $form); // restore pre tag
+ $form = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $form);
+ $form = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1> </li>', $form);
+ $form = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1"> </font><img', $form);
+ $form = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1> ', $form); // preserve some spaces
+ $form = preg_replace('/[\s]<\/([^\>]*)>/', ' </\\1>', $form); // preserve some spaces
+ $form = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $form); // replace multiple spaces with a single space
// trim string
- $html = $this->stringTrim($html);
+ $form = $this->stringTrim($form);
// pattern for generic tag
$tagpattern = '/(<[^>]+>)/';
// explodes the string
- $a = preg_split($tagpattern, $html, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+ $a = preg_split($tagpattern, $form, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
// count elements
$maxel = count($a);
$elkey = 0;
@@ -18643,7 +18643,7 @@ class TCPDF {
* @param float $h Cell minimum height. The cell extends automatically if needed.
* @param float $x upper-left corner X coordinate
* @param float $y upper-left corner Y coordinate
- * @param string $html html text to print. Default value: empty string.
+ * @param string $form html text to print. Default value: empty string.
* @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
@@ -18655,15 +18655,15 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @uses MultiCell()
* @see Multicell(), writeHTML()
*/
- public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
- return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0);
+ public function writeHTMLCell($w, $h, $x, $y, $form='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
+ return $this->MultiCell($w, $h, $form, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0);
}
/**
* Allows to preserve some HTML formatting (limited support).<br />
* IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
* Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
- * @param string $html text to display
+ * @param string $form text to display
* @param boolean $ln if true add a new line after text (default = true)
* @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
* @param boolean $reseth if true reset the last cell height (default false).
@@ -18671,7 +18671,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
* @access public
*/
- public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
+ public function writeHTML($form, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
$gvars = $this->getGraphicVars();
// store current values
$prev_cell_margin = $this->cell_margin;
@@ -18760,7 +18760,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// reset row height
$this->resetLastH();
}
- $dom = $this->getHtmlDomArray($html);
+ $dom = $this->getHtmlDomArray($form);
$maxel = count($dom);
$key = 0;
while ($key < $maxel) {
@@ -18783,7 +18783,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// store current object
$this->startTransaction();
// save this method vars
- $this_method_vars['html'] = $html;
+ $this_method_vars['html'] = $form;
$this_method_vars['ln'] = $ln;
$this_method_vars['fill'] = $fill;
$this_method_vars['reseth'] = $reseth;
@@ -21602,7 +21602,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
/**
* Convert HTML string containing value and unit of measure to user's units or points.
- * @param string $htmlval string containing values and unit
+ * @param string $formval string containing values and unit
* @param string $refsize reference value in points
* @param string $defaultunit default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
* @param boolean $point if true returns points, otherwise returns value in user's units
@@ -21610,7 +21610,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @access public
* @since 4.4.004 (2008-12-10)
*/
- public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
+ public function getHTMLUnitToUnits($formval, $refsize=1, $defaultunit='px', $points=false) {
$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
$retval = 0;
$value = 0;
@@ -21622,11 +21622,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (in_array($defaultunit, $supportedunits)) {
$unit = $defaultunit;
}
- if (is_numeric($htmlval)) {
- $value = floatval($htmlval);
- } elseif (preg_match('/([0-9\.\-\+]+)/', $htmlval, $mnum)) {
+ if (is_numeric($formval)) {
+ $value = floatval($formval);
+ } elseif (preg_match('/([0-9\.\-\+]+)/', $formval, $mnum)) {
$value = floatval($mnum[1]);
- if (preg_match('/([a-z%]+)/', $htmlval, $munit)) {
+ if (preg_match('/([a-z%]+)/', $formval, $munit)) {
if (in_array($munit[1], $supportedunits)) {
$unit = $munit[1];
}
@@ -22826,8 +22826,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$page_first = $this->getPage();
// get the font type used for numbers in each template
$current_font = $this->FontFamily;
- foreach ($templates as $level => $html) {
- $dom = $this->getHtmlDomArray($html);
+ foreach ($templates as $level => $form) {
+ $dom = $this->getHtmlDomArray($form);
foreach ($dom as $key => $value) {
if ($value['value'] == '#TOC_PAGE_NUMBER#') {
$this->SetFont($dom[($key - 1)]['fontname']);
@@ -24908,7 +24908,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
break;
}
- case 'Q': { // quadratic B�zier curveto
+ case 'Q': { // quadratic B�zier curveto
foreach ($params as $ck => $cp) {
$params[$ck] = $cp;
if ((($ck + 1) % 4) == 0) {
@@ -24934,7 +24934,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
break;
}
- case 'T': { // shorthand/smooth quadratic B�zier curveto
+ case 'T': { // shorthand/smooth quadratic B�zier curveto
foreach ($params as $ck => $cp) {
$params[$ck] = $cp;
if (($ck % 2) != 0) {
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php b/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
index 3e7a9b15ee322f99327426117c0332fb4b753966..5bbea59da59f9839d010e49f23b4f5953adc01c5 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/HTML.php
@@ -302,21 +302,21 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
// Construct HTML
- $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
- $html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
- $html .= '<html>' . PHP_EOL;
- $html .= ' <head>' . PHP_EOL;
- $html .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
- $html .= ' <title>' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . '</title>' . PHP_EOL;
+ $form = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
+ $form .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
+ $form .= '<html>' . PHP_EOL;
+ $form .= ' <head>' . PHP_EOL;
+ $form .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
+ $form .= ' <title>' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . '</title>' . PHP_EOL;
if ($pIncludeStyles) {
- $html .= $this->generateStyles(true);
+ $form .= $this->generateStyles(true);
}
- $html .= ' </head>' . PHP_EOL;
- $html .= '' . PHP_EOL;
- $html .= ' <body>' . PHP_EOL;
+ $form .= ' </head>' . PHP_EOL;
+ $form .= '' . PHP_EOL;
+ $form .= ' <body>' . PHP_EOL;
// Return
- return $html;
+ return $form;
}
/**
@@ -345,13 +345,13 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
// Construct HTML
- $html = '';
+ $form = '';
// Loop all sheets
$sheetId = 0;
foreach ($sheets as $sheet) {
// Write table header
- $html .= $this->_generateTableHeader($sheet);
+ $form .= $this->_generateTableHeader($sheet);
// Get worksheet dimension
$dimension = explode(':', $sheet->calculateWorksheetDimension());
@@ -384,12 +384,12 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
while($row++ < $rowMax) {
// <thead> ?
if ($row == $theadStart) {
- $html .= ' <thead>' . PHP_EOL;
+ $form .= ' <thead>' . PHP_EOL;
}
// <tbody> ?
if ($row == $tbodyStart) {
- $html .= ' <tbody>' . PHP_EOL;
+ $form .= ' <tbody>' . PHP_EOL;
}
// Write row if there are HTML table cells in it
@@ -406,27 +406,27 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
$rowData[$column] = '';
}
}
- $html .= $this->_generateRow($sheet, $rowData, $row - 1);
+ $form .= $this->_generateRow($sheet, $rowData, $row - 1);
}
// </thead> ?
if ($row == $theadEnd) {
- $html .= ' </thead>' . PHP_EOL;
+ $form .= ' </thead>' . PHP_EOL;
}
// </tbody> ?
if ($row == $tbodyEnd) {
- $html .= ' </tbody>' . PHP_EOL;
+ $form .= ' </tbody>' . PHP_EOL;
}
}
// Write table footer
- $html .= $this->_generateTableFooter();
+ $form .= $this->_generateTableFooter();
// Writing PDF?
if ($this->_isPdf) {
if (is_null($this->_sheetIndex) && $sheetId + 1 < $this->_phpExcel->getSheetCount()) {
- $html .= '<div style="page-break-before:always" />';
+ $form .= '<div style="page-break-before:always" />';
}
}
@@ -435,7 +435,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
// Return
- return $html;
+ return $form;
}
/**
@@ -460,24 +460,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
// Construct HTML
- $html = '';
+ $form = '';
// Only if there are more than 1 sheets
if (count($sheets) > 1) {
// Loop all sheets
$sheetId = 0;
- $html .= '<ul class="navigation">' . PHP_EOL;
+ $form .= '<ul class="navigation">' . PHP_EOL;
foreach ($sheets as $sheet) {
- $html .= ' <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+ $form .= ' <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
++$sheetId;
}
- $html .= '</ul>' . PHP_EOL;
+ $form .= '</ul>' . PHP_EOL;
}
- return $html;
+ return $form;
}
/**
@@ -490,7 +490,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
*/
private function _writeImageTagInCell(PHPExcel_Worksheet $pSheet, $coordinates) {
// Construct HTML
- $html = '';
+ $form = '';
// Write images
foreach ($pSheet->getDrawingCollection() as $drawing) {
@@ -514,14 +514,14 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
// Convert UTF8 data to PCDATA
$filename = htmlspecialchars($filename);
- $html .= PHP_EOL;
- $html .= ' <img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
+ $form .= PHP_EOL;
+ $form .= ' <img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
}
}
}
// Return
- return $html;
+ return $form;
}
/**
@@ -541,28 +541,28 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
$css = $this->buildCSS($generateSurroundingHTML);
// Construct HTML
- $html = '';
+ $form = '';
// Start styles
if ($generateSurroundingHTML) {
- $html .= ' <style type="text/css">' . PHP_EOL;
- $html .= ' html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
+ $form .= ' <style type="text/css">' . PHP_EOL;
+ $form .= ' html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
}
// Write all other styles
foreach ($css as $styleName => $styleDefinition) {
if ($styleName != 'html') {
- $html .= ' ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+ $form .= ' ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
}
}
// End styles
if ($generateSurroundingHTML) {
- $html .= ' </style>' . PHP_EOL;
+ $form .= ' </style>' . PHP_EOL;
}
// Return
- return $html;
+ return $form;
}
/**
@@ -852,12 +852,12 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
*/
public function generateHTMLFooter() {
// Construct HTML
- $html = '';
- $html .= ' </body>' . PHP_EOL;
- $html .= '</html>' . PHP_EOL;
+ $form = '';
+ $form .= ' </body>' . PHP_EOL;
+ $form .= '</html>' . PHP_EOL;
// Return
- return $html;
+ return $form;
}
/**
@@ -871,19 +871,19 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
// Construct HTML
- $html = '';
+ $form = '';
if (!$this->_useInlineCss) {
$gridlines = $pSheet->getShowGridLines() ? ' gridlines' : '';
- $html .= ' <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+ $form .= ' <table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
} else {
$style = isset($this->_cssStyles['table']) ?
$this->_assembleCSS($this->_cssStyles['table']) : '';
if ($this->_isPdf && $pSheet->getShowGridLines()) {
- $html .= ' <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+ $form .= ' <table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
} else {
- $html .= ' <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+ $form .= ' <table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
}
}
@@ -892,16 +892,16 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
$i = -1;
while($i++ < $highestColumnIndex) {
if (!$this->_useInlineCss) {
- $html .= ' <col class="col' . $i . '">' . PHP_EOL;
+ $form .= ' <col class="col' . $i . '">' . PHP_EOL;
} else {
$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
- $html .= ' <col style="' . $style . '">' . PHP_EOL;
+ $form .= ' <col style="' . $style . '">' . PHP_EOL;
}
}
// Return
- return $html;
+ return $form;
}
/**
@@ -911,11 +911,11 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
*/
private function _generateTableFooter() {
// Construct HTML
- $html = '';
- $html .= ' </table>' . PHP_EOL;
+ $form = '';
+ $form .= ' </table>' . PHP_EOL;
// Return
- return $html;
+ return $form;
}
/**
@@ -930,7 +930,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
private function _generateRow(PHPExcel_Worksheet $pSheet, $pValues = null, $pRow = 0) {
if (is_array($pValues)) {
// Construct HTML
- $html = '';
+ $form = '';
// Sheet index
$sheetIndex = $pSheet->getParent()->getIndex($pSheet);
@@ -942,24 +942,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
// check if a break is needed before this row
if (isset($breaks['A' . $pRow])) {
// close table: </table>
- $html .= $this->_generateTableFooter();
+ $form .= $this->_generateTableFooter();
// insert page break
- $html .= '<div style="page-break-before:always" />';
+ $form .= '<div style="page-break-before:always" />';
// open table again: <table> + <col> etc.
- $html .= $this->_generateTableHeader($pSheet);
+ $form .= $this->_generateTableHeader($pSheet);
}
}
// Write row start
if (!$this->_useInlineCss) {
- $html .= ' <tr class="row' . $pRow . '">' . PHP_EOL;
+ $form .= ' <tr class="row' . $pRow . '">' . PHP_EOL;
} else {
$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
- $html .= ' <tr style="' . $style . '">' . PHP_EOL;
+ $form .= ' <tr style="' . $style . '">' . PHP_EOL;
}
// Write cells
@@ -1085,9 +1085,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
// Write
if ($writeCell) {
// Column start
- $html .= ' <td';
+ $form .= ' <td';
if (!$this->_useInlineCss) {
- $html .= ' class="' . $cssClass . '"';
+ $form .= ' class="' . $cssClass . '"';
} else {
//** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
// We must explicitly write the width of the <td> element because TCPDF
@@ -1110,24 +1110,24 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
//** end of redundant code **
- $html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
+ $form .= ' style="' . $this->_assembleCSS($cssClass) . '"';
}
if ($colSpan > 1) {
- $html .= ' colspan="' . $colSpan . '"';
+ $form .= ' colspan="' . $colSpan . '"';
}
if ($rowSpan > 1) {
- $html .= ' rowspan="' . $rowSpan . '"';
+ $form .= ' rowspan="' . $rowSpan . '"';
}
- $html .= '>';
+ $form .= '>';
// Image?
- $html .= $this->_writeImageTagInCell($pSheet, $coordinate);
+ $form .= $this->_writeImageTagInCell($pSheet, $coordinate);
// Cell data
- $html .= $cellData;
+ $form .= $cellData;
// Column end
- $html .= '</td>' . PHP_EOL;
+ $form .= '</td>' . PHP_EOL;
}
// Next column
@@ -1135,10 +1135,10 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
}
// Write row end
- $html .= ' </tr>' . PHP_EOL;
+ $form .= ' </tr>' . PHP_EOL;
// Return
- return $html;
+ return $form;
} else {
throw new Exception("Invalid parameters passed.");
}
diff --git a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
index 43bd1283f8d372bfcbcfcf7dea18ebb61cb845de..2096aa839b1b1510318e9a95c42fc98b38578d5f 100644
--- a/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
+++ b/htdocs/includes/phpexcel/PHPExcel/Writer/PDF.php
@@ -233,10 +233,10 @@ class PHPExcel_Writer_PDF extends PHPExcel_Writer_HTML implements PHPExcel_Write
$this->buildCSS(true);
// Generate HTML
- $html = '';
- //$html .= $this->generateHTMLHeader(false);
- $html .= $this->generateSheetData();
- //$html .= $this->generateHTMLFooter();
+ $form = '';
+ //$form .= $this->generateHTMLHeader(false);
+ $form .= $this->generateSheetData();
+ //$form .= $this->generateHTMLFooter();
// Default PDF paper size
$paperSize = 'LETTER'; // Letter (8.5 in. by 11 in.)
@@ -283,7 +283,7 @@ class PHPExcel_Writer_PDF extends PHPExcel_Writer_HTML implements PHPExcel_Write
// Set the appropriate font
$pdf->SetFont($this->_font);
- $pdf->writeHTML($html);
+ $pdf->writeHTML($form);
// Document info
$pdf->SetTitle($this->_phpExcel->getProperties()->getTitle());
diff --git a/htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html b/htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html
index 8b9f8eadee48fceffb1cdf45763590097ae6f637..47511892e5173e98aa7812bf2c0e3ccbd86cc8e8 100644
--- a/htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html
+++ b/htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html
@@ -181,9 +181,9 @@ Source Location: /tcpdf.php<br /><br />
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$header_title">$header_title</a></li>
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$hPt">$hPt</a></li>
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$HREF">$HREF</a></li>
- <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$htmlLinkColorArray">$htmlLinkColorArray</a></li>
- <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$htmlLinkFontStyle">$htmlLinkFontStyle</a></li>
- <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$htmlvspace">$htmlvspace</a></li>
+ <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$formLinkColorArray">$formLinkColorArray</a></li>
+ <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$formLinkFontStyle">$formLinkFontStyle</a></li>
+ <li><a href="../com-tecnick-tcpdf/TCPDF.html#var$formvspace">$formvspace</a></li>
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$imagekeys">$imagekeys</a></li>
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$images">$images</a></li>
<li><a href="../com-tecnick-tcpdf/TCPDF.html#var$imgscale">$imgscale</a></li>
@@ -3204,9 +3204,9 @@ This is a PHP class for generating PDF documents without requiring external exte
</table>
</div><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br />
- <a name="var$htmlLinkColorArray"></a>
+ <a name="var$formLinkColorArray"></a>
<p></p>
- <h4>$htmlLinkColorArray = <span class="value">array(0, 0, 255)</span></h4>
+ <h4>$formLinkColorArray = <span class="value">array(0, 0, 255)</span></h4>
<p>[line 1138]</p>
Default color for html links<br /><br /><br /><br />
<h4>Tags:</h4>
@@ -3231,9 +3231,9 @@ This is a PHP class for generating PDF documents without requiring external exte
</table>
</div><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br />
- <a name="var$htmlLinkFontStyle"></a>
+ <a name="var$formLinkFontStyle"></a>
<p></p>
- <h4>$htmlLinkFontStyle = <span class="value"> 'U'</span></h4>
+ <h4>$formLinkFontStyle = <span class="value"> 'U'</span></h4>
<p>[line 1145]</p>
Default font style to add to html links<br /><br /><br /><br />
<h4>Tags:</h4>
@@ -3258,9 +3258,9 @@ This is a PHP class for generating PDF documents without requiring external exte
</table>
</div><br /><br />
<div class="top">[ <a href="#top">Top</a> ]</div><br />
- <a name="var$htmlvspace"></a>
+ <a name="var$formvspace"></a>
<p></p>
- <h4>$htmlvspace = <span class="value"> 0</span></h4>
+ <h4>$formvspace = <span class="value"> 0</span></h4>
<p>[line 1038]</p>
Count the latest inserted vertical spaces on HTML<br /><br /><br /><br />
<h4>Tags:</h4>
@@ -8868,7 +8868,7 @@ $h)</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>3.1.000 (2008-06-09)</td>
@@ -9391,7 +9391,7 @@ $antialias = false])</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>3.1.000 (2008-06-09)</td>
@@ -10273,7 +10273,7 @@ $y)</code>
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>string fixHTMLCode(
string
-$html, [string
+$form, [string
$default_css = ''], [array
$tagvs = ''], [array
$tidy_options = ''])</code>
@@ -10309,7 +10309,7 @@ $tidy_options = ''])</code>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="type">string </td>
- <td><b>$html</b> </td>
+ <td><b>$form</b> </td>
<td>htmlcode to fix</td>
</tr>
<tr>
@@ -12371,7 +12371,7 @@ $v)</code>
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>array getHtmlDomArray(
string
-$html)</code>
+$form)</code>
</td></tr></table>
</td></tr></table><br />
@@ -12395,7 +12395,7 @@ $html)</code>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="type">string </td>
- <td><b>$html</b> </td>
+ <td><b>$form</b> </td>
<td>html code</td>
</tr>
</table>
@@ -12410,7 +12410,7 @@ $html)</code>
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>float getHTMLUnitToUnits(
string
-$htmlval, [string
+$formval, [string
$refsize = 1], [string
$defaultunit = 'px'], [
$points = false], boolean
@@ -12441,7 +12441,7 @@ $point)</code>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="type">string </td>
- <td><b>$htmlval</b> </td>
+ <td><b>$formval</b> </td>
<td>string containing values and unit</td>
</tr>
<tr>
@@ -12881,7 +12881,7 @@ $border = 0])</code>
<td><b>return:</b> </td><td>Return the minimal height needed for multicell method for printing the $txt param.</td>
</tr>
<tr>
- <td><b>author:</b> </td><td>Alexander Escalona Fern�ndez, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Alexander Escalona Fern�ndez, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>4.5.011</td>
@@ -13745,7 +13745,7 @@ $border = 0])</code>
<td><b>return:</b> </td><td>Return the minimal height needed for multicell method for printing the $txt param.</td>
</tr>
<tr>
- <td><b>author:</b> </td><td>Nicola Asuni, Alexander Escalona Fern�ndez</td>
+ <td><b>author:</b> </td><td>Nicola Asuni, Alexander Escalona Fern�ndez</td>
</tr>
<tr>
<td><b>access:</b> </td><td>public</td>
@@ -14972,7 +14972,7 @@ $script)</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Johannes G�ntert, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Johannes G�ntert, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>2.1.002 (2008-02-12)</td>
@@ -15286,7 +15286,7 @@ $coords = array(0,0,1,0)])</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>3.1.000 (2008-06-09)</td>
@@ -16768,7 +16768,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Andreas W�rmser, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>3.1.000 (2008-06-09)</td>
@@ -24806,7 +24806,7 @@ $file)</code>
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>void writeHTML(
string
-$html, [boolean
+$form, [boolean
$ln = true], [boolean
$fill = false], [boolean
$reseth = false], [boolean
@@ -24832,7 +24832,7 @@ $align = ''])</code>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="type">string </td>
- <td><b>$html</b> </td>
+ <td><b>$form</b> </td>
<td>text to display</td>
</tr>
<tr>
@@ -24876,7 +24876,7 @@ $w, float
$h, float
$x, float
$y, [string
-$html = ''], [mixed
+$form = ''], [mixed
$border = 0], [int
$ln = 0], [boolean
$fill = false], [boolean
@@ -24929,7 +24929,7 @@ $autopadding = true])</code>
</tr>
<tr>
<td class="type">string </td>
- <td><b>$html</b> </td>
+ <td><b>$form</b> </td>
<td>html text to print. Default value: empty string.</td>
</tr>
<tr>
@@ -26734,7 +26734,7 @@ $y3)</code>
</td></tr></table>
</td></tr></table><br />
- Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
+ Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
<h4>Tags:</h4>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
@@ -26801,7 +26801,7 @@ $y3)</code>
</td></tr></table>
</td></tr></table><br />
- Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
+ Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
<h4>Tags:</h4>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
@@ -26860,7 +26860,7 @@ $y2)</code>
</td></tr></table>
</td></tr></table><br />
- Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
+ Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.<br /><br /><p>The new current point shall be (x3, y3).</p><br /><br /><br />
<h4>Tags:</h4>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
@@ -27805,7 +27805,7 @@ $cidoffset = 0])</code>
<div class="tags">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
- <td><b>author:</b> </td><td>Johannes G�ntert, Nicola Asuni</td>
+ <td><b>author:</b> </td><td>Johannes G�ntert, Nicola Asuni</td>
</tr>
<tr>
<td><b>since:</b> </td><td>2.1.002 (2008-02-12)</td>
diff --git a/htdocs/includes/tcpdf/doc/elementindex.html b/htdocs/includes/tcpdf/doc/elementindex.html
index 9176ca9f0d7d113cdc1a8dcb776137b5b01b86eb..a2a3c359f4f46c5b452121c8efe52bd2d47a81c7 100644
--- a/htdocs/includes/tcpdf/doc/elementindex.html
+++ b/htdocs/includes/tcpdf/doc/elementindex.html
@@ -817,12 +817,12 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$hPt">TCPDF::$hPt</a></dd>
<dt><b>$HREF</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$HREF">TCPDF::$HREF</a></dd>
- <dt><b>$htmlLinkColorArray</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlLinkColorArray">TCPDF::$htmlLinkColorArray</a><br> Default color for html links</dd>
- <dt><b>$htmlLinkFontStyle</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlLinkFontStyle">TCPDF::$htmlLinkFontStyle</a><br> Default font style to add to html links</dd>
- <dt><b>$htmlvspace</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlvspace">TCPDF::$htmlvspace</a><br> Count the latest inserted vertical spaces on HTML</dd>
+ <dt><b>$formLinkColorArray</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formLinkColorArray">TCPDF::$formLinkColorArray</a><br> Default color for html links</dd>
+ <dt><b>$formLinkFontStyle</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formLinkFontStyle">TCPDF::$formLinkFontStyle</a><br> Default font style to add to html links</dd>
+ <dt><b>$formvspace</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formvspace">TCPDF::$formvspace</a><br> Count the latest inserted vertical spaces on HTML</dd>
<dt><b>Header</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodHeader">TCPDF::Header()</a><br> This method is used to render the page header.</dd>
<dt><b>HEAD_MAGNIFICATION</b></dt>
@@ -2038,11 +2038,11 @@
<dt><b>_out</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_out">TCPDF::_out()</a><br> Output a string to the document.</dd>
<dt><b>_outCurve</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurve">TCPDF::_outCurve()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurve">TCPDF::_outCurve()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.</dd>
<dt><b>_outCurveV</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveV">TCPDF::_outCurveV()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveV">TCPDF::_outCurveV()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.</dd>
<dt><b>_outCurveY</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveY">TCPDF::_outCurveY()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveY">TCPDF::_outCurveY()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.</dd>
<dt><b>_outellipticalarc</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outellipticalarc">TCPDF::_outellipticalarc()</a><br> Append an elliptical arc to the current path.</dd>
<dt><b>_outLine</b></dt>
diff --git a/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html b/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html
index f83d7fc0ac18e1aeaadbcd8703f883217390b224..4b88509de78e1bfafdbfe420ab3d5e0d4e6bd04a 100644
--- a/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html
+++ b/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html
@@ -177,11 +177,11 @@
<dt><b>_out</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_out">TCPDF::_out()</a><br> Output a string to the document.</dd>
<dt><b>_outCurve</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurve">TCPDF::_outCurve()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurve">TCPDF::_outCurve()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.</dd>
<dt><b>_outCurveV</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveV">TCPDF::_outCurveV()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveV">TCPDF::_outCurveV()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.</dd>
<dt><b>_outCurveY</b></dt>
- <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveY">TCPDF::_outCurveY()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.</dd>
+ <dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outCurveY">TCPDF::_outCurveY()</a><br> Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.</dd>
<dt><b>_outellipticalarc</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_outellipticalarc">TCPDF::_outellipticalarc()</a><br> Append an elliptical arc to the current path.</dd>
<dt><b>_outLine</b></dt>
@@ -1024,12 +1024,12 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$hPt">TCPDF::$hPt</a></dd>
<dt><b>$HREF</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$HREF">TCPDF::$HREF</a></dd>
- <dt><b>$htmlLinkColorArray</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlLinkColorArray">TCPDF::$htmlLinkColorArray</a><br> Default color for html links</dd>
- <dt><b>$htmlLinkFontStyle</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlLinkFontStyle">TCPDF::$htmlLinkFontStyle</a><br> Default font style to add to html links</dd>
- <dt><b>$htmlvspace</b></dt>
- <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$htmlvspace">TCPDF::$htmlvspace</a><br> Count the latest inserted vertical spaces on HTML</dd>
+ <dt><b>$formLinkColorArray</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formLinkColorArray">TCPDF::$formLinkColorArray</a><br> Default color for html links</dd>
+ <dt><b>$formLinkFontStyle</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formLinkFontStyle">TCPDF::$formLinkFontStyle</a><br> Default font style to add to html links</dd>
+ <dt><b>$formvspace</b></dt>
+ <dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$formvspace">TCPDF::$formvspace</a><br> Count the latest inserted vertical spaces on HTML</dd>
<dt><b>Header</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodHeader">TCPDF::Header()</a><br> This method is used to render the page header.</dd>
<dt><b>HEAD_MAGNIFICATION</b></dt>
diff --git a/htdocs/includes/tcpdf/tcpdf.php b/htdocs/includes/tcpdf/tcpdf.php
index ba4bebaba7c8e12a97f17588544e75d7dc8bda68..2e01287162d3245c338999f218f2031e6994e047 100644
--- a/htdocs/includes/tcpdf/tcpdf.php
+++ b/htdocs/includes/tcpdf/tcpdf.php
@@ -76,7 +76,7 @@
// dullus for text Justification.
// Bob Vincent (pillarsdotnet@users.sourceforge.net) for <li> value attribute.
// Patrick Benny for text stretch suggestion on Cell().
-// Johannes G�ntert for JavaScript support.
+// Johannes G�ntert for JavaScript support.
// Denis Van Nuffelen for Dynamic Form.
// Jacek Czekaj for multibyte justification
// Anthony Ferrara for the reintroduction of legacy image methods.
@@ -87,7 +87,7 @@
// Mohamad Ali Golkar, Saleh AlMatrafe, Charles Abbott for Arabic and Persian support.
// Moritz Wagner and Andreas Wurmser for graphic functions.
// Andrew Whitehead for core fonts support.
-// Esteban Jo�l Mar�n for OpenType font conversion.
+// Esteban Jo�l Mar�n for OpenType font conversion.
// Teus Hagen for several suggestions and fixes.
// Yukihiro Nakadaira for CID-0 CJK fonts fixes.
// Kosmas Papachristos for some CSS improvements.
@@ -1072,7 +1072,7 @@ class TCPDF {
* @protected
* @since 4.0.021 (2008-08-24)
*/
- protected $htmlvspace = 0;
+ protected $formvspace = 0;
/**
* Array of Spot colors.
@@ -1171,14 +1171,14 @@ class TCPDF {
* @protected
* @since 4.4.003 (2008-12-09)
*/
- protected $htmlLinkColorArray = array(0, 0, 255);
+ protected $formLinkColorArray = array(0, 0, 255);
/**
* Default font style to add to html links.
* @protected
* @since 4.4.003 (2008-12-09)
*/
- protected $htmlLinkFontStyle = 'U';
+ protected $formLinkFontStyle = 'U';
/**
* Counts the number of pages.
@@ -6558,7 +6558,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Alexander Escalona Fern�ndez, Nicola Asuni
+ * @author Alexander Escalona Fern�ndez, Nicola Asuni
* @public
* @since 4.5.011
*/
@@ -6662,7 +6662,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param.
- * @author Nicola Asuni, Alexander Escalona Fern�ndez
+ * @author Nicola Asuni, Alexander Escalona Fern�ndez
* @public
*/
public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@@ -13259,7 +13259,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1.
@@ -13275,7 +13275,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param $x2 (float) Abscissa of control point 2.
* @param $y2 (float) Ordinate of control point 2.
@@ -13289,7 +13289,7 @@ class TCPDF {
}
/**
- * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
+ * Append a cubic B�zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B�zier control points.
* The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1.
@@ -14659,7 +14659,7 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @protected
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes G�ntert, Nicola Asuni
* @since 5.9.098 (2011-06-23)
*/
protected function _putdests() {
@@ -14836,7 +14836,7 @@ class TCPDF {
* Adds a javascript
* @param $script (string) Javascript code
* @public
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes G�ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
public function IncludeJS($script) {
@@ -14861,7 +14861,7 @@ class TCPDF {
/**
* Create a javascript PDF string.
* @protected
- * @author Johannes G�ntert, Nicola Asuni
+ * @author Johannes G�ntert, Nicola Asuni
* @since 2.1.002 (2008-02-12)
*/
protected function _putjavascript() {
@@ -16608,7 +16608,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16626,7 +16626,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16649,7 +16649,7 @@ class TCPDF {
* @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @public
*/
@@ -16734,7 +16734,7 @@ class TCPDF {
* @param $y (float) ordinate of the top left corner of the rectangle.
* @param $w (float) width of the rectangle.
* @param $h (float) height of the rectangle.
- * @author Andreas W�rmser, Nicola Asuni
+ * @author Andreas W�rmser, Nicola Asuni
* @since 3.1.000 (2008-06-09)
* @protected
*/
@@ -18142,7 +18142,7 @@ class TCPDF {
/**
* Cleanup HTML code (requires HTML Tidy library).
- * @param $html (string) htmlcode to fix
+ * @param $form (string) htmlcode to fix
* @param $default_css (string) CSS commands to add
* @param $tagvs (array) parameters for setHtmlVSpace method
* @param $tidy_options (array) options for tidy_parse_string function
@@ -18152,7 +18152,7 @@ class TCPDF {
* @since 5.9.017 (2010-11-16)
* @see setHtmlVSpace()
*/
- public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
+ public function fixHTMLCode($form, $default_css='', $tagvs='', $tidy_options='') {
// configure parameters for HTML Tidy
if ($tidy_options === '') {
$tidy_options = array (
@@ -18175,7 +18175,7 @@ class TCPDF {
);
}
// clean up the HTML code
- $tidy = tidy_parse_string($html, $tidy_options);
+ $tidy = tidy_parse_string($form, $tidy_options);
// fix the HTML
$tidy->cleanRepair();
// get the CSS part
@@ -18195,18 +18195,18 @@ class TCPDF {
$css = '<style>'.$default_css.$css.'</style>';
// get the body part
$tidy_body = tidy_get_body($tidy);
- $html = $tidy_body->value;
+ $form = $tidy_body->value;
// fix some self-closing tags
- $html = str_replace('<br>', '<br />', $html);
+ $form = str_replace('<br>', '<br />', $form);
// remove some empty tag blocks
- $html = preg_replace('/<div([^\>]*)><\/div>/', '', $html);
- $html = preg_replace('/<p([^\>]*)><\/p>/', '', $html);
+ $form = preg_replace('/<div([^\>]*)><\/div>/', '', $form);
+ $form = preg_replace('/<p([^\>]*)><\/p>/', '', $form);
if ($tagvs !== '') {
// set vertical space for some XHTML tags
$this->setHtmlVSpace($tagvs);
}
// return the cleaned XHTML code + CSS
- return $css.$html;
+ return $css.$form;
}
/**
@@ -18230,19 +18230,19 @@ class TCPDF {
// remove empty blocks
$cssdata = preg_replace('/([^\}\{]+)\{\}/', '', $cssdata);
// replace media type parenthesis
- $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
- $cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\{]*)\{/i', '@media \\1�', $cssdata);
+ $cssdata = preg_replace('/\}\}/si', '}�', $cssdata);
// trim string
$cssdata = trim($cssdata);
// find media blocks (all, braille, embossed, handheld, print, projection, screen, speech, tty, tv)
$cssblocks = array();
$matches = array();
- if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
+ if (preg_match_all('/@media[\s]+([^\�]*)�([^�]*)�/i', $cssdata, $matches) > 0) {
foreach ($matches[1] as $key => $type) {
$cssblocks[$type] = $matches[2][$key];
}
// remove media blocks
- $cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
+ $cssdata = preg_replace('/@media[\s]+([^\�]*)�([^�]*)�/i', '', $cssdata);
}
// keep 'all' and 'print' media, other media types are discarded
if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
@@ -18890,25 +18890,25 @@ class TCPDF {
/**
* Returns the HTML DOM array.
- * @param $html (string) html code
+ * @param $form (string) html code
* @return array
* @protected
* @since 3.2.000 (2008-06-20)
*/
- protected function getHtmlDomArray($html) {
+ protected function getHtmlDomArray($form) {
// array of CSS styles ( selector => properties).
$css = array();
// get CSS array defined at previous call
$matches = array();
- if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) {
if (isset($matches[1][0])) {
$css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0])));
}
- $html = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $html);
+ $form = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $form);
}
// extract external CSS files
$matches = array();
- if (preg_match_all('/<link([^\>]*)>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<link([^\>]*)>/isU', $form, $matches) > 0) {
foreach ($matches[1] as $key => $link) {
$type = array();
if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
@@ -18929,7 +18929,7 @@ class TCPDF {
}
// extract style tags
$matches = array();
- if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
+ if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $form, $matches) > 0) {
foreach ($matches[1] as $key => $media) {
$type = array();
preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
@@ -18944,93 +18944,93 @@ class TCPDF {
// create a special tag to contain the CSS array (used for table content)
$csstagarray = '<cssarray>'.htmlentities(serialize($css)).'</cssarray>';
// remove head and style blocks
- $html = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $html);
- $html = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $html);
+ $form = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $form);
+ $form = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $form);
// define block tags
$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
// define self-closing tags
$selfclosingtags = array('area','base','basefont','br','hr','input','img','link','meta');
// remove all unsupported tags (the line below lists all supported tags)
- $html = strip_tags($html, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
+ $form = strip_tags($form, '<marker/><a><b><blockquote><body><br><br/><dd><del><div><dl><dt><em><font><form><h1><h2><h3><h4><h5><h6><hr><hr/><i><img><input><label><li><ol><option><p><pre><s><select><small><span><strike><strong><sub><sup><table><tablehead><tcpdf><td><textarea><th><thead><tr><tt><u><ul>');
//replace some blank characters
- $html = preg_replace('/<pre/', '<xre', $html); // preserve pre tag
- $html = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $html);
- $html = preg_replace('@(\r\n|\r)@', "\n", $html);
+ $form = preg_replace('/<pre/', '<xre', $form); // preserve pre tag
+ $form = preg_replace('/<(table|tr|td|th|tcpdf|blockquote|dd|div|dl|dt|form|h1|h2|h3|h4|h5|h6|br|hr|li|ol|ul|p)([^\>]*)>[\n\r\t]+/', '<\\1\\2>', $form);
+ $form = preg_replace('@(\r\n|\r)@', "\n", $form);
$repTable = array("\t" => ' ', "\0" => ' ', "\x0B" => ' ', "\\" => "\\\\");
- $html = strtr($html, $repTable);
+ $form = strtr($form, $repTable);
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</pre>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 6));
- while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $html_b)) {
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</pre>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 6));
+ while (preg_match("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", $form_b)) {
// preserve newlines on <pre> tag
- $html_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $html_b);
+ $form_b = preg_replace("'<xre([^\>]*)>(.*?)\n(.*?)</pre>'si", "<xre\\1>\\2<br />\\3</pre>", $form_b);
}
- while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $html_b)) {
+ while (preg_match("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], $form_b)) {
// preserve spaces on <pre> tag
- $html_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2 \\3</pre>", $html_b);
+ $form_b = preg_replace("'<xre([^\>]*)>(.*?)".$this->re_space['p']."(.*?)</pre>'".$this->re_space['m'], "<xre\\1>\\2 \\3</pre>", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 6);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 6);
+ $offset = strlen($form_a.$form_b);
}
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</textarea>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 11));
- while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $html_b)) {
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</textarea>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 11));
+ while (preg_match("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", $form_b)) {
// preserve newlines on <textarea> tag
- $html_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $html_b);
- $html_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $html_b);
+ $form_b = preg_replace("'<textarea([^\>]*)>(.*?)\n(.*?)</textarea>'si", "<textarea\\1>\\2<TBR>\\3</textarea>", $form_b);
+ $form_b = preg_replace("'<textarea([^\>]*)>(.*?)[\"](.*?)</textarea>'si", "<textarea\\1>\\2''\\3</textarea>", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 11);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 11);
+ $offset = strlen($form_a.$form_b);
}
- $html = preg_replace('/([\s]*)<option/si', '<option', $html);
- $html = preg_replace('/<\/option>([\s]*)/si', '</option>', $html);
+ $form = preg_replace('/([\s]*)<option/si', '<option', $form);
+ $form = preg_replace('/<\/option>([\s]*)/si', '</option>', $form);
$offset = 0;
- while (($offset < strlen($html)) AND ($pos = strpos($html, '</option>', $offset)) !== false) {
- $html_a = substr($html, 0, $offset);
- $html_b = substr($html, $offset, ($pos - $offset + 9));
- while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $html_b)) {
- $html_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $html_b);
- $html_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $html_b);
+ while (($offset < strlen($form)) AND ($pos = strpos($form, '</option>', $offset)) !== false) {
+ $form_a = substr($form, 0, $offset);
+ $form_b = substr($form, $offset, ($pos - $offset + 9));
+ while (preg_match("'<option([^\>]*)>(.*?)</option>'si", $form_b)) {
+ $form_b = preg_replace("'<option([\s]+)value=\"([^\"]*)\"([^\>]*)>(.*?)</option>'si", "\\2#!TaB!#\\4#!NwL!#", $form_b);
+ $form_b = preg_replace("'<option([^\>]*)>(.*?)</option>'si", "\\2#!NwL!#", $form_b);
}
- $html = $html_a.$html_b.substr($html, $pos + 9);
- $offset = strlen($html_a.$html_b);
+ $form = $form_a.$form_b.substr($form, $pos + 9);
+ $offset = strlen($form_a.$form_b);
}
- if (preg_match("'</select'si", $html)) {
- $html = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $html);
- $html = preg_replace("'#!NwL!#</select>'si", "\" />", $html);
+ if (preg_match("'</select'si", $form)) {
+ $form = preg_replace("'<select([^\>]*)>'si", "<select\\1 opt=\"", $form);
+ $form = preg_replace("'#!NwL!#</select>'si", "\" />", $form);
}
- $html = str_replace("\n", ' ', $html);
+ $form = str_replace("\n", ' ', $form);
// restore textarea newlines
- $html = str_replace('<TBR>', "\n", $html);
+ $form = str_replace('<TBR>', "\n", $form);
// remove extra spaces from code
- $html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $html);
- $html = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $html);
- $html = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $html);
- $html = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $html);
- $html = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $html);
- $html = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $html);
- $html = preg_replace('/<img([^\>]*)>[\s]+([^\<])/xi', '<img\\1> \\2', $html);
- $html = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $html);
- $html = preg_replace('/<xre/', '<pre', $html); // restore pre tag
- $html = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $html);
- $html = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1> </li>', $html);
- $html = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1"> </font><img', $html);
- $html = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1> ', $html); // preserve some spaces
- $html = preg_replace('/[\s]<\/([^\>]*)>/', ' </\\1>', $html); // preserve some spaces
- $html = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $html); // replace multiple spaces with a single space
+ $form = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '</\\1>', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '</\\1>', $form);
+ $form = preg_replace('/[\s]+<(tr|td|th|li|dt|dd)/', '<\\1', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<(ul|ol|dl|br)/'.$this->re_space['m'], '<\\1', $form);
+ $form = preg_replace('/<\/(table|tr|td|th|blockquote|dd|dt|dl|div|dt|h1|h2|h3|h4|h5|h6|hr|li|ol|ul|p)>[\s]+</', '</\\1><', $form);
+ $form = preg_replace('/<\/(td|th)>/', '<marker style="font-size:0"/></\\1>', $form);
+ $form = preg_replace('/<\/table>([\s]*)<marker style="font-size:0"\/>/', '</table>', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+<img/'.$this->re_space['m'], chr(32).'<img', $form);
+ $form = preg_replace('/<img([^\>]*)>[\s]+([^\<])/xi', '<img\\1> \\2', $form);
+ $form = preg_replace('/<img([^\>]*)>/xi', '<img\\1><span><marker style="font-size:0"/></span>', $form);
+ $form = preg_replace('/<xre/', '<pre', $form); // restore pre tag
+ $form = preg_replace('/<textarea([^\>]*)>([^\<]*)<\/textarea>/xi', '<textarea\\1 value="\\2" />', $form);
+ $form = preg_replace('/<li([^\>]*)><\/li>/', '<li\\1> </li>', $form);
+ $form = preg_replace('/<li([^\>]*)>'.$this->re_space['p'].'*<img/'.$this->re_space['m'], '<li\\1><font size="1"> </font><img', $form);
+ $form = preg_replace('/<([^\>\/]*)>[\s]/', '<\\1> ', $form); // preserve some spaces
+ $form = preg_replace('/[\s]<\/([^\>]*)>/', ' </\\1>', $form); // preserve some spaces
+ $form = preg_replace('/'.$this->re_space['p'].'+/'.$this->re_space['m'], chr(32), $form); // replace multiple spaces with a single space
// trim string
- $html = $this->stringTrim($html);
+ $form = $this->stringTrim($form);
// fix first image tag alignment
- $html = preg_replace('/^<img/', '<span style="font-size:0"><br /></span> <img', $html, 1);
+ $form = preg_replace('/^<img/', '<span style="font-size:0"><br /></span> <img', $form, 1);
// pattern for generic tag
$tagpattern = '/(<[^>]+>)/';
// explodes the string
- $a = preg_split($tagpattern, $html, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+ $a = preg_split($tagpattern, $form, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
// count elements
$maxel = count($a);
$elkey = 0;
@@ -19694,7 +19694,7 @@ class TCPDF {
* @param $h (float) Cell minimum height. The cell extends automatically if needed.
* @param $x (float) upper-left corner X coordinate
* @param $y (float) upper-left corner Y coordinate
- * @param $html (string) html text to print. Default value: empty string.
+ * @param $form (string) html text to print. Default value: empty string.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
@@ -19705,15 +19705,15 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @see Multicell(), writeHTML()
* @public
*/
- public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
- return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0, 'T', false);
+ public function writeHTMLCell($w, $h, $x, $y, $form='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
+ return $this->MultiCell($w, $h, $form, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0, 'T', false);
}
/**
* Allows to preserve some HTML formatting (limited support).<br />
* IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
* Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
- * @param $html (string) text to display
+ * @param $form (string) text to display
* @param $ln (boolean) if true add a new line after text (default = true)
* @param $fill (boolean) Indicates if the background must be painted (true) or transparent (false).
* @param $reseth (boolean) if true reset the last cell height (default false).
@@ -19721,7 +19721,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
* @public
*/
- public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
+ public function writeHTML($form, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
$gvars = $this->getGraphicVars();
// store current values
$prev_cell_margin = $this->cell_margin;
@@ -19810,7 +19810,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// reset row height
$this->resetLastH();
}
- $dom = $this->getHtmlDomArray($html);
+ $dom = $this->getHtmlDomArray($form);
$maxel = count($dom);
$key = 0;
$hidden_node_key = -1;
@@ -19854,7 +19854,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
// store current object
$this->startTransaction();
// save this method vars
- $this_method_vars['html'] = $html;
+ $this_method_vars['html'] = $form;
$this_method_vars['ln'] = $ln;
$this_method_vars['fill'] = $fill;
$this_method_vars['reseth'] = $reseth;
@@ -22755,7 +22755,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
/**
* Convert HTML string containing value and unit of measure to user's units or points.
- * @param $htmlval (string) string containing values and unit
+ * @param $formval (string) string containing values and unit
* @param $refsize (string) reference value in points
* @param $defaultunit (string) default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
* @param $points (boolean) if true returns points, otherwise returns value in user's units
@@ -22763,7 +22763,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @public
* @since 4.4.004 (2008-12-10)
*/
- public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
+ public function getHTMLUnitToUnits($formval, $refsize=1, $defaultunit='px', $points=false) {
$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
$retval = 0;
$value = 0;
@@ -22775,11 +22775,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (in_array($defaultunit, $supportedunits)) {
$unit = $defaultunit;
}
- if (is_numeric($htmlval)) {
- $value = floatval($htmlval);
- } elseif (preg_match('/([0-9\.\-\+]+)/', $htmlval, $mnum)) {
+ if (is_numeric($formval)) {
+ $value = floatval($formval);
+ } elseif (preg_match('/([0-9\.\-\+]+)/', $formval, $mnum)) {
$value = floatval($mnum[1]);
- if (preg_match('/([a-z%]+)/', $htmlval, $munit)) {
+ if (preg_match('/([a-z%]+)/', $formval, $munit)) {
if (in_array($munit[1], $supportedunits)) {
$unit = $munit[1];
}
@@ -24081,8 +24081,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$page_first = $this->getPage();
// get the font type used for numbers in each template
$current_font = $this->FontFamily;
- foreach ($templates as $level => $html) {
- $dom = $this->getHtmlDomArray($html);
+ foreach ($templates as $level => $form) {
+ $dom = $this->getHtmlDomArray($form);
foreach ($dom as $key => $value) {
if ($value['value'] == '#TOC_PAGE_NUMBER#') {
$this->SetFont($dom[($key - 1)]['fontname']);
@@ -26229,7 +26229,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
break;
}
- case 'Q': { // quadratic B�zier curveto
+ case 'Q': { // quadratic B�zier curveto
foreach ($params as $ck => $cp) {
$params[$ck] = $cp;
if ((($ck + 1) % 4) == 0) {
@@ -26255,7 +26255,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
}
break;
}
- case 'T': { // shorthand/smooth quadratic B�zier curveto
+ case 'T': { // shorthand/smooth quadratic B�zier curveto
foreach ($params as $ck => $cp) {
$params[$ck] = $cp;
if (($ck % 2) != 0) {
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index 56ac0452edaef4865e85c5d49bdea4b11a4f4dcb..ae17ade04ff3ef3f7869784c15f4e87d1275ac01 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -184,7 +184,7 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post
llxHeader('',$langs->trans('Delivery'),'Livraison');
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
/*********************************************************************
@@ -409,7 +409,7 @@ else
if ($_GET["action"] == 'delete')
{
$expedition_id = $_GET["expid"];
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id,$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
if ($ret == 'html') print '<br>';
}
@@ -419,7 +419,7 @@ else
*/
if ($_GET["action"] == 'valid')
{
- $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
+ $ret=$form->form_confirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
if ($ret == 'html') print '<br>';
}
@@ -533,7 +533,7 @@ else
$text.= ' - '.$delivery->lines[$i]->label;
$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($delivery->lines[$i]->description));
//print $description;
- print $html->textwithtooltip($text,$description,3,'','',$i);
+ print $form->textwithtooltip($text,$description,3,'','',$i);
print_date_range($delivery->lines[$i]->date_start,$delivery->lines[$i]->date_end);
if ($conf->global->PRODUIT_DESC_IN_FORM)
{
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 19ff6392f4158e0d67d68429191870ab5fe526ad..436c40527cf388b2428811d1e1499bf299aa5f50 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1028,7 +1028,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
{
global $user, $conf, $langs, $db, $dolibarr_main_authentication;
- $html=new Form($db);
+ $form=new Form($db);
if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php';
@@ -1209,7 +1209,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
print '<div class="login_block">'."\n";
print '<table class="nobordernopadding" summary=""><tr>';
- print $html->textwithtooltip('',$loginhtmltext,2,1,$logintext,'',1);
+ print $form->textwithtooltip('',$loginhtmltext,2,1,$logintext,'',1);
// Select entity
if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY))
@@ -1223,7 +1223,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
}
}
- print $html->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'',1);
+ print $form->textwithtooltip('',$logouthtmltext,2,1,$logouttext,'',1);
// Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
@@ -1233,7 +1233,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
$text.=' title="" alt="">';
$text.='</a>';
- print $html->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);
+ print $form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1);
}
print '</tr></table>'."\n";
diff --git a/htdocs/product/admin/produit.php b/htdocs/product/admin/produit.php
index dc0b77299cc121b23f23c97f73d83eca77a85176..e19fceb744864f0177807e88fb3a8a6987b303cf 100644
--- a/htdocs/product/admin/produit.php
+++ b/htdocs/product/admin/produit.php
@@ -119,7 +119,7 @@ $h++;
dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup"));
-$html=new Form($db);
+$form=new Form($db);
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -139,7 +139,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"multiprix\">";
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("MultiPricesAbility").'</td>';
print '<td width="60" align="right">';
-print $html->selectyesno("activate_multiprix",$conf->global->PRODUIT_MULTIPRICES,1);
+print $form->selectyesno("activate_multiprix",$conf->global->PRODUIT_MULTIPRICES,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
@@ -170,7 +170,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"sousproduits\">";
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
print '<td width="60" align="right">';
-print $html->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1);
+print $form->selectyesno("activate_sousproduits",$conf->global->PRODUIT_SOUSPRODUITS,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
@@ -198,7 +198,7 @@ else
'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
);
- print $html->selectarray("activate_usesearchtoselectproduct",$arrval,$conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+ print $form->selectarray("activate_usesearchtoselectproduct",$arrval,$conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
@@ -228,7 +228,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"viewProdDescInForm\">";
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
print '<td width="60" align="right">';
-print $html->selectyesno("activate_viewProdDescInForm",$conf->global->PRODUIT_DESC_IN_FORM,1);
+print $form->selectyesno("activate_viewProdDescInForm",$conf->global->PRODUIT_DESC_IN_FORM,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
@@ -244,7 +244,7 @@ print '</form>';
print "<tr ".$bc[$var].">";
print '<td>'.$langs->trans("ConfirmDeleteProductLineAbility").'</td>';
print '<td width="60" align="right">';
- print $html->selectyesno("activate_confirmDeleteProdLineInForm",$conf->global->PRODUIT_CONFIRM_DELETE_LINE,1);
+ print $form->selectyesno("activate_confirmDeleteProdLineInForm",$conf->global->PRODUIT_CONFIRM_DELETE_LINE,1);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index 144bd9c5f62d35533b14d076f905707ea7378046..58e9d13ee75518db3377afb94278d95eb13a9220 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -74,7 +74,7 @@ if ($_POST['action'] == 'setbarcode' && $user->rights->barcode->creer)
llxHeader("","",$langs->trans("BarCode"));
-$html = new Form($db);
+$form = new Form($db);
$formbarcode = new FormBarCode($db);
$product = new Product($db);
@@ -92,7 +92,7 @@ print '<table class="border" width="100%">'."\n";
// Reference
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
-print $html->showrefnav($product,'ref','',1,'ref');
+print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>'."\n";
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 2038024887d3562c6372409b7e51e9f649ccaf19..6e66d669474b9512cb97f52fba451c7f69d6aae8 100755
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -75,7 +75,7 @@ class ActionsCardProduct extends Product
function assign_values(&$action, $id=0, $ref='')
{
global $conf, $langs, $user, $mysoc, $canvas;
- global $html, $formproduct;
+ global $form, $formproduct;
$tmpobject = new Product($this->db);
if (! empty($id) || ! empty($ref)) $tmpobject->fetch($id,$ref);
@@ -116,21 +116,21 @@ class ActionsCardProduct extends Product
// Price
$this->tpl['price'] = $this->price;
$this->tpl['price_min'] = $this->price_min;
- $this->tpl['price_base_type'] = $html->load_PriceBaseType($this->price_base_type, "price_base_type");
+ $this->tpl['price_base_type'] = $form->load_PriceBaseType($this->price_base_type, "price_base_type");
// VAT
- $this->tpl['tva_tx'] = $html->load_tva("tva_tx",-1,$mysoc,'');
+ $this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,'');
}
if ($action == 'create' || $action == 'edit')
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
- $this->tpl['status'] = $html->selectarray('statut',$statutarray,$this->status);
+ $this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->status);
//To Buy
$statutarray=array('1' => $langs->trans("Yes"), '0' => $langs->trans("No"));
- $this->tpl['tobuy'] = $html->selectarray('tobuy',$statutarray,$this->status_buy);
+ $this->tpl['tobuy'] = $form->selectarray('tobuy',$statutarray,$this->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
@@ -140,7 +140,7 @@ class ActionsCardProduct extends Product
{
$head = product_prepare_head($this->object,$user);
- $this->tpl['showrefnav'] = $html->showrefnav($this->object,'ref','',1,'ref');
+ $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');
$titre=$langs->trans("CardProduct".$this->object->type);
$picto=($this->object->type==1?'service':'product');
@@ -148,12 +148,12 @@ class ActionsCardProduct extends Product
$this->tpl['showend']=dol_get_fiche_end();
// Accountancy buy code
- $this->tpl['accountancyBuyCodeKey'] = $html->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
- $this->tpl['accountancyBuyCodeVal'] = $html->editfieldval("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancyBuyCodeVal'] = $form->editfieldval("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
// Accountancy sell code
- $this->tpl['accountancySellCodeKey'] = $html->editfieldkey("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
- $this->tpl['accountancySellCodeVal'] = $html->editfieldval("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancySellCodeKey'] = $form->editfieldkey("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancySellCodeVal'] = $form->editfieldval("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
}
$this->tpl['finished'] = $this->object->finished;
@@ -179,14 +179,14 @@ class ActionsCardProduct extends Product
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
- $this->tpl['status'] = $html->selectarray('statut',$statutarray,$_POST["statut"]);
+ $this->tpl['status'] = $form->selectarray('statut',$statutarray,$_POST["statut"]);
$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
- $this->tpl['status_buy'] = $html->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
+ $this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
// Finished
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
- $this->tpl['finished'] = $html->selectarray('finished',$statutarray,$this->object->finished);
+ $this->tpl['finished'] = $form->selectarray('finished',$statutarray,$this->object->finished);
// Weight
$this->tpl['weight'] = $this->object->weight;
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 984edc8002f05b7f71092ce1e0e090f9b7e8bebb..79dd098844a0381cb0e7179097adc0442ef19b5d 100755
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -74,7 +74,7 @@ class ActionsCardService extends Product
function assign_values(&$action, $id=0, $ref='')
{
global $conf, $langs, $user, $mysoc, $canvas;
- global $html, $formproduct;
+ global $form, $formproduct;
$tmpobject = new Product($this->db);
if (! empty($id) || ! empty($ref)) $tmpobject->fetch($id,$ref);
@@ -115,21 +115,21 @@ class ActionsCardService extends Product
// Price
$this->tpl['price'] = $this->price;
$this->tpl['price_min'] = $this->price_min;
- $this->tpl['price_base_type'] = $html->load_PriceBaseType($this->price_base_type, "price_base_type");
+ $this->tpl['price_base_type'] = $form->load_PriceBaseType($this->price_base_type, "price_base_type");
// VAT
- $this->tpl['tva_tx'] = $html->load_tva("tva_tx",-1,$mysoc,'');
+ $this->tpl['tva_tx'] = $form->load_tva("tva_tx",-1,$mysoc,'');
}
if ($action == 'create' || $action == 'edit')
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
- $this->tpl['status'] = $html->selectarray('statut',$statutarray,$this->status);
+ $this->tpl['status'] = $form->selectarray('statut',$statutarray,$this->status);
//To Buy
$statutarray=array('1' => $langs->trans("Yes"), '0' => $langs->trans("No"));
- $this->tpl['tobuy'] = $html->selectarray('tobuy',$statutarray,$this->status_buy);
+ $this->tpl['tobuy'] = $form->selectarray('tobuy',$statutarray,$this->status_buy);
$this->tpl['description'] = $this->description;
$this->tpl['note'] = $this->note;
@@ -139,7 +139,7 @@ class ActionsCardService extends Product
{
$head = product_prepare_head($this->object,$user);
- $this->tpl['showrefnav'] = $html->showrefnav($this->object,'ref','',1,'ref');
+ $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref');
$titre=$langs->trans("CardProduct".$this->object->type);
$picto=($this->object->type==1?'service':'product');
@@ -147,12 +147,12 @@ class ActionsCardService extends Product
$this->tpl['showend']=dol_get_fiche_end();
// Accountancy buy code
- $this->tpl['accountancyBuyCodeKey'] = $html->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
- $this->tpl['accountancyBuyCodeVal'] = $html->editfieldval("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancyBuyCodeKey'] = $form->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancyBuyCodeVal'] = $form->editfieldval("ProductAccountancyBuyCode",'productaccountancycodesell',$this->accountancy_code_sell,'id',$this->id,$user->rights->produit->creer);
// Accountancy sell code
- $this->tpl['accountancySellCodeKey'] = $html->editfieldkey("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
- $this->tpl['accountancySellCodeVal'] = $html->editfieldval("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancySellCodeKey'] = $form->editfieldkey("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
+ $this->tpl['accountancySellCodeVal'] = $form->editfieldval("ProductAccountancySellCode",'productaccountancycodebuy',$this->accountancy_code_buy,'id',$this->id,$user->rights->produit->creer);
}
$this->tpl['finished'] = $this->object->finished;
@@ -181,10 +181,10 @@ class ActionsCardService extends Product
{
// Status
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
- $this->tpl['status'] = $html->selectarray('statut',$statutarray,$_POST["statut"]);
+ $this->tpl['status'] = $form->selectarray('statut',$statutarray,$_POST["statut"]);
$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
- $this->tpl['status_buy'] = $html->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
+ $this->tpl['status_buy'] = $form->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
// Duration unit
// TODO creer fonction
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index cdee1c53aca5cbce3b77c341ff674a67db56b374..847a429a8024446957612bab4c0426b008735bc4 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -157,10 +157,10 @@ if ($action == 'search')
//print $sql;
$productstatic = new Product($db);
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("CardProduct".$product->type));
-$html = new Form($db);
+$form = new Form($db);
dol_htmloutput_errors($mesg);
@@ -192,7 +192,7 @@ if ($id || $ref)
// Reference
print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td></tr>';
// Libelle
@@ -276,7 +276,7 @@ if ($id || $ref)
// Reference
print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -368,7 +368,7 @@ if ($id || $ref)
if ($conf->categorie->enabled)
{
print '<tr><td>'.$langs->trans("CategoryFilter").' </td>';
- print '<td>'.$html->select_all_categories(0,$catMere).'</td></tr>';
+ print '<td>'.$form->select_all_categories(0,$catMere).'</td></tr>';
}
print '</table>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 17ee1d5d9e20599be5a628cffaa41f26bd219741..5e277788520343760d9c54a8ddd03682938f274e 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -107,7 +107,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
* View
*/
-$html = new Form($db);
+$form = new Form($db);
llxHeader("","",$langs->trans("CardProduct".$product->type));
@@ -146,7 +146,7 @@ if ($product->id)
// Ref
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 6c5f62adc910fe40eb992b61decdc6c90b2e102f..c3d176b71eb5040cb9358c112c39972f0461457c 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -626,7 +626,7 @@ if (GETPOST("type") == '1') $helpurl='EN:Module_Services_En|FR:Module_Services|E
llxHeader('',$langs->trans("CardProduct".$_GET["type"]),$helpurl);
-$html = new Form($db);
+$form = new Form($db);
$formproduct = new FormProduct($db);
if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
@@ -675,13 +675,13 @@ else
// On sell
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
$statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
- print $html->selectarray('statut',$statutarray,$_POST["statut"]);
+ print $form->selectarray('statut',$statutarray,$_POST["statut"]);
print '</td></tr>';
// To buy
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td>';
$statutarray=array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
- print $html->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
+ print $form->selectarray('statut_buy',$statutarray,$_POST["statut_buy"]);
print '</td></tr>';
// Stock min level
@@ -710,7 +710,7 @@ else
{
print '<tr><td>'.$langs->trans("Nature").'</td><td>';
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
- print $html->selectarray('finished',$statutarray,$_POST["finished"]);
+ print $form->selectarray('finished',$statutarray,$_POST["finished"]);
print '</td></tr>';
}
@@ -755,7 +755,7 @@ else
// Origin country
print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td>';
- $html->select_pays($_POST["country_id"],'country_id');
+ $form->select_pays($_POST["country_id"],'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
@@ -782,7 +782,7 @@ else
// PRIX
print '<tr><td>'.$langs->trans("SellingPrice").'</td>';
print '<td><input name="price" size="10" value="'.$product->price.'">';
- print $html->select_PriceBaseType($product->price_base_type, "price_base_type");
+ print $form->select_PriceBaseType($product->price_base_type, "price_base_type");
print '</td></tr>';
// MIN PRICE
@@ -792,7 +792,7 @@ else
// VAT
print '<tr><td width="20%">'.$langs->trans("VATRate").'</td><td>';
- print $html->load_tva("tva_tx",-1,$mysoc,'');
+ print $form->load_tva("tva_tx",-1,$mysoc,'');
print '</td></tr>';
print '</table>';
@@ -884,7 +884,7 @@ else
{
print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
$statutarray=array('-1'=>' ', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
- print $html->selectarray('finished',$statutarray,$object->finished);
+ print $form->selectarray('finished',$statutarray,$object->finished);
print '</td></tr>';
}
@@ -945,7 +945,7 @@ else
// Origin country
print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">';
- $html->select_pays($object->country_id,'country_id');
+ $form->select_pays($object->country_id,'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
@@ -977,7 +977,7 @@ else
// Confirm delete product
if ($action == 'delete' || $conf->use_javascript_ajax)
{
- $ret=$html->form_confirm("fiche.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
+ $ret=$form->form_confirm("fiche.php?id=".$object->id,$langs->trans("DeleteProduct"),$langs->trans("ConfirmDeleteProduct"),"confirm_delete",'',0,"action-delete");
if ($ret == 'html') print '<br>';
}
@@ -988,7 +988,7 @@ else
// Ref
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="'.(2+($isphoto?1:0)).'">';
- print $html->showrefnav($object,'ref','',1,'ref');
+ print $form->showrefnav($object,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -1012,13 +1012,13 @@ else
print '</tr>';
// Accountancy sell code
- print '<tr><td>'.$html->editfieldkey("ProductAccountancySellCode",'productaccountancycodesell',$object->accountancy_code_sell,'id',$object->id,$user->rights->produit->creer).'</td><td colspan="2">';
- print $html->editfieldval("ProductAccountancySellCode",'productaccountancycodesell',$object->accountancy_code_sell,'id',$object->id,$user->rights->produit->creer);
+ print '<tr><td>'.$form->editfieldkey("ProductAccountancySellCode",'productaccountancycodesell',$object->accountancy_code_sell,'id',$object->id,$user->rights->produit->creer).'</td><td colspan="2">';
+ print $form->editfieldval("ProductAccountancySellCode",'productaccountancycodesell',$object->accountancy_code_sell,'id',$object->id,$user->rights->produit->creer);
print '</td></tr>';
// Accountancy buy code
- print '<tr><td>'.$html->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodebuy',$object->accountancy_code_buy,'id',$object->id,$user->rights->produit->creer).'</td><td colspan="2">';
- print $html->editfieldval("ProductAccountancyBuyCode",'productaccountancycodebuy',$object->accountancy_code_buy,'id',$object->id,$user->rights->produit->creer);
+ print '<tr><td>'.$form->editfieldkey("ProductAccountancyBuyCode",'productaccountancycodebuy',$object->accountancy_code_buy,'id',$object->id,$user->rights->produit->creer).'</td><td colspan="2">';
+ print $form->editfieldval("ProductAccountancyBuyCode",'productaccountancycodebuy',$object->accountancy_code_buy,'id',$object->id,$user->rights->produit->creer);
print '</td></tr>';
// Status (to sell)
@@ -1141,7 +1141,7 @@ if ($action == 'clone' || $conf->use_javascript_ajax)
array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true)
);
// Paiement incomplet. On demande si motif = escompte ou autre
- $html->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestion,'yes','action-clone',230,600);
+ $form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneProduct'),$langs->trans('ConfirmCloneProduct',$object->ref),'confirm_clone',$formquestion,'yes','action-clone',230,600);
}
@@ -1302,7 +1302,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
print '<tr '.$bc[$var].'><td colspan="3">';
print '<input type="hidden" name="action" value="addinpropal">';
print $langs->trans("OtherPropals").'</td><td>';
- print $html->selectarray("propalid", $otherprop);
+ print $form->selectarray("propalid", $otherprop);
print '</td></tr>';
print '<tr '.$bc[$var].'><td nowrap="nowrap" colspan="2">'.$langs->trans("Qty");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
@@ -1420,7 +1420,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
print '<tr '.$bc[$var].'><td colspan="3">';
print '<input type="hidden" name="action" value="addincommande">';
print $langs->trans("OtherOrders").'</td><td>';
- print $html->selectarray("commandeid", $othercom);
+ print $form->selectarray("commandeid", $othercom);
print '</td></tr>';
print '<tr '.$bc[$var].'><td colspan="2">'.$langs->trans("Qty");
print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort");
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 7f39a3ef563349ddebd88b99be12189a49108471..db38275ef69beb845f7dce0166a1223c8e681bc3 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -176,7 +176,7 @@ if ($_POST["cancel"] == $langs->trans("Cancel"))
* view
*/
-$html = new Form($db);
+$form = new Form($db);
if ($id || $ref)
{
@@ -207,7 +207,7 @@ if ($id || $ref)
// Reference
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -271,8 +271,8 @@ if ($id || $ref)
}
else
{
- $html=new Form($db);
- $html->select_societes($_POST["id_fourn"],'id_fourn','fournisseur=1',1);
+ $form=new Form($db);
+ $form->select_societes($_POST["id_fourn"],'id_fourn','fournisseur=1',1);
}
print '</td></tr>';
@@ -294,7 +294,7 @@ if ($id || $ref)
{
$langs->load("propal");
print '<tr><td>'.$langs->trans("Availability").'</td><td colspan="3">';
- $html->select_availability($product->fk_availability,"oselDispo",1);
+ $form->select_availability($product->fk_availability,"oselDispo",1);
print '</td></tr>'."\n";
}
@@ -316,7 +316,7 @@ if ($id || $ref)
print '<td class="fieldrequired" width="25%">'.$langs->trans("PriceQtyMin").'</td>';
print '<td width="25%"><input class="flat" name="price" size="8" value="'.($_POST["price"]?$_POST["price"]:(isset($product->fourn_price)?price($product->fourn_price):'')).'">';
print ' ';
- print $html->select_PriceBaseType(($_POST["price_base_type"]?$_POST["price_base_type"]:$product->price_base_type), "price_base_type");
+ print $form->select_PriceBaseType(($_POST["price_base_type"]?$_POST["price_base_type"]:$product->price_base_type), "price_base_type");
print '</td>';
print '</tr>';
@@ -389,8 +389,8 @@ if ($id || $ref)
//Availability
if(!empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
{
- $html->load_cache_availability();
- $availability= $html->cache_availability[$productfourn->fk_availability]['label'];
+ $form->load_cache_availability();
+ $availability= $form->cache_availability[$productfourn->fk_availability]['label'];
print '<td align="left">'.$availability.'</td>';
}
diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php
index 7853db1425765d37f6d308b1d904f80a36afb135..7e998254897cbdc5dd04b169759bc4623126a288 100644
--- a/htdocs/product/liste.php
+++ b/htdocs/product/liste.php
@@ -96,7 +96,7 @@ if ($conf->categorie->enabled && GETPOST('catid'))
*/
$htmlother=new FormOther($db);
-$html=new Form($db);
+$form=new Form($db);
if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
{
@@ -405,7 +405,7 @@ else
if ($product_fourn->product_fourn_price_id > 0)
{
$htmltext=$product_fourn->display_price_product_fournisseur();
- if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire) print $html->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
+ if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire) print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext);
else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
}
}
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index ed182dec840fb9116e61eb7c1e48720e130fd806..72987478f1b1d2fdd557d0bb0afa1c10b77825bd 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -77,7 +77,7 @@ if ($_GET["action"] == 'addthumb' && $_GET["file"])
* View
*/
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -103,7 +103,7 @@ if ($_GET["id"] || $_GET["ref"])
*/
if ($_GET['action'] == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$product->id.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$product->id.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -114,7 +114,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index c14961ff55ad86c90c94a45fe86f7b0ed4628acd..b0c9021324146e7897441d8a200e6bac63c1e9b8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -108,7 +108,7 @@ if ($_GET["action"] == 'delete' && $user->rights->produit->supprimer)
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$product = new Product($db);
if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]);
@@ -127,7 +127,7 @@ print '<table class="border" width="100%">';
// Ref
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
-print $html->showrefnav($product,'ref','',1,'ref');
+print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -316,7 +316,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
// VAT
print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
- print $html->load_tva("tva_tx",$product->tva_tx,$mysoc,'',$product->id,$product->tva_npr);
+ print $form->load_tva("tva_tx",$product->tva_tx,$mysoc,'',$product->id,$product->tva_npr);
print '</td></tr>';
// Price base
@@ -324,14 +324,14 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
print $langs->trans('PriceBase');
print '</td>';
print '<td>';
- print $html->select_PriceBaseType($product->price_base_type, "price_base_type");
+ print $form->select_PriceBaseType($product->price_base_type, "price_base_type");
print '</td>';
print '</tr>';
// Price
print '<tr><td width="20%">';
$text=$langs->trans('SellingPrice');
- print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
+ print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>';
if ($product->price_base_type == 'TTC')
{
@@ -346,7 +346,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
// Price minimum
print '<tr><td>' ;
$text=$langs->trans('MinPrice');
- print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
+ print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
if ($product->price_base_type == 'TTC')
{
print '<td><input name="price_min" size="10" value="'.price($product->price_min_ttc).'">';
@@ -378,7 +378,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
if ($i == 1)
{
print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
- print $html->load_tva("tva_tx_".$i,$product->multiprices_tva_tx["$i"],$mysoc,'',$product->id);
+ print $form->load_tva("tva_tx_".$i,$product->multiprices_tva_tx["$i"],$mysoc,'',$product->id);
print '</td></tr>';
}
else
@@ -389,7 +389,7 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
// Selling price
print '<tr><td width="20%">';
$text=$langs->trans('SellingPrice').' '.$i;
- print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
+ print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
print '</td><td>';
if ($product->multiprices_base_type["$i"] == 'TTC')
{
@@ -399,13 +399,13 @@ if ($_GET["action"] == 'edit_price' && ($user->rights->produit->creer || $user->
{
print '<input name="price_'.$i.'" size="10" value="'.price($product->multiprices["$i"]).'">';
}
- print $html->select_PriceBaseType($product->multiprices_base_type["$i"], "multiprices_base_type_".$i);
+ print $form->select_PriceBaseType($product->multiprices_base_type["$i"], "multiprices_base_type_".$i);
print '</td></tr>';
// Min price
print '<tr><td>';
$text=$langs->trans('MinPrice').' '.$i;
- print $html->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
+ print $form->textwithpicto($text,$langs->trans("PrecisionUnitIsLimitedToXDecimals",$conf->global->MAIN_MAX_DECIMALS_UNIT),$direction=1,$usehelpcursor=1);
if ($product->multiprices_base_type["$i"] == 'TTC')
{
print '<td><input name="price_min_'.$i.'" size="10" value="'.price($product->multiprices_min_ttc["$i"]).'">';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 57dabd161b4b0318a3de8b5444d54260b7785651..36093d7080088eb282531b288a541b2d1781b97c 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -58,7 +58,7 @@ if (! $sortfield) $sortfield="c.date_commande";
* View
*/
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -88,7 +88,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 78ed5cdd81f70b550dc8d183fd1c128a80b63652..03cc444cfdcb8c85615c5b214843425df5070aff 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -58,7 +58,7 @@ if (! $sortfield) $sortfield="c.date_commande";
* View
*/
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -85,7 +85,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td></tr>';
// Libelle
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index e70314c8273532abbac6c4cc94236896931c681f..306d3a94ab4285aaed4e20d834ab04ff2efbbc99 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -61,7 +61,7 @@ if (! $sortfield) $sortfield="c.date_contrat";
$staticcontrat=new Contrat($db);
$staticcontratligne=new ContratLigne($db);
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -88,7 +88,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 7f980b15041fcabb7cbe0b83d336f44abaa65db3..6d195b04f5c7220956438a47942dab09a3a25725 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -60,7 +60,7 @@ if (! $sortfield) $sortfield="f.datef";
$invoicestatic=new Facture($db);
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
@@ -90,7 +90,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 63f043bcad364212c92220a2ba782388b070d0db..eaa7bc8f85f4f4c5bd721f2164bedcb5c8946ab1 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -61,7 +61,7 @@ if (! $sortfield) $sortfield="f.datef";
$supplierinvoicestatic=new FactureFournisseur($db);
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -91,7 +91,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index eabd7f2b844a4aaab1af14c2543fbcb7d5490493..e9a11bc217b42b86a241138317e794ecb7b35dbe 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -51,7 +51,7 @@ $result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
/*
* View
*/
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -74,7 +74,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 4ed7f31882f6cc608213772754c638c1b1f445ec..b59f9d9707b2ffc331131ac814056f4e90563db4 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -57,7 +57,7 @@ if (! $sortfield) $sortfield="p.datep";
/*
* View
*/
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] || $_GET["ref"])
{
@@ -85,7 +85,7 @@ if ($_GET["id"] || $_GET["ref"])
// Reference
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index b95668b81b52613add5e422773b0890a4996dd46..16cab013f43b69d2d395e267812d73b286b3e8ff 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -228,8 +228,8 @@ else
// Confirm delete third party
if ($action == 'delete')
{
- $html = new Form($db);
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$entrepot->id,$langs->trans("DeleteAWarehouse"),$langs->trans("ConfirmDeleteWarehouse",$entrepot->libelle),"confirm_delete",'',0,2);
+ $form = new Form($db);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$entrepot->id,$langs->trans("DeleteAWarehouse"),$langs->trans("ConfirmDeleteWarehouse",$entrepot->libelle),"confirm_delete",'',0,2);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 4edb1411eb174b607e5f2b292df84799c932d480..549d06c8e1e40a66db6ae5c5428ed93693e9512c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -167,7 +167,7 @@ if ($_GET["id"] || $_GET["ref"])
$picto=($product->type==1?'service':'product');
dol_fiche_head($head, 'stock', $titre, 0, $picto);
- $html = new Form($db);
+ $form = new Form($db);
print($mesg);
@@ -176,7 +176,7 @@ if ($_GET["id"] || $_GET["ref"])
// Ref
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td>';
- print $html->showrefnav($product,'ref','',1,'ref');
+ print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
@@ -277,8 +277,8 @@ if ($_GET["id"] || $_GET["ref"])
}
// Stock
- print '<tr><td>'.$html->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,'id',$product->id,$user->rights->produit->creer).'</td><td colspan="2">';
- print $html->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,'id',$product->id,$user->rights->produit->creer);
+ print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,'id',$product->id,$user->rights->produit->creer).'</td><td colspan="2">';
+ print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,'id',$product->id,$user->rights->produit->creer);
print '</td></tr>';
// Last movement
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 28b29abaa85c1e712fb4787b4e2bde262f25117c..db2fa12149805f75c41d436f09fd5c2658cf07ba 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -135,7 +135,7 @@ if ($_GET["id"]) $result = $product->fetch($_GET["id"]);
llxHeader("","",$langs->trans("Translation"));
-$html = new Form($db);
+$form = new Form($db);
$formadmin=new FormAdmin($db);
$head=product_prepare_head($product, $user);
@@ -150,7 +150,7 @@ print '<table class="border" width="100%">';
// Reference
print '<tr>';
print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
-print $html->showrefnav($product,'ref','',1,'ref');
+print $form->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
print '</table>';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index e87891ad22ec34d8cd0eed7d919464e6ae48be7e..24e4a7ab3b58a0297873253299fe281e644e1caf 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -117,7 +117,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->projet->creer)
$help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos";
llxHeader('', $langs->trans("Project"), $help_url);
-$html = new Form($db);
+$form = new Form($db);
$formcompany= new FormCompany($db);
$contactstatic=new Contact($db);
$userstatic=new User($db);
@@ -159,7 +159,7 @@ if ($id > 0 || ! empty($ref))
// Define a complementary filter for search of next/prev ref.
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$project->next_prev_filter=" rowid in (".$projectsListId.")";
- print $html->showrefnav($project,'ref',$linkback,1,'ref','ref','');
+ print $form->showrefnav($project,'ref',$linkback,1,'ref','ref','');
print '</td></tr>';
// Label
@@ -225,7 +225,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
// On recupere les id des users deja selectionnes
- $html->select_users($user->id,'contactid',0);
+ $form->select_users($user->id,'contactid',0);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($project, '', 'type','internal','rowid');
@@ -257,7 +257,7 @@ if ($id > 0 || ! empty($ref))
print '</td>';
print '<td colspan="1">';
- $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid');
+ $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid');
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index 9d703d5dcd66419c8af8786f71a836462891eabc..563b8839e05bdca82a51af39210c085790cfcb3a 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -255,7 +255,7 @@ if (GETPOST("action") == 'confirm_delete' && GETPOST("confirm") == "yes" && $use
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$formfile = new FormFile($db);
$userstatic = new User($db);
@@ -301,25 +301,25 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
// Customer
print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
- $text=$html->select_company(GETPOST("socid"),'socid','',1,1);
+ $text=$form->select_company(GETPOST("socid"),'socid','',1,1);
$texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty");
- print $html->textwithtooltip($text.' '.img_help(),$texthelp,1);
+ print $form->textwithtooltip($text.' '.img_help(),$texthelp,1);
print '</td></tr>';
// Public
print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
$array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
- print $html->selectarray('public',$array,$project->public);
+ print $form->selectarray('public',$array,$project->public);
print '</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print $html->select_date('','project');
+ print $form->select_date('','project');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print $html->select_date(-1,'projectend');
+ print $form->select_date(-1,'projectend');
print '</td></tr>';
// Description
@@ -363,19 +363,19 @@ else
// Confirmation validation
if ($_GET['action'] == 'validate')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$project->id, $langs->trans('ValidateProject'), $langs->trans('ConfirmValidateProject'), 'confirm_validate','',0,1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$project->id, $langs->trans('ValidateProject'), $langs->trans('ConfirmValidateProject'), 'confirm_validate','',0,1);
if ($ret == 'html') print '<br>';
}
// Confirmation close
if ($_GET["action"] == 'close')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("CloseAProject"),$langs->trans("ConfirmCloseAProject"),"confirm_close",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("CloseAProject"),$langs->trans("ConfirmCloseAProject"),"confirm_close",'','',1);
if ($ret == 'html') print '<br>';
}
// Confirmation reopen
if ($_GET["action"] == 'reopen')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("ReOpenAProject"),$langs->trans("ConfirmReOpenAProject"),"confirm_reopen",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("ReOpenAProject"),$langs->trans("ConfirmReOpenAProject"),"confirm_reopen",'','',1);
if ($ret == 'html') print '<br>';
}
// Confirmation delete
@@ -386,7 +386,7 @@ else
$taskarray=$task->getTasksArray(0,0,$project->id,0,0);
$nboftask=count($taskarray);
if ($nboftask) $text.='<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks",$nboftask);
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("DeleteAProject"),$text,"confirm_delete",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$project->id,$langs->trans("DeleteAProject"),$text,"confirm_delete",'','',1);
if ($ret == 'html') print '<br>';
}
@@ -410,13 +410,13 @@ else
// Customer
print '<tr><td>'.$langs->trans("Company").'</td><td>';
- print $html->select_societes($project->societe->id,'socid','',1,1);
+ print $form->select_societes($project->societe->id,'socid','',1,1);
print '</td></tr>';
// Visibility
print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
$array=array(0 => $langs->trans("PrivateProject"),1 => $langs->trans("SharedProject"));
- print $html->selectarray('public',$array,$project->public);
+ print $form->selectarray('public',$array,$project->public);
print '</td></tr>';
// Statut
@@ -424,12 +424,12 @@ else
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print $html->select_date($project->date_start,'project');
+ print $form->select_date($project->date_start,'project');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print $html->select_date($project->date_end?$project->date_end:-1,'projectend');
+ print $form->select_date($project->date_end?$project->date_end:-1,'projectend');
print '</td></tr>';
// Description
@@ -456,7 +456,7 @@ else
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$project->next_prev_filter=" rowid in (".$projectsListId.")";
}
- print $html->showrefnav($project,'ref','',1,'ref','ref');
+ print $form->showrefnav($project,'ref','',1,'ref','ref');
print '</td></tr>';
// Label
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index d696529e4d32fd431a2d712157948ca8ed1961c8..4edf8dc897672c1ec64ac728074b7068d57f8cec 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -88,7 +88,7 @@ if ($_POST['action'] == 'update_private' && $user->rights->projet->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$userstatic=new User($db);
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
// Define a complementary filter for search of next/prev ref.
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$project->next_prev_filter=" rowid in (".$projectsListId.")";
- print $html->showrefnav($project,'ref','',1,'ref','ref');
+ print $form->showrefnav($project,'ref','',1,'ref','ref');
print '</td></tr>';
// Label
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 516c7aa65ff5c0d5682b1c6be451a045b4ca2ef8..e800599a70ecb1515d003edd16406612e7d5eb42 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -117,7 +117,7 @@ if ($_GET["action"] == 'deleteline' && $user->rights->projet->creer)
llxHeader('', $langs->trans("Task"));
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
$userstatic = new User($db);
@@ -161,7 +161,7 @@ if ($id > 0 || ! empty($ref))
print '<tr><td width="30%">'.$langs->trans('Ref').'</td><td colspan="3">';
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$task->next_prev_filter=" fk_projet in (".$projectsListId.")";
- print $html->showrefnav($task,'id','',1,'rowid','ref','','');
+ print $form->showrefnav($task,'id','',1,'rowid','ref','','');
print '</td></tr>';
// Label
@@ -224,7 +224,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
// On recupere les id des users deja selectionnes
$contactsofproject=$project->getListContactId('internal');
- $html->select_users($user->id,'contactid',0,'',0,'',$contactsofproject);
+ $form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject);
print '</td>';
print '<td>';
$formcompany->selectTypeContact($task, '', 'type','internal','rowid');
@@ -258,7 +258,7 @@ if ($id > 0 || ! empty($ref))
print '<td colspan="1">';
$contactofproject=$project->getListContactId('external');
- $nbofcontacts=$html->select_contacts($selectedCompany,'','contactid',0,'',$contactofproject);
+ $nbofcontacts=$form->select_contacts($selectedCompany,'','contactid',0,'',$contactofproject);
if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
print '</td>';
print '<td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index e14f8005fbcba14d65def7e05d61c20b0f8edda6..f1283d50c1abe652c5fd99c0508f43c0b0001249 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -87,7 +87,7 @@ if ($_POST['action'] == 'update_private' && $user->rights->projet->creer)
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
$project = new Project($db);
$id = $_GET['id'];
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$task->next_prev_filter=" fk_projet in (".$projectsListId.")";
- print $html->showrefnav($task,'id','',1,'rowid','ref','','');
+ print $form->showrefnav($task,'id','',1,'rowid','ref','','');
print '</td></tr>';
// Label
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index f4f608f03bb3cc5389325e29153b3dd134b0c0ef..05172008ddf07048d9db234593d047c731ac93eb 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -111,7 +111,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user-
llxHeader("",$langs->trans("Task"));
-$html = new Form($db);
+$form = new Form($db);
$formother = new FormOther($db);
$project = new Project($db);
@@ -170,12 +170,12 @@ if ($taskid)
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print $html->select_date($task->date_start,'dateo');
+ print $form->select_date($task->date_start,'dateo');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print $html->select_date($task->date_end?$task->date_end:-1,'datee');
+ print $form->select_date($task->date_end?$task->date_end:-1,'datee');
print '</td></tr>';
// Progress
@@ -206,7 +206,7 @@ if ($taskid)
if ($_GET["action"] == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"],$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"],$langs->trans("DeleteATask"),$langs->trans("ConfirmDeleteATask"),"confirm_delete");
if ($ret == 'html') print '<br>';
}
@@ -218,7 +218,7 @@ if ($taskid)
print '</td><td colspan="3">';
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$task->next_prev_filter=" fk_projet in (".$projectsListId.")";
- print $html->showrefnav($task,'id','',1,'rowid','ref','','');
+ print $form->showrefnav($task,'id','',1,'rowid','ref','','');
print '</td>';
print '</tr>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 535f10ba5b84f59a8e6e037ece9069560f01c440..75d9af322f5ed9db574247a9e7954924c483dc40 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -145,7 +145,7 @@ $project=new Project($db);
llxHeader("",$langs->trans("Task"));
-$html = new Form($db);
+$form = new Form($db);
if ($_GET["id"] > 0)
{
@@ -173,7 +173,7 @@ if ($_GET["id"] > 0)
if ($_GET["action"] == 'deleteline')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$_GET["id"].'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
if ($ret == 'html') print '<br>';
}
@@ -185,7 +185,7 @@ if ($_GET["id"] > 0)
print '</td><td colspan="3">';
$projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,1);
$task->next_prev_filter=" fk_projet in (".$projectsListId.")";
- print $html->showrefnav($task,'id','',1,'rowid','ref','','');
+ print $form->showrefnav($task,'id','',1,'rowid','ref','','');
print '</td></tr>';
// Label
@@ -233,14 +233,14 @@ if ($_GET["id"] > 0)
// Date
print '<td nowrap="nowrap">';
$newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]);
- print $html->select_date($newdate,'time','','','',"timespent_date");
+ print $form->select_date($newdate,'time','','','',"timespent_date");
print '</td>';
// Contributor
print '<td nowrap="nowrap">';
$contactoftask=$task->getListContactId('internal');
print img_object('','user');
- print $html->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask);
+ print $form->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask);
print '</td>';
// Note
@@ -250,7 +250,7 @@ if ($_GET["id"] > 0)
// Duration
print '<td nowrap="nowrap" align="right">';
- print $html->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:''));
+ print $form->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:''));
print '</td>';
print '<td align="center">';
@@ -317,7 +317,7 @@ if ($_GET["id"] > 0)
print '<td>';
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
{
- print $html->select_date($db->jdate($task_time->task_date),'timeline','','','',"timespent_date");
+ print $form->select_date($db->jdate($task_time->task_date),'timeline','','','',"timespent_date");
}
else
{
@@ -330,7 +330,7 @@ if ($_GET["id"] > 0)
print '<td>';
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
{
- print $html->select_users($user->id,'userid_line');
+ print $form->select_users($user->id,'userid_line');
}
else
{
@@ -357,7 +357,7 @@ if ($_GET["id"] > 0)
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
{
print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
- print $html->select_duration('new_duration',$task_time->task_duration);
+ print $form->select_duration('new_duration',$task_time->task_duration);
}
else
{
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 2a2a5fe79cfe8764b310550a44e1a81c742f4a81..b528ac0c7f3fbe599409fe237be51ca6b78fae81 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -314,7 +314,7 @@ if ($action == 'added')
* View
*/
-$html = new Form($db);
+$form = new Form($db);
$formcompany = new FormCompany($db);
$adht = new AdherentType($db);
$extrafields = new ExtraFields($db);
@@ -373,7 +373,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
$isempty=1;
if (count($listoftype)==1) { $defaulttype=$tmp[0]; $isempty=0; }
print '<tr><td width="15%">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td width="35%">';
- print $html->selectarray("type", $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty);
+ print $form->selectarray("type", $adht->liste_array(), GETPOST('type')?GETPOST('type'):$defaulttype, $isempty);
print '</td></tr>'."\n";
}
else
@@ -388,7 +388,7 @@ $morphys["mor"] = $langs->trans("Moral");
if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
{
print '<tr class="morphy"><td>'.$langs->trans("MorPhy").' <FONT COLOR="red">*</FONT></td><td>'."\n";
- print $html->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+ print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
print '</td></tr>'."\n";
}
else
@@ -430,7 +430,7 @@ if (! $pays_id && ! empty($conf->geoipmaxmind->enabled))
}
}
$pays_code=getCountry($pays_id,2,$db,$langs);
-print $html->select_country($pays_id,'pays_id');
+print $form->select_country($pays_id,'pays_id');
print '</td></tr>';
// State
if (empty($conf->global->SOCIETE_DISABLE_STATE))
@@ -451,7 +451,7 @@ if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
}
// Birthday
print '<tr><td>'.$langs->trans("Birthday").'</td><td>';
-print $html->select_date($birthday,'birth',0,0,1,"newmember");
+print $form->select_date($birthday,'birth',0,0,1,"newmember");
print '</td></tr>'."\n";
// Photo
print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" size="40" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
@@ -475,7 +475,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER))
{
$arraybudget=array('50'=>'<= 100 000','100'=>'<= 200 000','200'=>'<= 500 000','400'=>'<= 1 500 000','750'=>'<= 3 000 000','1500'=>'<= 5 000 000','2000'=>'5 000 000+');
print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <FONT COLOR="red">*</FONT></td><td>';
- print $html->select_array('budget', $arraybudget, GETPOST('budget'), 1);
+ print $form->select_array('budget', $arraybudget, GETPOST('budget'), 1);
print ' € or $';
print '<script type="text/javascript">
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 3336cb5074118207b41c3c1e96df7cb87fda6264..e664bdc6f41b6baa7230b62c74d28b26976f21eb 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -565,7 +565,7 @@ print "</table><br>\n";
print_titre($langs->trans("Other"));
// Autres options
-$html=new Form($db);
+$form=new Form($db);
$var=true;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
@@ -594,7 +594,7 @@ else
'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
);
- print $html->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT",$arrval,$conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+ print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT",$arrval,$conf->global->COMPANY_USE_SEARCH_TO_SELECT);
print '</td><td align="right">';
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</td>";
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 02283d0e8fbbfbe5392cf05a75fece6481f4e67c..f4717cc264c7f03c85de0f7496cd39321090c183 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -54,7 +54,7 @@ $result = restrictedArea($user, 'societe', $socid);
$contactstatic = new Contact($db);
-$html = new Form($db);
+$form = new Form($db);
/*
* Fiche categorie de client et/ou fournisseur
@@ -79,7 +79,7 @@ if ($_GET["socid"])
print '<table class="border" width="100%">';
print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
- print $html->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
+ print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
print '</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 9058601728d72faaf4d2c8cad2d4e9c6ba3fbe72..d4855b58f4a739b849546a9ca837ab89da846704 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -141,7 +141,7 @@ if ($socid > 0)
if ($conf->notification->enabled) $langs->load("mails");
$head = societe_prepare_head($object);
- $html=new Form($db);
+ $form=new Form($db);
dol_fiche_head($head, 'document', $langs->trans("ThirdParty"),0,'company');
@@ -204,7 +204,7 @@ if ($socid > 0)
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>';
}
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 4e18863ad4c022582b3af82ae283bed7fe332234..e931b35d570b4a07626fbe7bd5cb1d7cf1d8e6bf 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -130,7 +130,7 @@ $result=$object->fetch($socid);
if ($result > 0)
{
- $html = new Form($db);
+ $form = new Form($db);
$langs->load("other");
@@ -236,14 +236,14 @@ if ($result > 0)
$actions[$notifiedevent['rowid']]=$label;
}
print '<tr '.$bc[$var].'><td>';
- print $html->selectarray("contactid",$listofemails);
+ print $form->selectarray("contactid",$listofemails);
print '</td>';
print '<td>';
- print $html->selectarray("actionid",$actions,'',1);
+ print $form->selectarray("actionid",$actions,'',1);
print '</td>';
print '<td>';
$type=array('email'=>$langs->trans("EMail"));
- print $html->selectarray("typeid",$type);
+ print $form->selectarray("typeid",$type);
print '</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
print '</tr>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 56c7c94c763615d329e3de1a14737c00c6328106..731a5e14eb229cbe4679dbeffd8e57f1edd2e1ad 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -837,10 +837,10 @@ else
print '</tr>';
// Assujeti TVA
- $html = new Form($db);
+ $form = new Form($db);
print '<tr><td>'.$langs->trans('VATIsUsed').'</td>';
print '<td>';
- print $html->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation
+ print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation
print '</td>';
print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>';
print '<td nowrap="nowrap">';
@@ -904,22 +904,22 @@ else
if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
- print $html->selectyesno('localtax1assuj_value',0,1);
+ print $form->selectyesno('localtax1assuj_value',0,1);
print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
- print $html->selectyesno('localtax2assuj_value',0,1);
+ print $form->selectyesno('localtax2assuj_value',0,1);
print '</td></tr>';
}
elseif($mysoc->localtax1_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
- print $html->selectyesno('localtax1assuj_value',0,1);
+ print $form->selectyesno('localtax1assuj_value',0,1);
print '</td><tr>';
}
elseif($mysoc->localtax2_assuj=="1")
{
print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
- print $html->selectyesno('localtax2assuj_value',0,1);
+ print $form->selectyesno('localtax2assuj_value',0,1);
print '</td><tr>';
}
}
@@ -1429,14 +1429,14 @@ else
dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
- $html = new Form($db);
+ $form = new Form($db);
// Confirm delete third party
if ($action == 'delete' || $conf->use_javascript_ajax)
{
- $html = new Form($db);
- $ret=$html->form_confirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete");
+ $form = new Form($db);
+ $ret=$form->form_confirm($_SERVER["PHP_SELF"]."?socid=".$object->id,$langs->trans("DeleteACompany"),$langs->trans("ConfirmDeleteCompany"),"confirm_delete",'',0,"action-delete");
if ($ret == 'html') print '<br>';
}
@@ -1471,7 +1471,7 @@ else
if ($object->logo)
{
$showlogo.='<td rowspan="'.$rowspan.'" style="text-align: center;" width="25%">';
- $showlogo.=$html->showphoto('societe',$object,50);
+ $showlogo.=$form->showphoto('societe',$object,50);
$showlogo.='</td>';
}
@@ -1611,7 +1611,7 @@ else
else print '<td> </td><td> </td></tr>';
// VAT payers
- $html = new Form($db);
+ $form = new Form($db);
print '<tr><td>';
print $langs->trans('VATIsUsed');
print '</td><td>';
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index a47524ca776c947e34e48a719d2430a3cad99775..e18cd0020a5448fe544e1318d608b627a8cf9daa 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -515,7 +515,7 @@ if ($action == 'adduserldap')
llxHeader('',$langs->trans("UserCard"));
-$html = new Form($db);
+$form = new Form($db);
if (($action == 'create') || ($action == 'adduserldap'))
{
@@ -600,7 +600,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '</td>';
print '<td>';
print '<input type="hidden" name="action" value="adduserldap">';
- print $html->selectarray('users', $liste, '', 1);
+ print $form->selectarray('users', $liste, '', 1);
print '</td><td align="center">';
print '<input type="submit" class="button" value="'.$langs->trans('Get').'">';
print '</td></tr></table>';
@@ -760,7 +760,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Type
print '<tr><td valign="top">'.$langs->trans("Type").'</td>';
print '<td>';
- print $html->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
print '</td></tr>';
// Tel
@@ -926,7 +926,7 @@ else
*/
if ($action == 'password')
{
- $ret=$html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$fuser->login),"confirm_password", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$fuser->login),"confirm_password", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -935,7 +935,7 @@ else
*/
if ($action == 'passwordsend')
{
- $ret=$html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$fuser->login),"confirm_passwordsend", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$fuser->login),"confirm_passwordsend", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -944,7 +944,7 @@ else
*/
if ($action == 'disable')
{
- $ret=$html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$fuser->login),"confirm_disable", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$fuser->login),"confirm_disable", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -953,7 +953,7 @@ else
*/
if ($action == 'enable')
{
- $ret=$html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$fuser->login),"confirm_enable", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$fuser->login),"confirm_enable", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -962,7 +962,7 @@ else
*/
if ($action == 'delete')
{
- $ret=$html->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$fuser->login),"confirm_delete", '', 0, 1);
+ $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$fuser->login),"confirm_delete", '', 0, 1);
if ($ret == 'html') print '<br>';
}
@@ -978,7 +978,7 @@ else
// Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
- print $html->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>';
print '</tr>'."\n";
@@ -994,7 +994,7 @@ else
// Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
- print $html->showphoto('userphoto',$fuser,100);
+ print $form->showphoto('userphoto',$fuser,100);
print '</td>';
print '</tr>'."\n";
@@ -1054,11 +1054,11 @@ else
print '<tr><td valign="top">'.$langs->trans("Administrator").'</td><td>';
if (! empty($conf->multicompany->enabled) && $fuser->admin && ! $fuser->entity)
{
- print $html->textwithpicto(yn($fuser->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
+ print $form->textwithpicto(yn($fuser->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
}
else if ($fuser->admin)
{
- print $html->textwithpicto(yn($fuser->admin),$langs->trans("AdministratorDesc"),1,"admin");
+ print $form->textwithpicto(yn($fuser->admin),$langs->trans("AdministratorDesc"),1,"admin");
}
else
{
@@ -1087,7 +1087,7 @@ else
print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
if ($fuser->societe_id)
{
- print $html->textwithpicto($langs->trans("External"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("External"),$langs->trans("InternalExternalDesc"));
}
else if ($fuser->ldap_sid)
{
@@ -1095,7 +1095,7 @@ else
}
else
{
- print $html->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
+ print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
}
print '</td></tr>'."\n";
@@ -1450,7 +1450,7 @@ else
print '</td>';
// Photo
print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
- print $html->showphoto('userphoto',$fuser);
+ print $form->showphoto('userphoto',$fuser);
if ($caneditfield)
{
if ($fuser->photo) print "<br>\n";
@@ -1505,7 +1505,7 @@ else
$text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$fuser->pass.'">';
if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
{
- $text=$html->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
+ $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
}
}
else
@@ -1584,7 +1584,7 @@ else
{
$yn = yn($fuser->admin);
print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
- if (! empty($conf->multicompany->enabled) && ! $fuser->entity) print $html->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+ if (! empty($conf->multicompany->enabled) && ! $fuser->entity) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
else print $yn;
}
print '</td></tr>';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 3bbacca3bb3bfb9cbd1b7039c2a4e65a0418cc32..a07a02ed8ced0327164b1f45f00ed53e697d6fd3 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -81,7 +81,7 @@ if ($action == 'update' && $user->rights->user->user->creer && ! $_POST["cancel"
llxHeader();
-$html = new Form($db);
+$form = new Form($db);
if ($id)
{
@@ -100,7 +100,7 @@ if ($id)
// Reference
print '<tr><td width="20%">'.$langs->trans('Ref').'</td>';
print '<td colspan="3">';
- print $html->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+ print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>';
print '</tr>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index c02f5833a2536b036a2fdc2a3758b139ec20bec3..add72a4ffb04f8875a2cd9f62b542159fa71c42b 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -70,7 +70,7 @@ $searchform=array("main_searchform_societe","main_searchform_contact","main_sear
$searchformconst=array($conf->global->MAIN_SEARCHFORM_SOCIETE,$conf->global->MAIN_SEARCHFORM_CONTACT,$conf->global->MAIN_SEARCHFORM_PRODUITSERVICE);
$searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$langs->trans("ProductsAndServices"));
-$html = new Form($db);
+$form = new Form($db);
$formadmin=new FormAdmin($db);
@@ -126,7 +126,7 @@ print '<table class="border" width="100%">';
// Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
-print $html->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>';
print '</tr>';