From f0c327c0706e09bfedab7e0c5b9040a41db2dd91 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 8 Nov 2011 17:18:45 +0800 Subject: [PATCH] Fix: uniform code replace all $html by $form with exceptions "$htmlname, $htmltooltip" --- htdocs/adherents/card_subscriptions.php | 26 +- htdocs/adherents/cotisations.php | 6 +- htdocs/adherents/document.php | 8 +- htdocs/adherents/fiche.php | 78 +++--- htdocs/adherents/ldap.php | 4 +- htdocs/adherents/liste.php | 4 +- htdocs/adherents/note.php | 6 +- htdocs/adherents/type.php | 12 +- htdocs/admin/accounting.php | 2 +- htdocs/admin/barcode.php | 2 +- htdocs/admin/boxes.php | 4 +- htdocs/admin/commande.php | 12 +- htdocs/admin/compta.php | 2 +- htdocs/admin/confexped.php | 2 +- htdocs/admin/contract.php | 4 +- htdocs/admin/dict.php | 16 +- htdocs/admin/dons.php | 4 +- htdocs/admin/expedition.php | 6 +- htdocs/admin/facture.php | 8 +- htdocs/admin/fichinter.php | 6 +- htdocs/admin/fournisseur.php | 8 +- htdocs/admin/ihm.php | 20 +- htdocs/admin/ldap.php | 14 +- htdocs/admin/ldap_contacts.php | 2 +- htdocs/admin/ldap_groups.php | 2 +- htdocs/admin/ldap_members.php | 2 +- htdocs/admin/ldap_users.php | 2 +- htdocs/admin/limits.php | 14 +- htdocs/admin/livraison.php | 6 +- htdocs/admin/mails.php | 18 +- htdocs/admin/menus.php | 10 +- htdocs/admin/menus/edit.php | 6 +- htdocs/admin/menus/index.php | 8 +- htdocs/admin/pdf.php | 12 +- htdocs/admin/prelevement.php | 10 +- htdocs/admin/project.php | 6 +- htdocs/admin/propale.php | 10 +- htdocs/admin/security.php | 4 +- htdocs/admin/security_other.php | 4 +- htdocs/admin/sms.php | 6 +- htdocs/admin/stock.php | 16 +- htdocs/admin/syslog.php | 8 +- htdocs/admin/system/database.php | 6 +- htdocs/admin/taxes.php | 2 +- htdocs/admin/tools/dolibarr_export.php | 2 +- htdocs/admin/tools/eaccelerator.php | 2 +- htdocs/admin/tools/export.php | 2 +- htdocs/admin/tools/purge.php | 4 +- htdocs/admin/triggers.php | 2 +- htdocs/bookmarks/fiche.php | 10 +- htdocs/cashdesk/tpl/validation1.tpl.php | 4 +- htdocs/categories/categorie.php | 14 +- htdocs/categories/edit.php | 4 +- htdocs/categories/fiche.php | 4 +- htdocs/categories/index.php | 4 +- htdocs/categories/photos.php | 4 +- htdocs/categories/viewcat.php | 4 +- htdocs/comm/action/fiche.php | 46 ++-- htdocs/comm/addpropal.php | 28 +-- htdocs/comm/address.php | 4 +- htdocs/comm/fiche.php | 10 +- htdocs/comm/index.php | 2 +- htdocs/comm/mailing/cibles.php | 6 +- htdocs/comm/mailing/fiche.php | 32 +-- htdocs/comm/mailing/info.php | 2 +- htdocs/comm/mailing/liste.php | 4 +- htdocs/comm/propal.php | 48 ++-- htdocs/comm/propal/apercu.php | 2 +- htdocs/comm/propal/contact.php | 8 +- htdocs/comm/propal/document.php | 6 +- htdocs/comm/propal/index.php | 2 +- htdocs/comm/propal/note.php | 4 +- htdocs/commande/apercu.php | 2 +- htdocs/commande/contact.php | 8 +- htdocs/commande/document.php | 6 +- htdocs/commande/fiche.php | 72 +++--- htdocs/commande/index.php | 2 +- htdocs/commande/liste.php | 2 +- htdocs/commande/note.php | 4 +- htdocs/compta/bank/account.php | 16 +- htdocs/compta/bank/admin/bank.php | 2 +- htdocs/compta/bank/fiche.php | 6 +- htdocs/compta/bank/ligne.php | 12 +- htdocs/compta/bank/releve.php | 4 +- htdocs/compta/bank/search.php | 4 +- htdocs/compta/bank/treso.php | 4 +- htdocs/compta/bank/virement.php | 8 +- htdocs/compta/dons/fiche.php | 26 +- htdocs/compta/facture.php | 88 +++---- htdocs/compta/facture/apercu.php | 18 +- htdocs/compta/facture/contact.php | 8 +- htdocs/compta/facture/document.php | 6 +- htdocs/compta/facture/fiche-rec.php | 14 +- htdocs/compta/facture/impayees.php | 2 +- htdocs/compta/facture/note.php | 4 +- htdocs/compta/facture/prelevement.php | 24 +- htdocs/compta/index.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 4 +- htdocs/compta/journal/sellsjournal.php | 4 +- htdocs/compta/localtax/clients.php | 6 +- htdocs/compta/localtax/fiche.php | 10 +- htdocs/compta/paiement.php | 10 +- htdocs/compta/paiement/cheque/fiche.php | 14 +- htdocs/compta/paiement/fiche.php | 18 +- htdocs/compta/paiement_charge.php | 8 +- htdocs/compta/payment_sc/fiche.php | 8 +- htdocs/compta/prelevement/bon.php | 2 +- htdocs/compta/prelevement/fiche.php | 10 +- htdocs/compta/prelevement/ligne.php | 10 +- htdocs/compta/propal.php | 20 +- htdocs/compta/resultat/clientfourn.php | 8 +- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/sociales/charges.php | 18 +- htdocs/compta/sociales/index.php | 4 +- htdocs/compta/stats/cabyuser.php | 6 +- htdocs/compta/stats/casoc.php | 6 +- htdocs/compta/stats/index.php | 2 +- htdocs/compta/tva/clients.php | 6 +- htdocs/compta/tva/fiche.php | 10 +- htdocs/compta/tva/quadri_detail.php | 6 +- htdocs/contact/fiche.php | 6 +- htdocs/contact/perso.php | 4 +- htdocs/contrat/contact.php | 6 +- htdocs/contrat/document.php | 2 +- htdocs/contrat/fiche.php | 16 +- htdocs/contrat/note.php | 2 +- htdocs/core/class/CMailFile.class.php | 4 +- htdocs/core/class/commonobject.class.php | 6 +- htdocs/core/class/html.formfile.class.php | 4 +- htdocs/core/class/interfaces.class.php | 4 +- .../filemanagerdol/connectors/php/util.php | 8 +- htdocs/core/lib/functions.lib.php | 10 +- htdocs/core/lib/functions2.lib.php | 20 +- htdocs/core/lib/images.lib.php | 22 +- htdocs/core/lib/sendings.lib.php | 4 +- htdocs/core/lib/xcal.lib.php | 20 +- .../modules/dons/html_cerfafr.modules.php | 36 +-- .../core/tpl/freeproductline_create.tpl.php | 8 +- htdocs/core/tpl/freeproductline_edit.tpl.php | 6 +- .../tpl/predefinedproductline_create.tpl.php | 6 +- .../tpl/predefinedproductline_edit.tpl.php | 6 +- .../tpl/predefinedproductline_view.tpl.php | 2 +- .../tpl/predefinedproductlinediv_view.tpl.php | 2 +- htdocs/ecm/docother.php | 2 +- htdocs/expedition/fiche.php | 46 ++-- htdocs/expedition/shipment.php | 28 +-- htdocs/exports/export.php | 10 +- htdocs/exports/index.php | 4 +- htdocs/fichinter/apercu.php | 2 +- htdocs/fichinter/contact.php | 6 +- htdocs/fichinter/document.php | 2 +- htdocs/fichinter/note.php | 2 +- htdocs/fourn/commande/contact.php | 8 +- htdocs/fourn/commande/dispatch.php | 6 +- htdocs/fourn/commande/document.php | 4 +- htdocs/fourn/commande/fiche.php | 54 ++--- htdocs/fourn/commande/history.php | 4 +- htdocs/fourn/commande/note.php | 4 +- htdocs/fourn/facture/contact.php | 8 +- htdocs/fourn/facture/document.php | 4 +- htdocs/fourn/facture/fiche.php | 64 ++--- htdocs/fourn/facture/index.php | 2 +- htdocs/fourn/facture/note.php | 4 +- htdocs/fourn/facture/paiement.php | 12 +- htdocs/fourn/paiement/fiche.php | 18 +- htdocs/imports/import.php | 14 +- htdocs/imports/index.php | 4 +- htdocs/includes/nusoap/lib/Mail/mime.php | 16 +- .../phpexcel/PHPExcel/Shared/PDF/tcpdf.php | 200 ++++++++-------- .../phpexcel/PHPExcel/Writer/HTML.php | 134 +++++------ .../includes/phpexcel/PHPExcel/Writer/PDF.php | 10 +- .../tcpdf/doc/com-tecnick-tcpdf/TCPDF.html | 60 ++--- htdocs/includes/tcpdf/doc/elementindex.html | 18 +- .../doc/elementindex_com-tecnick-tcpdf.html | 18 +- htdocs/includes/tcpdf/tcpdf.php | 222 +++++++++--------- htdocs/livraison/fiche.php | 8 +- htdocs/main.inc.php | 8 +- htdocs/product/admin/produit.php | 12 +- htdocs/product/barcode.php | 4 +- .../product/actions_card_product.class.php | 26 +- .../service/actions_card_service.class.php | 24 +- htdocs/product/composition/fiche.php | 10 +- htdocs/product/document.php | 4 +- htdocs/product/fiche.php | 36 +-- htdocs/product/fournisseurs.php | 16 +- htdocs/product/liste.php | 4 +- htdocs/product/photos.php | 6 +- htdocs/product/price.php | 20 +- htdocs/product/stats/commande.php | 4 +- htdocs/product/stats/commande_fournisseur.php | 4 +- htdocs/product/stats/contrat.php | 4 +- htdocs/product/stats/facture.php | 4 +- htdocs/product/stats/facture_fournisseur.php | 4 +- htdocs/product/stats/fiche.php | 4 +- htdocs/product/stats/propal.php | 4 +- htdocs/product/stock/fiche.php | 4 +- htdocs/product/stock/product.php | 8 +- htdocs/product/traduction.php | 4 +- htdocs/projet/contact.php | 8 +- htdocs/projet/fiche.php | 30 +-- htdocs/projet/note.php | 4 +- htdocs/projet/tasks/contact.php | 8 +- htdocs/projet/tasks/note.php | 4 +- htdocs/projet/tasks/task.php | 10 +- htdocs/projet/tasks/time.php | 18 +- htdocs/public/members/new.php | 12 +- htdocs/societe/admin/societe.php | 4 +- htdocs/societe/agenda.php | 4 +- htdocs/societe/document.php | 4 +- htdocs/societe/notify/fiche.php | 8 +- htdocs/societe/soc.php | 22 +- htdocs/user/fiche.php | 34 +-- htdocs/user/note.php | 4 +- htdocs/user/param_ihm.php | 4 +- 214 files changed, 1401 insertions(+), 1401 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 43f75f7e122..aac2a88d044 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 ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($adh,'rowid'); + print $form->showrefnav($adh,'rowid'); print ''; - $showphoto=''.$html->showphoto('memberphoto',$adh).''; + $showphoto=''.$form->showphoto('memberphoto',$adh).''; // Login if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) @@ -559,7 +559,7 @@ if ($rowid) print ''; print ''; print ''; print ''; print '
'; - print $html->select_societes($adh->fk_soc,'socid','',1); + print $form->select_societes($adh->fk_soc,'socid','',1); print '
'; @@ -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 '
'; } @@ -835,7 +835,7 @@ if ($rowid) $datefrom=mktime(); } } - $html->select_date($datefrom,'','','','',"cotisation"); + $form->select_date($datefrom,'','','','',"cotisation"); print ""; // Date end subscription @@ -848,7 +848,7 @@ if ($rowid) $dateto=-1; // By default, no date is suggested } print ''.$langs->trans("DateEndSubscription").''; - $html->select_date($dateto,'end','','','',"cotisation"); + $form->select_date($dateto,'end','','','',"cotisation"); print ""; if ($adht->cotisation) @@ -917,17 +917,17 @@ if ($rowid) // Bank account print ''.$langs->trans("FinancialAccount").''; - $html->select_comptes($_POST["accountid"],'accountid',0,'',1); + $form->select_comptes($_POST["accountid"],'accountid',0,'',1); print "\n"; // Payment mode print ''.$langs->trans("PaymentMode").''; - $html->select_types_paiements($_POST["operation"],'operation','',2); + $form->select_types_paiements($_POST["operation"],'operation','',2); print "\n"; // Date of payment print ''.$langs->trans("DatePayment").''; - $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 "\n"; print ''.$langs->trans('Numero'); @@ -973,7 +973,7 @@ if ($rowid) $helpcontent.=''.$langs->trans("Content").':
'; $helpcontent.=dol_htmlentitiesbr($texttosend)."\n"; - print $html->textwithpicto($tmp,$helpcontent,1,'help'); + print $form->textwithpicto($tmp,$helpcontent,1,'help'); } print ''; print ''; diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 68c69bf7336..d7ddc80c463 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -167,10 +167,10 @@ if ($result) { print ''; print ''; - $html = new Form($db); - $html->select_comptes('','accountid',0,'',1); + $form = new Form($db); + $form->select_comptes('','accountid',0,'',1); print '
'; - $html->select_types_paiements('','paymenttypeid'); + $form->select_types_paiements('','paymenttypeid'); print ''; } else diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index c6c4a9e0c4f..b71ba3dd48b 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 ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($member,'rowid'); + print $form->showrefnav($member,'rowid'); print ''; // Login @@ -157,7 +157,7 @@ if ($id > 0) // Morphy print ''.$langs->trans("Nature").''.$member->getmorphylib().''; /*print ''; - print $html->showphoto('memberphoto',$member); + print $form->showphoto('memberphoto',$member); print '';*/ print ''; @@ -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 '
'; } diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 1f28bf85ae0..23c6b659799 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 ''.$langs->trans("Nature")."\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 "\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 ''.$langs->trans("NoTypeDefinedGoToSetup").''; } @@ -696,7 +696,7 @@ if ($action == 'create') // Civility print ''.$langs->trans("UserTitle").''; - print $htmlcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; + print $formcompany->select_civility(isset($_POST["civilite_id"])?$_POST["civilite_id"]:$object->civilite_id,'civilite_id').''; print ''; // Lastname @@ -723,15 +723,15 @@ if ($action == 'create') // Zip / Town print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; - 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 ''; // Country $object->pays_id=$object->pays_id?$object->pays_id:$mysoc->pays_id; print ''.$langs->trans('Country').''; - $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 ''; @@ -741,7 +741,7 @@ if ($action == 'create') print ''.$langs->trans('State').''; 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 "".$langs->trans("Birthday")."\n"; - $html->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); + $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); print "\n"; // Profil public print "".$langs->trans("Public")."\n"; - print $html->selectyesno("public",$object->public,1); + print $form->selectyesno("public",$object->public,1); print "\n"; // Other attributes @@ -791,13 +791,13 @@ if ($action == 'create') if ($conf->societe->enabled) { print ''.$langs->trans("LinkedToDolibarrThirdParty").''; - print $html->select_societes($object->fk_soc,'socid','',1); + print $form->select_societes($object->fk_soc,'socid','',1); print ''; } // Login Dolibarr print ''.$langs->trans("LinkedToDolibarrUser").''; - print $html->select_users($object->user_id,'userid',1); + print $form->select_users($object->user_id,'userid',1); print ''; */ print "\n"; @@ -889,11 +889,11 @@ if ($action == 'edit') $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Morale"); print ''.$langs->trans("Nature").''; - 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 ""; // Photo print ''; - print $html->showphoto('memberphoto',$object)."\n"; + print $form->showphoto('memberphoto',$object)."\n"; if ($caneditfieldmember) { if ($object->photo) print "
\n"; @@ -909,7 +909,7 @@ if ($action == 'edit') print ''.$langs->trans("Type").''; 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 ''.$langs->trans("UserTitle").''; - 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 ''; print ''; @@ -948,15 +948,15 @@ if ($action == 'edit') // Zip / Town print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; - 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 ''; // 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 ''.$langs->trans('Country').''; - $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 ''; @@ -964,7 +964,7 @@ if ($action == 'edit') if (empty($conf->global->MEMBER_DISABLE_STATE)) { print ''.$langs->trans('State').''; - $htmlcompany->select_departement($object->fk_departement,$object->pays_code); + $formcompany->select_departement($object->fk_departement,$object->pays_code); print ''; } @@ -982,12 +982,12 @@ if ($action == 'edit') // Date naissance print "".$langs->trans("Birthday")."\n"; - $html->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); + $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc'); print "\n"; // Profil public print "".$langs->trans("Public")."\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 "\n"; // Other attributes @@ -1025,7 +1025,7 @@ if ($action == 'edit') print ''.$langs->trans("LinkedToDolibarrUser").''; 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 ''; @@ -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 '
'; } @@ -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 '
'; } @@ -1139,19 +1139,19 @@ if ($rowid && $action != 'edit') $helpcontent.="
"; $helpcontent.=''.$langs->trans("Content").':
'; $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 '
'; } // 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 '
'; } @@ -1177,19 +1177,19 @@ if ($rowid && $action != 'edit') $helpcontent.="
"; $helpcontent.=''.$langs->trans("Content").':
'; $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 '
'; } // 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 '
'; } @@ -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 '
'; } @@ -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 '
'; } @@ -1220,11 +1220,11 @@ if ($rowid && $action != 'edit') // Ref print ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($object,'rowid'); + print $form->showrefnav($object,'rowid'); print ''; $showphoto=''; - $showphoto.=$html->showphoto('memberphoto',$object); + $showphoto.=$form->showphoto('memberphoto',$object); $showphoto.=''; // Login @@ -1335,7 +1335,7 @@ if ($rowid && $action != 'edit') print ''; print ''; print ''; print ''; print '
'; - print $html->select_societes($object->fk_soc,'socid','',1); + print $form->select_societes($object->fk_soc,'socid','',1); print '
'; @@ -1374,13 +1374,13 @@ if ($rowid && $action != 'edit') print ''; 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 d202a411271..957b8798e93 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 ''; // Ref print ''; print ''; // Nom diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 188638cf366..e0d0a3310ed 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 b0658c0831d..a5a285da341 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 ''; print ''; print ''; @@ -105,7 +105,7 @@ if ($id) // Morphy print ''; /*print '';*/ print ''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 11e4b0fe1b3..7d5172db623 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 ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; @@ -453,7 +453,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -504,7 +504,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -518,7 +518,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index ac4a620a9e6..3004a4e2cab 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup'); diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php index 8c67fd28cf5..a9088a2b976 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 b6222c5b9fe..3288f574739 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("ContractsSetup"),$linkback,'setup'); @@ -172,7 +172,7 @@ if (is_resource($handle)) } print ''; print ''; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 78dbbe3ba95..020ea1f2f3d 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 "
\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 '
'; } @@ -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 ''; continue; } // For region page, we do not show the country input print ''; } elseif ($fieldlist[$field] == 'pays_id') { @@ -1017,14 +1017,14 @@ function fieldList($fieldlist,$obj='') elseif ($fieldlist[$field] == 'element') { print ''; } // La source de l'element (pour les type de contact).' elseif ($fieldlist[$field] == 'source') { print ''; } 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 ''; } elseif (in_array($fieldlist[$field],array('nbjour','decalage','taux','localtax1','localtax2'))) { @@ -1052,7 +1052,7 @@ function fieldList($fieldlist,$obj='') } elseif ($fieldlist[$field]=='unit') { print ''; } else diff --git a/htdocs/admin/dons.php b/htdocs/admin/dons.php index 54a5d208a5b..7fada7e9ee8 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.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $text=''.img_object($langs->trans("Preview"),'generic').''; print ''; print "\n"; diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 5da12051d7e..2719ef96b6d 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 ''; print ''; @@ -552,7 +552,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); print ''; print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 8b0a87d06b3..40b7cef01c4 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=''.$langs->trans("BackToModuleList").''; @@ -409,7 +409,7 @@ foreach ($conf->file->dol_document_root as $dirroot) } print ''; // Preview @@ -708,7 +708,7 @@ print ''; print '\n"; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 42198d5af34..920024d01cf 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=''.$langs->trans("BackToModuleList").''; 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 ''; print ''; @@ -432,7 +432,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); print ''; print ''; diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index 10fea69ecba..ac2087bbf64 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 ''; print ''; @@ -472,7 +472,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); print ''; print ''; print ''; print ''; print ''; @@ -146,7 +146,7 @@ if ($action == 'edit') // Edit { $var=!$var; print ''; } print '
'.$langs->trans("Ref").''; -print $html->showrefnav($adh,'id'); +print $form->showrefnav($adh,'id'); print '
'.$langs->trans('Ref').''; - print $html->showrefnav($adh,'id'); + print $form->showrefnav($adh,'id'); print '
'.$langs->trans("Nature").''.$adh->getmorphylib().''; - print $html->showphoto('memberphoto',$member); + print $form->showphoto('memberphoto',$member); print '
'.$langs->trans("Label").'
'.$langs->trans("SubscriptionRequired").''; - print $htmls->selectyesno("cotisation",1,1); + print $form->selectyesno("cotisation",1,1); print '
'.$langs->trans("VoteAllowed").''; - print $htmls->selectyesno("vote",0,1); + print $form->selectyesno("vote",0,1); print '
'.$langs->trans("Description").''; @@ -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 '
'.$langs->trans("Label").'
'.$langs->trans("SubscriptionRequired").''; - print $htmls->selectyesno("cotisation",$adht->cotisation,1); + print $form->selectyesno("cotisation",$adht->cotisation,1); print '
'.$langs->trans("VoteAllowed").''; - print $htmls->selectyesno("vote",$adht->vote,1); + print $form->selectyesno("vote",$adht->vote,1); print '
'.$langs->trans("Description").''; diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php index 64c011622d6..18a14a755fe 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup'); diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 07254c9d3fc..e2fad678e13 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 ecd1b6cefc9..3d54a657d4a 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 ''; - print $html->selectarray("pos",$pos_name); + print $form->selectarray("pos",$pos_name); print ''; print ''; print ' '; diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index e84980069d3..b3e4f2563c5 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("OrdersSetup"),$linkback,'setup'); @@ -316,7 +316,7 @@ foreach ($conf->file->dol_document_root as $dirroot) } print ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''.img_object($langs->trans("Preview"),'order').''; @@ -490,7 +490,7 @@ print ''; print ''; print '
'.$langs->trans("ValidOrderAfterPropalClosed").''.$html->selectyesno("validorder",$conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL,1).''.$form->selectyesno("validorder",$conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL,1).'
'.$langs->trans("AddDeliveryCostLine").''.$html->selectyesno("addline",$conf->global->COMMANDE_ADD_DELIVERY_COST_LINE,1).''.$form->selectyesno("addline",$conf->global->COMMANDE_ADD_DELIVERY_COST_LINE,1).'
'.$langs->trans("UseCustomerContactAsOrderRecipientIfExist").''.$html->selectyesno("use_customer_contact_as_recipient",$conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1).''.$form->selectyesno("use_customer_contact_as_recipient",$conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1).'
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
 '; - 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 ''; - print $html->selectarray('element', $elementList,$obj->$fieldlist[$field]); + print $form->selectarray('element', $elementList,$obj->$fieldlist[$field]); print ''; - print $html->selectarray('source', $sourceList,$obj->$fieldlist[$field]); + print $form->selectarray('source', $sourceList,$obj->$fieldlist[$field]); print ''; - print $html->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1); + print $form->selectyesno($fieldlist[$field],$obj->$fieldlist[$field],1); print ''; - 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 ''; - print $html->textwithpicto('   '.$text,$htmltooltip,-1,0); + print $form->textwithpicto('   '.$text,$htmltooltip,-1,0); print '
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
'; $link='scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"),'sending').''; - print $html->textwithpicto('     '.$link,$htmltooltip,-1,0); + print $form->textwithpicto('     '.$link,$htmltooltip,-1,0); print '
'; - 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 ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
'; print $langs->trans("ForceInvoiceDate"); print ''; -print $html->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1); +print $form->selectyesno("forcedate",$conf->global->FAC_FORCE_DATE_VALIDATION,1); print ''; print ''; print "
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
'; $link=''.img_object($langs->trans("Preview"),'intervention').''; - print $html->textwithpicto('     '.$link,$htmltooltip,-1,0); + print $form->textwithpicto('     '.$link,$htmltooltip,-1,0); print '
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print '
'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''.img_object($langs->trans("Preview"),'order').''; @@ -604,7 +604,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); print '		'; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''.img_object($langs->trans("Preview"),'bill').''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 790341a9bd3..920433691dc 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 '
'.$langs->trans("EnableMultilangInterface").''; - print $html->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1); + print $form->selectyesno('main_multilangs',$conf->global->MAIN_MULTILANGS,1); print ' 
'.$searchformtitle[$key].''; - print $html->selectyesno($searchform[$key],$searchformconst[$key],1); + print $form->selectyesno($searchform[$key],$searchformconst[$key],1); print '
'; @@ -161,7 +161,7 @@ if ($action == 'edit') // Edit // Show logo $var=!$var; print ''.$langs->trans("EnableShowLogo").''; - 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 ''; print ' '; print ''; @@ -175,7 +175,7 @@ if ($action == 'edit') // Edit // Desactivation javascript et ajax $var=!$var; print ''.$langs->trans("DisableJavascript").''; - 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 ''; print ' '; print ''; @@ -185,7 +185,7 @@ if ($action == 'edit') // Edit { $var=!$var; print ''.$langs->trans("UsePreviewTabs").''; - 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 ''; print ' '; print ''; @@ -203,7 +203,7 @@ if ($action == 'edit') // Edit $var=!$var; print ''.$langs->trans("FirstnameNamePosition").''; $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 ''; print ' '; print ''; @@ -211,7 +211,7 @@ if ($action == 'edit') // Edit // Hide helpcenter link on login page $var=!$var; print ''.$langs->trans("DisableLinkToHelpCenter").''; - 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 ''; print ' '; print ''; @@ -219,7 +219,7 @@ if ($action == 'edit') // Edit // Hide wiki link on login page $var=!$var; print ''.$langs->trans("DisableLinkToHelp",img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1)).''; - 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 ''; print ' '; print ''; @@ -245,7 +245,7 @@ if ($action == 'edit') // Edit // Show bugtrack link $var=!$var; print ''.$langs->trans("ShowBugTrackLink").''; - 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 ''; print ' '; print ''; diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index c770c432b2f..22aa0346940 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 '
'; @@ -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 ''.$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 ''.$langs->trans("LDAPDnContactActiveExample").''; } @@ -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 ''.$langs->trans("LDAPDnMemberActiveExample").''; } @@ -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 ' '; // Version @@ -169,7 +169,7 @@ print ''.$langs->trans("Version").''; $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 ''.$langs->trans("LDAPServerProtocolVersion").''; // Serveur primaire @@ -211,7 +211,7 @@ print ''.$langs->trans("LDAPServerUseTLS").''; $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 ''.$langs->trans("LDAPServerUseTLSExample").''; print ''; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index 5c1b747af73..d7dc1ffc9e5 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -113,7 +113,7 @@ print '
'; print ''; print ''; -$html=new Form($db); +$form=new Form($db); print ''; $var=true; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 3120d780c36..5b4eded2f99 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -106,7 +106,7 @@ print '
'; print ''; print ''; -$html=new Form($db); +$form=new Form($db); print '
'; $var=true; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 1f70702df13..cca1d5fbdcb 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -128,7 +128,7 @@ print '
'; print ''; print ''; -$html=new Form($db); +$form=new Form($db); print '
'; $var=true; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index cef4be73072..5f528bc5a5f 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -114,7 +114,7 @@ print ''; print ''; -$html=new Form($db); +$form=new Form($db); print '
'; $var=true; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index fb9fce66af8..74bed303f0d 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 ''; $var=!$var; print ''; $var=!$var; @@ -123,7 +123,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''; print '
'; - 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 '
'; - 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 '
'; - 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 '
'; @@ -144,12 +144,12 @@ else $var=!$var; print ''; - 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 ''.$conf->global->MAIN_MAX_DECIMALS_UNIT.''; $var=!$var; print ''; - 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 ''.$conf->global->MAIN_MAX_DECIMALS_TOT.''; $var=!$var; @@ -157,7 +157,7 @@ else $var=!$var; print ''; - 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 ''.$conf->global->MAIN_ROUNDING_RULE_TOT.''; print ''; diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 33cb3bb057d..666e4fa6fbe 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 ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -433,7 +433,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); print ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'sending').''; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 66e41488edc..789789bc9e5 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 ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; - 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 ''; // 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 ''; } print ''; @@ -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 ''; } } @@ -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 ''; } } @@ -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 ''; } print ''; @@ -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 ''; } print ''; @@ -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 99f6d88eae6..9d56ca1ddba 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 ''; print ''; print ''; print ''; print ''; @@ -190,10 +190,10 @@ else print '
'.$langs->trans("Menu").''; - print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); + print $form->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); print ''; - print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); + print $form->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); print '
'; print ''; print ''; print ''; print ''; diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 5c8dc99ab0f..ff2f82583b2 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 ''; print ''; print ''; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index b528f7e374f..7c32e5c8bd7 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 '
'; } @@ -249,7 +249,7 @@ if ($_GET["action"] == 'delete') print ''; print ''; 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 '   '; print ''; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 0bbf3e2ec55..abbc1e038c5 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 ''; // 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 ''; // 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 ''; // 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 ''; print '
'.$langs->trans("Menu").''; - print $html->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); + print $form->textwithpicto($langs->trans("InternalUsers"),$langs->trans("InternalExternalDesc")); print ''; - print $html->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); + print $form->textwithpicto($langs->trans("ExternalUsers"),$langs->trans("InternalExternalDesc")); 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 ''.$langs->trans('DetailMenuHandler').'
'.$langs->trans("ShowProfIdInAddress").' - '.$pid1.''; - 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 '
'.$langs->trans("ShowProfIdInAddress").' - '.$pid2.''; - 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 '
'.$langs->trans("ShowProfIdInAddress").' - '.$pid3.''; - 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 '
'.$langs->trans("ShowProfIdInAddress").' - '.$pid4.''; - 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 '
'; @@ -156,7 +156,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit // Hide any PDF informations $var=!$var; print ''.$langs->trans("HideAnyVATInformationOnPDF").''; - 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 ''; print ''; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index a402ea2b82b..89fe985d15d 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 ""; print ''.$langs->trans("ResponsibleUser").''; print ''; print ''; -print $html->select_users($conf->global->PRELEVEMENT_USER,'value0',1); +print $form->select_users($conf->global->PRELEVEMENT_USER,'value0',1); print ''; print ''; @@ -145,7 +145,7 @@ print ''; // Bank account (from Banks module) print ''.$langs->trans("BankToReceiveWithdraw").''; print ''; -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 ''; print ''; print '
'; @@ -223,11 +223,11 @@ if ($conf->global->MAIN_MODULE_NOTIFICATION) print "\n"; print ''; - print $html->selectarray('user',$internalusers);// select_users(0,'user',0); + print $form->selectarray('user',$internalusers);// select_users(0,'user',0); print ''; print ''; - print $html->selectarray('action',$actions);// select_users(0,'user',0); + print $form->selectarray('action',$actions);// select_users(0,'user',0); print ''; print ''; diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index cea9e9ebecd..fae20ebd30a 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 ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''; @@ -385,7 +385,7 @@ if (is_resource($handle)) $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); print ''; $link=''.img_object($langs->trans("Preview"),'order').''; - print $html->textwithpicto('     '.$link,$htmltooltip,-1,0); + print $form->textwithpicto('     '.$link,$htmltooltip,-1,0); print ''; print "\n"; diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index c69c2f3f4fe..014dd099830 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 ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print "\n"; @@ -486,7 +486,7 @@ foreach ($conf->file->dol_document_root as $dirroot) $htmltooltip.='
'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1); print ''; - print $html->textwithpicto('',$htmltooltip,1,0); + print $form->textwithpicto('',$htmltooltip,1,0); print ''; print ''; print ''.img_object($langs->trans("Preview"),'propal').''; @@ -538,7 +538,7 @@ print ''; -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 ''; print ''; print "\n"; @@ -554,7 +554,7 @@ if ($conf->commande->enabled) print ""; print ''.$langs->trans("ClassifiedInvoicedWithOrder").''; print ''; - 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 ""; print ''; print ''; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 29e8533c8d9..b65674a07c6 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 ""; print ''; $text = $langs->trans("ProtectAndEncryptPdfFiles"); -$desc = $html->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1); +$desc = $form->textwithpicto($text,$langs->transnoentities("ProtectAndEncryptPdfFilesDesc"),1); print $desc; print ''; print ''; diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 28a59e6c57e..7cebab29a03 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 ""; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index efdcde116f6..a63e53006e4 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 '
'.$langs->trans("NoSmsEngine").'
'; @@ -182,7 +182,7 @@ if ($action == 'edit') // Disable $var=!$var; print ''.$langs->trans("MAIN_DISABLE_ALL_SMS").''; - 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 ''; // Separator @@ -192,7 +192,7 @@ if ($action == 'edit') // Method $var=!$var; print ''.$langs->trans("MAIN_SMS_SENDMODE").''; - 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 ''.$langs->trans("None").''; print ''; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 3afe13683b8..df4e84ddb29 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -96,7 +96,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("StockSetup"),$linkback,'setup'); print '
'; -$html=new Form($db); +$form=new Form($db); $var=true; print ''; @@ -118,7 +118,7 @@ print '\n"; @@ -141,7 +141,7 @@ if ($conf->facture->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } @@ -155,7 +155,7 @@ if ($conf->commande->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } @@ -169,7 +169,7 @@ if ($conf->expedition->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } @@ -191,7 +191,7 @@ if ($conf->fournisseur->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } @@ -205,7 +205,7 @@ if ($conf->fournisseur->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } @@ -218,7 +218,7 @@ if ($conf->fournisseur->enabled) print ""; print ''; print ""; - 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 ''; print "\n\n\n"; } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 41388960bea..cbe1aa16322 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup'); @@ -176,14 +176,14 @@ $var=!$var; print ''; print ''; -print "'; $var=!$var; print ''; print ''; -print "'; try @@ -198,7 +198,7 @@ try print '> '.$langs->trans("FirePHP").''; print ''; - print "'; } catch(Exception $e) diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 0c48f9675a9..395011ee2b9 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 ''; print ''."\n"; } diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 64faead5fc2..9a110b89f24 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=''.$langs->trans("BackToModuleList").''; 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 bbb8b286608..0e12ed41b22 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 28f488a5f90..aa3bbcefc65 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 b25aa2e9be9..be59a528f29 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 62f536bcba7..feddec8462c 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 '
'; $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 '
'; } diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index 16764593b84..39f185c4a21 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 9a5243feeaa..1e9a3cd23bc 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 ''; print ''; // 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 ''; print '
'; print "
"; print ''; print ""; -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 ''; print '
'; print "
'.$langs->trans("SyslogSimpleFile").''.$langs->trans("SyslogFilename").': '; print '".$html->textwithpicto('',$langs->trans("YouCanUseDOL_DATA_ROOT")); +print "".$form->textwithpicto('',$langs->trans("YouCanUseDOL_DATA_ROOT")); print '
'.$langs->trans("SyslogSyslog").''.$langs->trans("SyslogFacility").': '; print '".$html->textwithpicto('','Only LOG_USER supported on Windows'); +print "".$form->textwithpicto('','Only LOG_USER supported on Windows'); print '
'; print '".$html->textwithpicto('','FirePHP must be installed onto PHP and FirePHP plugin for Firefox must also be installed'); + print "".$form->textwithpicto('','FirePHP must be installed onto PHP and FirePHP plugin for Firefox must also be installed'); print '
'.$langs->trans("BehaviourOnClick").''; $liste=array(0=>$langs->trans("ReplaceWindow"),1=>$langs->trans("OpenANewWindow")); - print $html->selectarray('target',$liste,1); + print $form->selectarray('target',$liste,1); print ''.$langs->trans("ChooseIfANewWindowMustBeOpenedOnClickOnBookmark").'
'.$langs->trans("Owner").''; - $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 ' 
'.$langs->trans("Owner").''; 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 b18bf124ae4..3938139b2f1 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 .

trans("BankToPay"). "
"; - $html = new Form($db); - $html->select_comptes($selected,'cashdeskbank',0,$filtre); + $form = new Form($db); + $form->select_comptes($selected,'cashdeskbank',0,$filtre); ?>

trans("Notes"); ?>

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index d1203ec5674..21cf1ad4cc9 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 ''; print ''; if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field @@ -305,7 +305,7 @@ else if ($id || $ref) // Ref print ""; print ''; print ''; @@ -367,7 +367,7 @@ else if ($id || $ref) // Ref print ''; print ''; // Login @@ -379,7 +379,7 @@ else if ($id || $ref) // Morphy print ''; /*print '';*/ print ''; @@ -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 '
'.$langs->trans("ThirdPartyName").''; - 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 '
'.$langs->trans("Ref").''; - print $html->showrefnav($product,'ref','',1,'ref'); + print $form->showrefnav($product,'ref','',1,'ref'); print '
'.$langs->trans("Ref").''; - print $html->showrefnav($member,'rowid'); + print $form->showrefnav($member,'rowid'); print '
'.$langs->trans("Nature").''.$member->getmorphylib().''; - print $html->showphoto('memberphoto',$member); + print $form->showphoto('memberphoto',$member); print '
'; print ''; if ($user->rights->categorie->creer) diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php index e513b901db0..efc432e7f94 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 '
'; print $langs->trans("ClassifyInCategory").'  '; - print $html->select_all_categories($typeid); + print $form->select_all_categories($typeid); print ''; print '
'; @@ -141,7 +141,7 @@ print ''; // Parent category print ''; print '
'.$langs->trans("In").''; -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 '
'; diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php index 651132de78e..893afea90e3 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 '
'.$langs->trans("AddIn").''; - print $html->select_all_categories($type,$catorigin); + print $form->select_all_categories($type,$catorigin); print '
'; diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index d6cb0166c96..8dc601e996f 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").':'; print $langs->trans("SubCatOf").':'; -print $html->select_all_categories('','subcatof'); +print $form->select_all_categories('','subcatof'); print ''; print ''; */ diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 82f7b742bb3..76f65ac07a0 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 '
'; } diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 80c9cac9e06..88f5dcec269 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 '
'; } diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index eef56b5d978..184f4acd3e8 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 ''.$langs->trans("DateActionStart").''; - 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 ''; // Date end $datef=$actioncomm->datef; if (GETPOST('datef','int',1)) $datef=dol_stringtotime(GETPOST('datef','int',1),0); print ''.$langs->trans("DateActionEnd").''; - 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 ''; // Status @@ -524,12 +524,12 @@ if ($action == 'create') // Affected by print ''.$langs->trans("ActionAffectedTo").''; - $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 ''; // Realised by print ''.$langs->trans("ActionDoneBy").''; - $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 ''; print ''; @@ -547,7 +547,7 @@ if ($action == 'create') } else { - print $html->select_societes('','socid','',1,1); + print $form->select_societes('','socid','',1,1); } print ''; @@ -555,7 +555,7 @@ if ($action == 'create') if (GETPOST("contactid") > 0 || GETPOST("socid") > 0) { print ''.$langs->trans("ActionOnContact").''; - $html->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1); + $form->select_contacts(GETPOST("socid"),GETPOST('contactid'),'contactid',1); print ''; } @@ -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 '
'; } @@ -721,15 +721,15 @@ if ($id) // Date start print ''.$langs->trans("DateActionStart").''; - 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 ''; // Date end print ''.$langs->trans("DateActionEnd").''; - 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 ''; // Status @@ -750,12 +750,12 @@ if ($id) // Affected to print ''.$langs->trans("ActionAffectedTo").''; - 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 ''; // Realised by print ''.$langs->trans("ActionDoneBy").''; - 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 ''; print '
'; @@ -765,12 +765,12 @@ if ($id) // Company print ''.$langs->trans("ActionOnCompany").''; print ''; - print $html->select_societes($act->societe->id,'socid','',1,1); + print $form->select_societes($act->societe->id,'socid','',1,1); print ''; // Contact print ''.$langs->trans("Contact").''; - 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 ''; // Project @@ -823,7 +823,7 @@ if ($id) // Ref print ''.$langs->trans("Ref").''; - 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 ''; // Type diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 2cecb224515..54a24e1c44b 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 "".$langs->trans("DefaultContact")."\n"; - $html->select_contacts($soc->id,$setcontact,'contactidp',1); + $form->select_contacts($soc->id,$setcontact,'contactidp',1); print ''; // Ligne info remises tiers @@ -153,7 +153,7 @@ if ($_GET["action"] == 'create') // Date print ''.$langs->trans('Date').''; - $html->select_date('','','','','',"addprop"); + $form->select_date('','','','','',"addprop"); print ''; // Validaty duration @@ -161,22 +161,22 @@ if ($_GET["action"] == 'create') // Terms of payment print ''.$langs->trans('PaymentConditionsShort').''; - $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id'); + $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id'); print ''; // Mode of payment print ''.$langs->trans('PaymentMode').''; - $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); + $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); print ''; // What trigger creation print ''.$langs->trans('Source').''; - $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 ''; // Delivery delay print ''.$langs->trans('AvailabilityPeriod').''; - $html->select_availability($propal->availability,'availability_id','',1); + $form->select_availability($propal->availability,'availability_id','',1); print ''; // 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 ''; @@ -202,7 +202,7 @@ if ($_GET["action"] == 'create') { print ''.$langs->trans('DeliveryAddress').''; print ''; - $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 '   id.'&action=create>'.$langs->trans("AddAddress").''; @@ -215,7 +215,7 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("DefaultModel").''; print ''; $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 ""; // 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 ''; // 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 ''; print ''; print '%'; diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php index f3a04d23eb2..c05429e4536 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 '
'; } diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index f310d23ca19..9355bb0d491 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 ''; print '"; print ''; @@ -323,11 +323,11 @@ if ($socid > 0) print '"; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 234ffddbfcd..b220e311ed7 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 8b4516bfd63..b4d9aa44d4d 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 ''; print ''; print ''; @@ -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 6628b385e9a..b1f625a3475 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 '
'; } // 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 '
'; } // 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 '
'; } @@ -709,7 +709,7 @@ else } $text.=$langs->trans('ConfirmSendingEmailing').'
'; $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 '
'; } } @@ -718,22 +718,22 @@ else print ''; print ''; // Description - print ''; // From - print ''; // Errors to - print ''; // 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 '
'; } @@ -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 632120ac5ec..685e88a16de 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 c8a6954b443..967d2903517 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 2cb0bafa50f..833d7e80443 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 ''; // Ref client @@ -1149,7 +1149,7 @@ if ($id > 0 || ! empty($ref)) // Remise dispo de type non avoir $filter='fk_facture_source IS NULL'; print '
'; - $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 ''; print ''; print ''; - $html->select_date($object->date,'re','','',0,"editdate"); + $form->select_date($object->date,'re','','',0,"editdate"); print ''; print ''; } @@ -1218,7 +1218,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - $html->select_date($object->fin_validite,'ech','','','',"editecheance"); + $form->select_date($object->fin_validite,'ech','','','',"editecheance"); print ''; print ''; } @@ -1247,11 +1247,11 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; @@ -1270,7 +1270,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; - $html->select_date($object->date_livraison,'liv_','','','',"editdate_livraison"); + $form->select_date($object->date_livraison,'liv_','','','',"editdate_livraison"); print ''; print ''; } @@ -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 ''; } @@ -1315,11 +1315,11 @@ if ($id > 0 || ! empty($ref)) print ''; @@ -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 ''; @@ -1357,11 +1357,11 @@ if ($id > 0 || ! empty($ref)) print ''; @@ -1379,11 +1379,11 @@ if ($id > 0 || ! empty($ref)) print ''; } @@ -1837,7 +1837,7 @@ else print ''; print ''; print ''; print ''; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 0efde17b23c..59213b04692 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 9ba449fee5c..b6fe67d4122 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 ''; // Ref client @@ -222,7 +222,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; // 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 '
'; } diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index bb577f66daa..ae58515b3a4 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 18fb187033d..646cdb41358 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 ''; // Ref client diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 20708e15207..a76fd8c2786 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 ebfb90552e7..94dee98896b 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 '"; // Ref commande client @@ -214,7 +214,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; print ''; @@ -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 '
'; } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 146a44ac991..845ba65506f 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 "'; // Ligne info remises tiers @@ -1217,7 +1217,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Date print ''; // 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 ""; // 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 ''; } // Conditions de reglement print ''; // Mode de reglement print ''; // Delivery delay print ''; // What trigger creation print ''; // 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 ""; // Note publique @@ -1366,9 +1366,9 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print ''; print ''; @@ -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 ''; print ''; print ''; @@ -1595,7 +1595,7 @@ else // Remise dispo de type non avoir $filter='fk_facture_source IS NULL'; print '
'; - $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 ''; print ''; print ''; - $html->select_date($object->date,'order_','','','',"setdate"); + $form->select_date($object->date,'order_','','','',"setdate"); print ''; print ''; } @@ -1644,7 +1644,7 @@ else print ''; print ''; print ''; - $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 ''; print ''; } @@ -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 ''; } @@ -1691,11 +1691,11 @@ else print ''; @@ -1711,11 +1711,11 @@ else print ''; @@ -1729,11 +1729,11 @@ else print ''; @@ -1747,11 +1747,11 @@ else print ''; } diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 3c3b8a0d709..2a3c6d91175 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 c4a1a6af40c..054499be001 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 dfd1be92018..17d71af6cb7 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 '"; // Ref commande client diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 8f4c72389f1..c3e37e57a21 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 ''; print ''; // 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 '
'; } @@ -354,10 +354,10 @@ if ($account || $_GET["ref"]) print ''; print ''; print ''; print ''; print ''; print ''; @@ -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 0802a931d70..e9c205f2776 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=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("BankSetupModule"),$linkback,'setup'); diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index c7f9af67970..2ba2d61417c 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 '"; print ''; print ''; @@ -350,7 +350,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; } else @@ -420,7 +420,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; print ''; // Label diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 528111982e0..a5e8743de4c 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 ''; print ''; print ''; print ''; print ''; print ''; // Label diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 8c6fc905e30..ed05f6e067b 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 ''; $var=false; print '"; print "\n"; print "\n"; print ''; print ''; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 0051d74f56a..4b41aabd622 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 ''; print '".''; print '\n"; print "".''; @@ -294,16 +294,16 @@ if ($_GET["action"] == 'create') // Zip / Town print ''; print "".''; print "".''; print "\n"; if ($conf->projet->enabled) @@ -357,7 +357,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') // Date print "".''; print '".''; print '"; print "\n"; @@ -381,16 +381,16 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') // Zip / Town print ''; print "".''; print "".''; print "\n"; print "".''; @@ -443,7 +443,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') // Ref print "".''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 25cd3a251f5..37ce3d68ad7 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 ''."\n"; @@ -1611,7 +1611,7 @@ if ($action == 'create') print ''."\n"; @@ -1621,7 +1621,7 @@ if ($action == 'create') print ''."\n"; } @@ -1646,7 +1646,7 @@ if ($action == 'create') $text.=''; } $text.=''; - $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1); + $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1); print $desc; print ''."\n"; @@ -1671,7 +1671,7 @@ if ($action == 'create') $text.=''; } $text.=''; - $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 ''."\n"; @@ -1694,17 +1694,17 @@ if ($action == 'create') // Date invoice print ''; // Payment term print ''; // Payment mode print ''; // Project @@ -1725,7 +1725,7 @@ if ($action == 'create') print '"; // Public note @@ -1816,9 +1816,9 @@ if ($action == 'create') print ''; print ''; print ''; @@ -1831,12 +1831,12 @@ if ($action == 'create') print ''; print '
'; print $langs->trans('PaymentConditions'); @@ -304,11 +304,11 @@ if ($socid > 0) print ''; 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 "
'; 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 "
'.$langs->trans("Ref").''; - print $html->showrefnav($mil,'id'); + print $form->showrefnav($mil,'id'); print '
'.$langs->trans("MailTitle").''.$mil->titre.'
'.$langs->trans("Ref").''; - print $html->showrefnav($mil,'id'); + print $form->showrefnav($mil,'id'); print '
'.$html->editfieldkey("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer).''; - print $html->editfieldval("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer); + print '
'.$form->editfieldkey("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer).''; + print $form->editfieldval("MailTitle",'desc',$mil->titre,'id',$mil->id,$user->rights->mailing->creer); print '
'.$html->editfieldkey("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').''; - print $html->editfieldval("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email'); + print '
'.$form->editfieldkey("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').''; + print $form->editfieldval("MailFrom",'from',$mil->email_from,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email'); print '
'.$html->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').''; - print $html->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email'); + print '
'.$form->editfieldkey("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email').''; + print $form->editfieldval("MailErrorsTo",'errorsto',$mil->email_errorsto,'id',$mil->id,$user->rights->mailing->creer && $mil->statut < 3,'email'); print '
'.$langs->trans('Ref').''; - print $html->showrefnav($object,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); print '
'; 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 '
'; 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 ''; 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 '
'; 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 '
 '; - $html->select_propal_statut($viewstatut,1); + $form->select_propal_statut($viewstatut,1); print ''; print '
'.$langs->trans('Ref').''; - print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); print '
'; // 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 ''; $formcompany->selectTypeContact($propal, '', 'type','internal'); @@ -252,7 +252,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 05860909553..93eb16b0762 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 '
'.$langs->trans('Ref').''; - print $html->showrefnav($object,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); print '
'.$langs->trans('Ref').''; - print $html->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($propal,'ref',$linkback,1,'ref','ref',''); print '
'.$langs->trans("Ref").''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print "
'; //$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 ''; $formcompany->selectTypeContact($commande, '', 'type','internal'); @@ -244,7 +244,7 @@ if ($id > 0 || ! empty($ref)) print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index 5c2e43f0431..2853ae6b0c3 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 '
'.$langs->trans('Ref').''; - print $html->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object,'ref','',1,'ref','ref'); print '
'.$langs->trans('Company').''.$object->thirdparty->getNomUrl(1).'
".$langs->trans("DefaultContact").''; - $html->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist); + $form->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist); print '
'.$langs->trans('Date').''; - $html->select_date('','re','','','',"crea_commande",1,1); + $form->select_date('','re','','','',"crea_commande",1,1); print '
'.$langs->trans('DeliveryAddress').''; - $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 '   '.$langs->trans("AddAddress").''; print '
'.$langs->trans('PaymentConditionsShort').''; - $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 '
'.$langs->trans('PaymentMode').''; - $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); + $form->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); print '
'.$langs->trans('AvailabilityPeriod').''; - $html->select_availability($propal->availability,'availability_id','',1); + $form->select_availability($propal->availability,'availability_id','',1); print '
'.$langs->trans('Source').''; - $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 '
'; // 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 '%
'.$langs->trans('Ref').''; - print $html->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object,'ref','',1,'ref','ref'); print '
'; 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 ''; 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 '
'; 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 '
'; 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 '
'.$langs->trans("Ref").''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print "
'.$langs->trans("Ref").''; - print $html->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct,'ref','',1,'ref'); print '
'; - $html->select_date($dateop,'op',0,0,0,'transaction'); + $form->select_date($dateop,'op',0,0,0,'transaction'); print ''; - $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 ''; print ''; @@ -409,7 +409,7 @@ if ($account || $_GET["ref"]) print ''; //$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 '
'.$langs->trans('State').''; 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 '
'.$langs->trans('State').''; 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 9f500eea383..0f0e16af275 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 '
'; } @@ -259,7 +259,7 @@ if ($result) // Ref print '
'.$langs->trans("Ref")."'; - print $html->showrefnav($bankline,'rowid','',1,'rowid','rowid'); + print $form->showrefnav($bankline,'rowid','',1,'rowid','rowid'); print '
'; - print $html->select_types_paiements($objp->fk_type,"value",'',2); + print $form->select_types_paiements($objp->fk_type,"value",'',2); print ''; if ($objp->receiptid) { @@ -404,7 +404,7 @@ if ($result) if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { print ''; - 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 ''; - 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 0db2c4ec816..c36cfb0fd40 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 '
'.$langs->trans("Ref").''; - print $html->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct,'ref','',1,'ref'); print '
  '; - $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 ''; diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 6a6a1580f64..0d924bbc0d5 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 '
'.$langs->trans("Ref").''; - print $html->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct,'ref','',1,'ref'); print '
'; -print $html->select_comptes($_POST['account_from'],'account_from',0,'',1); +print $form->select_comptes($_POST['account_from'],'account_from',0,'',1); print "\n"; -print $html->select_comptes($_POST['account_to'],'account_to',0,'',1); +print $form->select_comptes($_POST['account_to'],'account_to',0,'',1); print ""; -$html->select_date($dateo,'','','','','add'); +$form->select_date($dateo,'','','','','add'); print "
'.$langs->trans("Date").''; - $html->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1); + $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1); print ''.$langs->trans("Comments").' :
'; @@ -283,7 +283,7 @@ if ($_GET["action"] == 'create') print "
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("PublicDonation").""; - print $html->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1); + print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1); print "
'.$langs->trans("Company").'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; - 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 '
'.$langs->trans("Country").'
'.$langs->trans("EMail").'
".$langs->trans("PaymentMode")."\n"; - $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1); + $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1); print "
'.$langs->trans("Date").''; - $html->select_date($don->date,'','','','',"update"); + $form->select_date($don->date,'','','','',"update"); print ''.$langs->trans("Comments").' :
'; @@ -368,7 +368,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print "
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("PublicDonation").""; - print $html->selectyesno("public",1,1); + print $form->selectyesno("public",1,1); print "
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; - 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 '
'.$langs->trans("Country").'
'.$langs->trans("EMail").'
".$langs->trans("PaymentMode")."\n"; - $html->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1); + $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1); print "
'.$langs->trans("Status").''.$don->getLibStatut(4).'
'.$langs->trans("Ref").''; - print $html->showrefnav($don,'rowid','',1,'rowid','ref',''); + print $form->showrefnav($don,'rowid','',1,'rowid','ref',''); print '
'; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); print $desc; print '
'; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print $desc; print '
'; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); print $desc; print '
'.$langs->trans('Date').''; - $html->select_date($dateinvoice,'','','','',"add",1,1); + $form->select_date($dateinvoice,'','','','',"add",1,1); print '
'.$langs->trans('PaymentConditionsShort').''; - $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 '
'.$langs->trans('PaymentMode').''; - $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 '
'; 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 "
'; // 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 '%'; print $langs->trans('From').' '; print ''; - print $html->select_date('','date_start'.$i,$usehm,$usehm,1,"add"); + print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add"); print '
'; print $langs->trans('to').' '; print ''; - print $html->select_date('','date_end'.$i,$usehm,$usehm,1,"add"); + print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add"); print '
'; print ''; } @@ -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 ''; // Third party @@ -2105,7 +2105,7 @@ else print ''; 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 '
'; - $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 '
'; - $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 ''; - print $html->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1); + print $form->textwithpicto($langs->trans("Escompte").':',$langs->trans("HelpEscompte"),-1); print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $resteapayeraffiche=0; } @@ -2395,7 +2395,7 @@ else if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'badcustomer') { print ''; - print $html->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1); + print $form->textwithpicto($langs->trans("Abandoned").':',$langs->trans("HelpAbandonBadCustomer"),-1); print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; //$resteapayeraffiche=0; } @@ -2403,7 +2403,7 @@ else if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'product_returned') { print ''; - print $html->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1); + print $form->textwithpicto($langs->trans("ProductReturned").':',$langs->trans("HelpAbandonProductReturned"),-1); print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $resteapayeraffiche=0; } @@ -2413,7 +2413,7 @@ else print ''; $text=$langs->trans("HelpAbandonOther"); if ($object->close_note) $text.='

'.$langs->trans("Reason").':'.$object->close_note; - print $html->textwithpicto($langs->trans("Abandoned").':',$text,-1); + print $form->textwithpicto($langs->trans("Abandoned").':',$text,-1); print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' '; $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 ''; 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 ''; @@ -2561,11 +2561,11 @@ else print ''; 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 ''; print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index bb0db249e39..b8f76d5c24b 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 '
'; - $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 '
'; - $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 ''.$langs->trans("PaymentConditionsShort").''; - $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 ''; print ''; @@ -268,11 +268,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index f826d454858..1787baa2208 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 ''; // Customer @@ -209,7 +209,7 @@ if ($id > 0 || ! empty($ref)) print ''; // 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 ''; print ''; $formcompany->selectTypeContact($facture, '', 'type','internal'); @@ -239,7 +239,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 14a47995a1b..17c0e3bdb8c 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 ''; // 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 '
'; } diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index fe73d5f2bcc..e227ff8ae7f 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 "".$langs->trans("Author")."".$user->getFullName($langs).""; print "".$langs->trans("PaymentConditions").""; - $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 ""; print "".$langs->trans("PaymentMode").""; - $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 ""; 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 ''.$langs->trans("Customer").''; print ''.$soc->getNomUrl(1).''; print "". $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 ""; print "".$langs->trans("Author")."".$author->getFullName($langs).""; @@ -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 ""; print ''.$langs->trans("AmountHT").''; @@ -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 8bfa5d75072..9641c2d2e59 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 90b338b8ce6..ea22971c1bf 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 ''; // Company diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index a6b603d6d7b..8291b5ab37e 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 ""; // 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 '
'; - $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 '
'; - $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 ''; 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 ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index b5652adf2a9..4166a4ab130 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 f48dda6de05..621287c39e4 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 6d42ecbe133..3357078459c 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 6f2bbae3029..4e2f110e0ce 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.=' '; 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.='
'.$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.='
'.$langs->trans("WarningDepositsNotIncluded"); $description.=$fsearch; diff --git a/htdocs/compta/localtax/fiche.php b/htdocs/compta/localtax/fiche.php index b27fe6f63b2..585fd9057e5 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 ""; print ''.$langs->trans("DatePayment").''; - print $html->select_date($datep,"datep",'','','','add'); + print $form->select_date($datep,"datep",'','','','add'); print ''; print ''.$langs->trans("DateValue").''; - print $html->select_date($datev,"datev",'','','','add'); + print $form->select_date($datev,"datev",'','','','add'); print ''; // Label @@ -171,11 +171,11 @@ if ($_GET["action"] == 'create') if ($conf->banque->enabled) { print ''.$langs->trans("Account").''; - $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 ''; print ''.$langs->trans("PaymentMode").''; - $html->select_types_paiements($_POST["paiementtype"], "paiementtype"); + $form->select_types_paiements($_POST["paiementtype"], "paiementtype"); print "\n"; print ""; } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index f929c9aa712..6eaccc3fa33 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 ''.$langs->trans('Date').''; $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 ''; print ''.$langs->trans('Comments').''; @@ -364,7 +364,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Payment mode print ''.$langs->trans('PaymentMode').''; - $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 "\n"; print ''; print ''; @@ -394,7 +394,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if ($facture->type != 2) print ''.$langs->trans('AccountToCredit').''; if ($facture->type == 2) print ''.$langs->trans('AccountToDebit').''; print ''; - $html->select_comptes($accountid,'accountid',0,'',2); + $form->select_comptes($accountid,'accountid',0,'',2); print ''; } else @@ -604,7 +604,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $text.='
'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed"); print ''; } - $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 "\n"; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index a2933c0959a..a67c000f748 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 '
'; } @@ -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 '
'; } } @@ -304,10 +304,10 @@ if ($action == 'new') //print ''.$langs->trans('Date').''.dol_print_date($now,'day').''; // Filter print ''.$langs->trans("DateChequeReceived").''; - print $html->select_date($filterdate,'fd',0,0,1,'',1,1); + print $form->select_date($filterdate,'fd',0,0,1,'',1,1); print ''; print ''.$langs->trans("BankAccount").''; - print $html->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); + print $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); print ''; print ''; print '
'; @@ -448,7 +448,7 @@ else print ''; print '"; print "\n"; @@ -466,7 +466,7 @@ else print ''; print ''; print ''; - $html->select_date($object->date_bordereau,'datecreate_','','','',"setdate"); + $form->select_date($object->date_bordereau,'datecreate_','','','',"setdate"); print ''; print ''; } diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index b0b9dc690df..ff20b8166ac 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 '
'; } @@ -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 '
'; } @@ -219,8 +219,8 @@ print '
'.$langs->trans('Ref').''; - print $html->showrefnav($remisecheque,'ref',$linkback, 1, 'number'); + print $form->showrefnav($remisecheque,'ref',$linkback, 1, 'number'); print "
'; print ''; // Date payment -print ''; // Payment type (VIR, LIQ, ...) @@ -228,16 +228,16 @@ $labeltype=$langs->trans("PaymentType".$paiement->type_code)!=("PaymentType".$pa print ''; // Payment numero -print ''; // Amount print ''; // Note -print ''; // Bank account diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index a39bb7b9cb1..2e3d9df41dd 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 '"; print ''; print '\n"; print ''; @@ -220,7 +220,7 @@ if ($_GET["action"] == 'create') print ''; print ''; print ''; print ''; print ''; //Date print ''; print ''; //Reason print ''; print ''; //Facturer print ''; print ''; print '
'.$langs->trans('Ref').''.$paiement->id.'
'.$html->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement).''; -print $html->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement,'day'); +print '
'.$form->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement).''; +print $form->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$user->rights->facture->paiement,'day'); print '
'.$langs->trans('PaymentMode').''.$labeltype.'
'.$html->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; -print $html->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string'); +print '
'.$form->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; +print $form->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string'); print '
'.$langs->trans('Amount').''.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).'
'.$html->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement).''; -print $html->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement,'text'); +print '
'.$form->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement).''; +print $form->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->facture->paiement,'text'); print '
'.$langs->trans("Date").''; $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 "'.$langs->trans("Comments").'
'.$langs->trans("PaymentMode").''; - $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 "
'.$langs->trans('AccountToDebit').''; - $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 '
'.$langs->trans('Numero'); diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 577fe00342b..6c4a53fbb51 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 '
'; } @@ -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 '
'; } @@ -169,7 +169,7 @@ print ''; // Ref print ''; print ''; // Date diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index c9d27ba9346..67d7baee6ef 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 abe3798fc6a..4b76e9c3a02 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 '
'; } @@ -181,10 +181,10 @@ if ($id) print ''; print ''; print ''; print ''; print ''; print ''; print ''; print '
'.$langs->trans('Ref').''; -print $html->showrefnav($paiement,'id','',1,'rowid','id'); +print $form->showrefnav($paiement,'id','',1,'rowid','id'); print '
'.$langs->trans("NotifyTransmision").'
'.$langs->trans("TransData").''; - print $html->select_date('','','','','',"userfile"); + print $form->select_date('','','','','',"userfile"); print '
'.$langs->trans("TransMetod").''; - print $html->selectarray("methode",$bon->methodes_trans); + print $form->selectarray("methode",$bon->methodes_trans); print '
'.$langs->trans("File").''; print ''; @@ -204,7 +204,7 @@ if ($id) print '
'.$langs->trans("NotifyCredit").'
'.$langs->trans('CreditDate').''; - print $html->select_date('','','','','',"infocredit"); + print $form->select_date('','','','','',"infocredit"); print '

'; print '
'; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 7dec4ce5f60..0914abbdc65 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 '
'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?'; - print $html->selectyesno("confirm",1,0); + print $form->selectyesno("confirm",1,0); print '
'.$langs->trans("RefusedData").''; - print $html->select_date('','','','','',"confirm_rejet"); + print $form->select_date('','','','','',"confirm_rejet"); print '
'.$langs->trans("RefusedReason").''; - print $html->selectarray("motif", $rej->motifs); + print $form->selectarray("motif", $rej->motifs); print '
'.$langs->trans("RefusedInvoicing").''; - print $html->selectarray("facturer", $rej->facturer); + print $form->selectarray("facturer", $rej->facturer); print '

'; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 519ae0960d5..a379d7a5791 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 ''.$langs->trans('Ref').''; - print $html->showrefnav($object,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); print ''; // Ref client @@ -216,11 +216,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; @@ -235,11 +235,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; @@ -257,11 +257,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; } @@ -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 ''; print ''; print ''; - $html->select_propal_statut($viewstatut); + $form->select_propal_statut($viewstatut); print ''; print ''; print ''; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 9d24bbe3c48..8cc9a91858e 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.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultDue"); $builddate=time(); @@ -114,8 +114,8 @@ if ($modecompta=="CREANCES-DETTES") else { $nom=$langs->trans("AnnualByCompaniesInputOutputMode"); $nom.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - //$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=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesResultInOut"); $builddate=time(); diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 35f3e1aedfe..df660159417 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 e173fb38739..565f5a933bd 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 ''; - $html->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1); + $form->select_type_socialcontrib(isset($_POST["actioncode"])?$_POST["actioncode"]:'','actioncode',1); print ''; // Date end period print ''; - 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 ''; print ''; print ''; - 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 ''; print ''; @@ -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 "".$langs->trans("Ref").''; - print $html->showrefnav($cha,'id'); + print $form->showrefnav($cha,'id'); print ""; // Label @@ -306,7 +306,7 @@ if ($chid > 0) print ""; 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 ''.$langs->trans("DateDue").""; - 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 ""; } else { diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index ec0d6286858..398e06e73d6 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 ''; // Type print ''; - $html->select_type_socialcontrib($typeid,'typeid',1,16,0); + $form->select_type_socialcontrib($typeid,'typeid',1,16,0); print ''; // Period end date print ' '; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index da20dd3a7cd..c0f2a76c933 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.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCADue"); $builddate=time(); @@ -115,7 +115,7 @@ if ($modecompta=="CREANCES-DETTES") else { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByUserAuthorOfInvoice"); $nom.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - $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="".img_previous()." ".img_next().""; $description=$langs->trans("RulesCAIn"); $builddate=time(); diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 4fbdbd7eaed..521045f1516 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.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')'; - $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=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCADue"); $builddate=time(); @@ -118,7 +118,7 @@ if ($modecompta=="CREANCES-DETTES") else { $nom=$langs->trans("SalesTurnover").', '.$langs->trans("ByThirdParties"); $nom.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')'; - $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=''.img_previous().' '.img_next().''; $description=$langs->trans("RulesCAIn"); $builddate=time(); diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index a243cfedc34..52c571298ce 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 2a407140eb8..c6ee70849bf 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.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; - $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?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATDue"); //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); @@ -134,7 +134,7 @@ if ($modetax==0) // Invoice for goods, payment for services { $nom=$langs->trans("VATReportByCustomersInInputOutputMode"); //$nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; - $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?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATIn"); //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php index a771790cf47..f2667f697e1 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 ""; print ''.$langs->trans("DatePayment").''; - print $html->select_date($datep,"datep",'','','','add'); + print $form->select_date($datep,"datep",'','','','add'); print ''; print ''.$langs->trans("DateValue").''; - print $html->select_date($datev,"datev",'','','','add'); + print $form->select_date($datev,"datev",'','','','add'); print ''; // Label @@ -170,11 +170,11 @@ if ($_GET["action"] == 'create') if ($conf->banque->enabled) { print ''.$langs->trans("Account").''; - $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 ''; print ''.$langs->trans("PaymentMode").''; - $html->select_types_paiements($_POST["paiementtype"], "paiementtype"); + $form->select_types_paiements($_POST["paiementtype"], "paiementtype"); print "\n"; print ""; } diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index c45a609d5a3..a74c8ae4a1e 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.=' '; 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 514ca3a29a3..35e9f68e9ce 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -477,14 +477,14 @@ else // Date To Birth print ''.$langs->trans("DateToBirth").''; - $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 ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 9b6481b309b..50376df2e5c 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -131,8 +131,8 @@ if ($_GET["action"] == 'edit') // Date To Birth print ''.$langs->trans("DateToBirth").''; - $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 ''; print ''.$langs->trans("Alert").': '; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index bee4163db93..938010289ee 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 ''; //$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 ''; print ''; $formcompany->selectTypeContact($contrat, '', 'type','internal'); @@ -238,7 +238,7 @@ if ($id > 0) print ''; print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index c8a7e6b6b0c..528106c56e7 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 beccf9a85f8..33496cef4a0 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 ''.$langs->trans("Ref").''; - print $html->showrefnav($object,'ref','',1,'ref','ref',''); + print $form->showrefnav($object,'ref','',1,'ref','ref',''); print ""; // 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 '
'; } @@ -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 '
'; } @@ -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 '
'; } @@ -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 '
'; } @@ -1049,11 +1049,11 @@ else } print ''.$langs->trans("DateServiceActivate").''; - print $html->select_date($dateactstart,'',$usehm,$usehm,'',"active"); + print $form->select_date($dateactstart,'',$usehm,$usehm,'',"active"); print ''; print ''.$langs->trans("DateEndPlanned").''; - print $html->select_date($dateactend,"end",$usehm,$usehm,'',"active"); + print $form->select_date($dateactend,"end",$usehm,$usehm,'',"active"); print ''; print ''; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 8c4cc75f721..6554e5ad8c1 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 fc392775744..20f12c52180 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 dbeaf148e0b..2d8e94c53bd 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 082078bf5e7..a1a452a939d 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.= ''; } else diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index 9ee9b57981f..f99e7cd698f 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).'
'; } - $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 17488f64de1..e3c9f5e8ef2 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 4c822b7aa64..3e7fcea0c35 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."'
"; + //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'
"; //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."'
"; + //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'
"; // 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 1788d56308b..c27329d0192 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 22b2997b5ca..41c3f72fbc2 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 = ' @@ -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 = '
@@ -557,10 +557,10 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0) '; - $htmlSection = ' + $formSection = ' '; - $htmlThermbottom = ' + $formThermbottom = '
@@ -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 de6b38c669c..26eb692c8bd 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 9ddefa83def..c0bb1c5eb7b 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='charset_output.'"?>'; - fwrite($fichier, $html); + $form='charset_output.'"?>'; + fwrite($fichier, $form); fwrite($fichier, "\n"); - $html=''; - fwrite($fichier, $html); + $form=''; + fwrite($fichier, $form); fwrite($fichier, "\n"); - $html="\n".$title."\n"; - fwrite($fichier, $html); + $form="\n".$title."\n"; + fwrite($fichier, $form); - $html=''."\n". + $form=''."\n". // 'fr'."\n". 'Dolibarr'."\n". ''.$date.''."\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.=''."\n"; + $form.=''."\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 1a5a06c0ec0..2fff5557cfb 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 88a58b73ff7..77e9274e5d2 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -43,7 +43,7 @@ > @@ -78,9 +78,9 @@ diff --git a/htdocs/core/tpl/freeproductline_edit.tpl.php b/htdocs/core/tpl/freeproductline_edit.tpl.php index d0105076068..91c4824536a 100644 --- a/htdocs/core/tpl/freeproductline_edit.tpl.php +++ b/htdocs/core/tpl/freeproductline_edit.tpl.php @@ -53,7 +53,7 @@ ?> - + @@ -81,9 +81,9 @@ > diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index fe12db9716f..b327460f5fe 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -51,7 +51,7 @@ diff --git a/htdocs/core/tpl/predefinedproductline_edit.tpl.php b/htdocs/core/tpl/predefinedproductline_edit.tpl.php index 6eb06b6ddd9..589a4ece078 100644 --- a/htdocs/core/tpl/predefinedproductline_edit.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_edit.tpl.php @@ -63,7 +63,7 @@ ?> - + > diff --git a/htdocs/core/tpl/predefinedproductline_view.tpl.php b/htdocs/core/tpl/predefinedproductline_view.tpl.php index 614219a0399..09a61c177e2 100644 --- a/htdocs/core/tpl/predefinedproductline_view.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_view.tpl.php @@ -23,7 +23,7 @@ '; print '\n"; print ''; @@ -575,7 +575,7 @@ if ($action == 'create') print ''."\n"; } @@ -608,7 +608,7 @@ if ($action == 'create') print ""; print '\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 '
'; } @@ -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 '
'; } /* @@ -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 '
'; } @@ -935,7 +935,7 @@ else // Ref print ''; print ''; // Customer @@ -991,7 +991,7 @@ else print ''; print ''; print ''; - $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 ''; print ''; } @@ -1010,14 +1010,14 @@ else print ''."\n"; } // Weight - print ''; @@ -1044,20 +1044,20 @@ else print ''; // Width - print ''; // Height - print ''; // Depth - print ''; @@ -1081,7 +1081,7 @@ else print ''; print ''; $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 ''; print ''; } @@ -1098,8 +1098,8 @@ else print ''; // Tracking Number - print ''; print "
 '.$langs->trans("Paid").':
' . $legendaActual . '
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 '
'; if (is_object($hookmanager)) @@ -64,7 +64,7 @@ 		tva_assuj == "0") echo '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); ?> "> 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"); ?>
load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?>load_tva('tva_tx',$line->tva_tx,$seller,$buyer,0,$line->info_bits,$line->product_type); ?>
trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> 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"); ?>
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 @@ 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"); ?>
load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?>load_tva('tva_tx',$line->tva_tx,$seller,$buyer,'',$line->info_bits); ?> @@ -93,9 +93,9 @@
trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> 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"); ?>
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 ba13ac15bf8..107206e8e7c 100644 --- a/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php +++ b/htdocs/core/tpl/predefinedproductlinediv_view.tpl.php @@ -24,7 +24,7 @@
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 973ee2a4e4a..40a49587f97 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 '
'; } diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 5bd07808112..3db618616fc 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 '
'.$langs->trans("DateDeliveryPlanned").''; //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 "
'; 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 '
".$langs->trans("DeliveryMethod")."'; $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 "
'.$langs->trans("Ref").''; - print $html->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object,'ref','',1,'ref','ref'); print '
'; 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 '
'.$html->editfieldkey("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer).''; - print $html->editfieldval("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer); + print '
'.$form->editfieldkey("Weight",'trueWeight',$object->trueWeight,'id',$object->id,$user->rights->expedition->creer).''; + 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 '
'.$html->editfieldkey("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer).''; - print $html->editfieldval("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer); + print '
'.$form->editfieldkey("Width",'trueWidth',$object->trueWidth,'id',$object->id,$user->rights->expedition->creer).''; + 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 '
'.$html->editfieldkey("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer).''; - print $html->editfieldval("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer); + print '
'.$form->editfieldkey("Height",'trueHeight',$object->trueHeight,'id',$object->id,$user->rights->expedition->creer).''; + 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 '
'.$html->editfieldkey("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer).''; - print $html->editfieldval("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer); + print '
'.$form->editfieldkey("Depth",'trueDepth',$object->trueDepth,'id',$object->id,$user->rights->expedition->creer).''; + 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 '
'.$html->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,'id',$object->id,$user->rights->expedition->creer).''; - print $html->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,'id',$object->id,$user->rights->expedition->creer,'string',$object->tracking_number); + print '
'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,'id',$object->id,$user->rights->expedition->creer).''; + print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,'id',$object->id,$user->rights->expedition->creer,'string',$object->tracking_number); print '
\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 da3148bc41c..dc143d7c2e2 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 '
'; } @@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref)) // Ref print ''.$langs->trans('Ref').''; print ''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print ''; print ''; @@ -221,7 +221,7 @@ if ($id > 0 || ! empty($ref)) // Remise dispo de type non avoir $filter='fk_facture_source IS NULL'; print '
'; - $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 '
'; print ''; print ''; - $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 ''; print '
'; } @@ -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 ''; } @@ -307,11 +307,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; @@ -325,11 +325,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; @@ -346,11 +346,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 ''; } @@ -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 f01e40c607d..569d04408fd 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 ''.img_left().''; print ''; //print $text.'-'.$htmltext."
"; - print $html->textwithpicto($text,$htmltext); + print $form->textwithpicto($text,$htmltext); //print ' ('.$code.')'; print ''; $bit=1; @@ -448,7 +448,7 @@ if ($step == 2 && $datatoexport) // Fields not selected print ''; //print $text.'-'.$htmltext."
"; - print $html->textwithpicto($text,$htmltext); + print $form->textwithpicto($text,$htmltext); //print ' ('.$code.')'; print ''; print ''.img_right().''; @@ -580,7 +580,7 @@ if ($step == 3 && $datatoexport) $tablename=getablenamefromfield($code,$sqlmaxforexport); $htmltext =''.$langs->trans("Name").": ".$text.'
'; $htmltext.=''.$langs->trans("Table")." -> ".$langs->trans("Field").": ".$tablename." -> ".preg_replace('/^.*\./','',$code)."
"; - print $html->textwithpicto($text,$htmltext); + print $form->textwithpicto($text,$htmltext); //print ' ('.$code.')'; print ''; @@ -754,7 +754,7 @@ if ($step == 4 && $datatoexport) print ''; print ''.img_picto_common($key,$objmodelexport->getPicto($key)).''; $text=$objmodelexport->getDriverDesc($key); - print ''.$html->textwithpicto($objmodelexport->getDriverLabel($key),$text).''; + print ''.$form->textwithpicto($objmodelexport->getDriverLabel($key),$text).''; print ''.$objmodelexport->getLibLabel($key).''.$objmodelexport->getLibVersion($key).''."\n"; } print ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 264c62e2af9..c28ade3f739 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 ''; print ''.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''; $text=$model->getDriverDesc($key); - print ''.$html->textwithpicto($model->getDriverLabel($key),$text).''; + print ''.$form->textwithpicto($model->getDriverLabel($key),$text).''; print ''.$model->getLibLabel($key).''; print ''.$model->getLibVersion($key).''; print ''; diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index e8fd2d76e1c..5d713eda2ca 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 a5893d6f419..34a3a03068e 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 ''; //$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 ''; print ''; $formcompany->selectTypeContact($fichinter, '', 'type','internal'); @@ -229,7 +229,7 @@ if ($id > 0) print ''; print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 872d191cd1f..6d69c65dcdf 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 764e02bba0b..2622e58c6f2 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 08f6244a93c..0f3e6ea5dff 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 ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print ''; print ''; @@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref)) print ''; //$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 ''; print ''; $formcompany->selectTypeContact($commande, '', 'type','internal'); @@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; print ''; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 32474ba8af8..d5dfa876371 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 ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print ''; print ''; @@ -284,7 +284,7 @@ if ($id > 0 || ! empty($ref)) print ''; 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 31d2ef5749a..1fb86272c3a 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 ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print ''; print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index a535f62b1f2..033c988fbc3 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 '
'; } @@ -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 '
'; } /* @@ -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 '
'; } /* @@ -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 '
'; } /* @@ -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 '
'; } @@ -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 '
'; } @@ -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 '
'; } @@ -889,7 +889,7 @@ if ($id > 0 || ! empty($ref)) // Ref print ''.$langs->trans("Ref").''; print ''; - print $html->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object,'ref','',1,'ref','ref'); print ''; print ''; @@ -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 ''; print '"; print ''; // Mode of payment $langs->load('bills'); - $html = new Form($db); + $form = new Form($db); print ' ? if ($row == $theadStart) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; } // ? if ($row == $tbodyStart) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . 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); } // ? if ($row == $theadEnd) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; } // ? if ($row == $tbodyEnd) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . 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 .= '
'; + $form .= '
'; } } @@ -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 .= '' . 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 .= ' ' . PHP_EOL; + $form .= PHP_EOL; + $form .= ' ' . 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 .= ' ' . PHP_EOL; + $form .= ' ' . 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 .= ' ' . PHP_EOL; - $html .= '' . PHP_EOL; + $form = ''; + $form .= ' ' . PHP_EOL; + $form .= '' . 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 .= '
'; print $langs->trans('PaymentConditions'); @@ -943,18 +943,18 @@ if ($id > 0 || ! empty($ref)) print ''; 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 "
'; print ''; @@ -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 ''; print ''; @@ -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 '
'; } @@ -1173,7 +1173,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; @@ -1213,7 +1213,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print ''; print ''; @@ -1264,7 +1264,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print ''; print ''; print ''; print '
'; print $langs->trans('PaymentMode'); @@ -964,11 +964,11 @@ if ($id > 0 || ! empty($ref)) print ''; 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 '
'; - print $html->load_tva('tva_tx',$line->tva_tx); + print $form->load_tva('tva_tx',$line->tva_tx); print ''; $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 '
'; @@ -1226,7 +1226,7 @@ if ($id > 0 || ! empty($ref)) print '		'; - 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 '
'; - $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 '
'; @@ -1419,7 +1419,7 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("ToOrder").'
'.$langs->trans("OrderDate").''; $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 '
'.$langs->trans("OrderMode").''; @@ -1444,7 +1444,7 @@ if ($id > 0 || ! empty($ref)) print ''; print ''; print '\n"; print "'; print ''; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index a28f3ee4b0d..46c95b95aa4 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 ''; print ''; print ''; diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index efef39c24b7..9fa487512ee 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 ''; print ''; print ''; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 25274ccf72d..2b5ccbf7cc3 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 '"; // Ref supplier @@ -200,7 +200,7 @@ if ($id > 0) print ''; print ''; print ''; print ''; print "\n"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 4298fcb8598..3297961786b 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 ''; @@ -958,7 +958,7 @@ if ($action == 'create') print ''."\n"; @@ -967,7 +967,7 @@ if ($action == 'create') print ''."\n"; @@ -977,7 +977,7 @@ if ($action == 'create') print ''."\n"; } @@ -1002,7 +1002,7 @@ if ($action == 'create') $text.=''; } $text.=''; - $desc=$html->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1); + $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1); print $desc; print ''; @@ -1027,7 +1027,7 @@ if ($action == 'create') $text.=''; } $text.=''; - $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 ''."\n"; @@ -1040,12 +1040,12 @@ if ($action == 'create') // Date invoice print ''; // Due date print ''; print ''; @@ -1101,7 +1101,7 @@ if ($action == 'create') print ''; print ''; print ''; print ''; print ''; @@ -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 '
'; } @@ -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 '
'; } // 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 '
'; } // 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 '
'; } @@ -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 '
'; } @@ -1195,13 +1195,13 @@ else // Ref print ''; print "\n"; // Ref supplier - print ''; // Third party @@ -1250,8 +1250,8 @@ else // Label - print ''; /* @@ -1333,13 +1333,13 @@ else print ''; // Date - print ''; // Due date - print ''; // Status @@ -1388,11 +1388,11 @@ else print ''; print ''; @@ -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 '
'; } @@ -1469,7 +1469,7 @@ else // VAT print ''; // 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 ''; print ''; print ''; print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 0fe0af9422c..8059b2f75ea 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 ea40e32c645..b8809771abc 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 ''; print "\n"; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 6ec8bf2654a..04171f596a5 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 ''; print ''; print ''; print ''; print ''; @@ -240,7 +240,7 @@ if ($action == 'create' || $action == 'add_paiement') if ($conf->banque->enabled) { print ''; } else @@ -438,10 +438,10 @@ if (! $_GET['action'] && ! $_POST['action']) print ''; print ''; print ''; print ''; print ''; // Date payment - print ''; // Payment mode print ''; // Payment numero - print ''; // Amount @@ -203,8 +203,8 @@ if ($result > 0) } // Note - print ''; // Bank account diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 1f14a967de8..5fd717a6b47 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 ''; print ''; $text=$objmodelimport->getDriverDesc($key); - print ''; + print ''; print ''; // Action button print ''; print ''; @@ -679,7 +679,7 @@ if ($step == 4 && $datatoimport) print ''; print ''; // File to import @@ -838,7 +838,7 @@ if ($step == 4 && $datatoimport) } $htmltext.=$langs->trans("FieldTitle").": ".$langs->trans($newlabel)."
"; $htmltext.=$langs->trans("Table")." -> ".$langs->trans("Field").': '.$tablename." -> ".preg_replace('/^.*\./','',$code)."
"; - print $html->textwithpicto($more,$htmltext); + print $form->textwithpicto($more,$htmltext); print ''; print ''; @@ -1087,7 +1087,7 @@ if ($step == 5 && $datatoimport) print ''; print ''; // File to import @@ -1413,7 +1413,7 @@ if ($step == 6 && $datatoimport) print ''; print ''; // File to import diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index d24a8eb1854..b4f4476faf2 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 ''; print ''; $text=$model->getDriverDesc($key); - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/includes/nusoap/lib/Mail/mime.php b/htdocs/includes/nusoap/lib/Mail/mime.php index 2cab8aa0528..55b32be55b1 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 65852f2304f..6a155c19396 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
  • 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:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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>/isU', $html, $matches) > 0) { + if (preg_match_all('/([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) { if (isset($matches[1][0])) { $css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0]))); } - $html = preg_replace('/(.*?)<\/cssarray>/isU', '', $html); + $form = preg_replace('/(.*?)<\/cssarray>/isU', '', $form); } // extract external CSS files $matches = array(); - if (preg_match_all('/]*)>/isU', $html, $matches) > 0) { + if (preg_match_all('/]*)>/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>/isU', $html, $matches) > 0) { + if (preg_match_all('/]*)>([^\<]*)<\/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 = ''.htmlentities(serialize($css)).''; // remove head and style blocks - $html = preg_replace('/]*)>(.*?)<\/head>/siU', '', $html); - $html = preg_replace('/]*)>([^\<]*)<\/style>/isU', '', $html); + $form = preg_replace('/]*)>(.*?)<\/head>/siU', '', $form); + $form = preg_replace('/]*)>([^\<]*)<\/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, '


    • '.$langs->trans("Receive").'
    '.$langs->trans("DeliveryDate").''; - print $html->select_date('','','','','',"commande"); + print $form->select_date('','','','','',"commande"); print "
    ".$langs->trans("Delivery")."\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 '
    '.$langs->trans("Comment").'
    '.$langs->trans("Ref").''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print '
    '.$langs->trans("Ref").''; - print $html->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande,'ref','',1,'ref','ref'); print '
    '.$langs->trans("Ref").''; - print $html->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref); print "
    '; //$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 ''; $formcompany->selectTypeContact($facture, '', 'type','internal'); @@ -230,7 +230,7 @@ if ($id > 0) print ''; - $nbofcontacts=$html->select_contacts($selectedCompany, '', 'contactid'); + $nbofcontacts=$form->select_contacts($selectedCompany, '', 'contactid'); if ($nbofcontacts == 0) print $langs->trans("NoContactDefined"); print ''; diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index b0c0ab10a2e..e91bd47a35c 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 '
    '.$langs->trans("Ref").''; - print $html->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($facture,'facid','',1,'rowid','ref',$morehtmlref); print '
    '; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); print $desc; print '
    '; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print $desc; print '
    '; print ''; print ''; - $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); + $desc=$form->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); print $desc; print '
    '.$langs->trans('DateInvoice').''; - $html->select_date($dateinvoice,'','','','',"add",1,1); + $form->select_date($dateinvoice,'','','','',"add",1,1); print '
    '.$langs->trans('DateMaxPayment').''; - $html->select_date($datedue,'ech','','','',"add",1,1); + $form->select_date($datedue,'ech','','','',"add",1,1); print '
    '.$langs->trans('NotePublic').''; - print $html->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc); + print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc); print '
    '.$langs->trans("Ref").''; - print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref); print '
    '.$html->editfieldkey("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).''; - print $html->editfieldval("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)); + print '
    '.$form->editfieldkey("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).''; + print $form->editfieldval("RefSupplier",'ref_supplier',$fac->ref_supplier,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)); print '
    '.$html->editfieldkey("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).''; - print $html->editfieldval("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)); + print '
    '.$form->editfieldkey("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)).''; + print $form->editfieldval("Label",'label',$fac->label,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer)); print '
    '.$html->editfieldkey("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).''; - print $html->editfieldval("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day'); + print '
    '.$form->editfieldkey("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).''; + print $form->editfieldval("Date",'date',$fac->datep,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0),'day'); print '
    '.$html->editfieldkey("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).''; - 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 '
    '.$form->editfieldkey("DateMaxPayment",'date_echeance',$fac->date_echeance,'facid',$fac->id,($fac->statut<2 && $user->rights->fournisseur->facture->creer && $fac->getSommePaiement() <= 0)).''; + 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 ''; 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 '
    '; - 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 ''; $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 '
    '; @@ -1598,7 +1598,7 @@ else print '    		'; - 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 ''; print ''; @@ -1642,7 +1642,7 @@ else $var=! $var; print '
    '; - $html->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre); + $form->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre); print ' 
    '.$langs->trans("Ref").''; - print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref); print '
    '.$langs->trans('Date').''; - $html->select_date($dateinvoice,'','','','',"addpaiement",1,1); + $form->select_date($dateinvoice,'','','','',"addpaiement",1,1); print ''.$langs->trans('Comments').'
    '.$langs->trans('PaymentMode').''; - $html->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid'); + $form->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid'); print ''; print '
    '.$langs->trans('Account').''; - $html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2); + $form->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2); print '
    '; - $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 ''; - $html->select_comptes($_REQUEST["search_account"],'search_account',0,'',1); + $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1); print ''; print ''; diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 56692542365..0f65dac448c 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 '
    '; } @@ -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 '
    '; } @@ -182,16 +182,16 @@ if ($result > 0) print '    		'.$langs->trans('Ref').''.$paiement->id.'
    '.$html->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; - print $html->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'day'); + print '
    '.$form->editfieldkey("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; + print $form->editfieldval("Date",'date',$paiement->date,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'day'); print '
    '.$langs->trans('PaymentMode').''.$paiement->type_libelle.'
    '.$html->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; - print $html->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string'); + print '
    '.$form->editfieldkey("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer).''; + print $form->editfieldval("Numero",'num',$paiement->numero,'id',$paiement->id,$paiement->statut == 0 && $user->rights->fournisseur->facture->creer,'string'); print '
    '.$html->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer).''; - print $html->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer,'text'); + print '
    '.$form->editfieldkey("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer).''; + print $form->editfieldval("Note",'note',$paiement->note,'id',$paiement->id,$user->rights->fournisseur->facture->creer,'text'); print '
    '.img_picto_common($key,$objmodelimport->getPicto($key)).''.$html->textwithpicto($objmodelimport->getDriverLabel($key),$text).''.$form->textwithpicto($objmodelimport->getDriverLabel($key),$text).''.$langs->trans("DownloadEmptyExample").''; @@ -478,7 +478,7 @@ if ($step == 3 && $datatoimport) print '
    '.$langs->trans("SourceFileFormat").''; $text=$objmodelimport->getDriverDesc($format); - print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text); + print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); print ''.$langs->trans("DownloadEmptyExample").''; print '
    '.$langs->trans("SourceFileFormat").''; $text=$objmodelimport->getDriverDesc($format); - print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text); + print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); print '
    '.$langs->trans("SourceFileFormat").''; $text=$objmodelimport->getDriverDesc($format); - print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text); + print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); print '
    '.$langs->trans("SourceFileFormat").''; $text=$objmodelimport->getDriverDesc($format); - print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text); + print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); print '
    '.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''.$html->textwithpicto($model->getDriverLabel($key),$text).''.$form->textwithpicto($model->getDriverLabel($key),$text).''.$model->getLibLabel($key).''.$model->getLibVersion($key).'
    ', $offset)) !== false) { - $html_a = substr($html, 0, $offset); - $html_b = substr($html, $offset, ($pos - $offset + 11)); - while (preg_match("']*)>(.*?)\n(.*?)'si", $html_b)) { + while (($offset < strlen($form)) AND ($pos = strpos($form, '', $offset)) !== false) { + $form_a = substr($form, 0, $offset); + $form_b = substr($form, $offset, ($pos - $offset + 11)); + while (preg_match("']*)>(.*?)\n(.*?)'si", $form_b)) { // preserve newlines on 'si", "\\2\\3", $html_b); - $html_b = preg_replace("']*)>(.*?)[\"](.*?)'si", "\\2''\\3", $html_b); + $form_b = preg_replace("']*)>(.*?)\n(.*?)'si", "\\2\\3", $form_b); + $form_b = preg_replace("']*)>(.*?)[\"](.*?)'si", "\\2''\\3", $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]*)', $html); + $form = preg_replace('/([\s]*)', $form); $offset = 0; - while (($offset < strlen($html)) AND ($pos = strpos($html, '', $offset)) !== false) { - $html_a = substr($html, 0, $offset); - $html_b = substr($html, $offset, ($pos - $offset + 9)); - while (preg_match("']*)>(.*?)'si", $html_b)) { - $html_b = preg_replace("']*)>(.*?)'si", "\\2#!TaB!#\\4#!NwL!#", $html_b); - $html_b = preg_replace("']*)>(.*?)'si", "\\2#!NwL!#", $html_b); + while (($offset < strlen($form)) AND ($pos = strpos($form, '', $offset)) !== false) { + $form_a = substr($form, 0, $offset); + $form_b = substr($form, $offset, ($pos - $offset + 9)); + while (preg_match("']*)>(.*?)'si", $form_b)) { + $form_b = preg_replace("']*)>(.*?)'si", "\\2#!TaB!#\\4#!NwL!#", $form_b); + $form_b = preg_replace("']*)>(.*?)'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("']*)>'si", "'si", "\" />", $html); + if (preg_match("']*)>'si", "'si", "\" />", $form); } - $html = str_replace("\n", ' ', $html); + $form = str_replace("\n", ' ', $form); // restore textarea newlines - $html = str_replace('', "\n", $html); + $form = str_replace('', "\n", $form); // remove extra spaces from code - $html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '', $html); - $html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '', $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]+<', $html); - $html = preg_replace('/<\/(td|th)>/', '', $html); - $html = preg_replace('/<\/table>([\s]*)/', '
    ', $html); - $html = preg_replace('/'.$this->re_space['p'].'+re_space['m'], chr(32).']*)>/xi', '', $html); - $html = preg_replace('/]*)>([^\<]*)<\/textarea>/xi', '', $html); - $html = preg_replace('/]*)><\/li>/', ' ', $html); - $html = preg_replace('/]*)>'.$this->re_space['p'].'*re_space['m'], ' \/]*)>[\s]/', '<\\1> ', $html); // preserve some spaces - $html = preg_replace('/[\s]<\/([^\>]*)>/', ' ', $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)>/', '', $form); + $form = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '', $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]+<', $form); + $form = preg_replace('/<\/(td|th)>/', '', $form); + $form = preg_replace('/<\/table>([\s]*)/', '
    ', $form); + $form = preg_replace('/'.$this->re_space['p'].'+re_space['m'], chr(32).']*)>/xi', '', $form); + $form = preg_replace('/]*)>([^\<]*)<\/textarea>/xi', '', $form); + $form = preg_replace('/]*)><\/li>/', ' ', $form); + $form = preg_replace('/]*)>'.$this->re_space['p'].'*re_space['m'], ' \/]*)>[\s]/', '<\\1> ', $form); // preserve some spaces + $form = preg_replace('/[\s]<\/([^\>]*)>/', ' ', $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:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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:
    • 0: to the right (or left for RTL language)
    • 1: to the beginning of the next line
    • 2: below
    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).
    * 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:
    • L : left align
    • C : center
    • R : right align
    • '' : empty string : left for LTR or right for RTL
    * @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 3e7a9b15ee3..5bbea59da59 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 = '' . PHP_EOL; - $html .= '' . PHP_EOL; - $html .= '' . PHP_EOL; - $html .= ' ' . PHP_EOL; - $html .= ' ' . PHP_EOL; - $html .= ' ' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . '' . PHP_EOL; + $form = '' . PHP_EOL; + $form .= '' . PHP_EOL; + $form .= '' . PHP_EOL; + $form .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; + $form .= ' ' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . '' . PHP_EOL; if ($pIncludeStyles) { - $html .= $this->generateStyles(true); + $form .= $this->generateStyles(true); } - $html .= ' ' . PHP_EOL; - $html .= '' . PHP_EOL; - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; + $form .= '' . PHP_EOL; + $form .= ' ' . 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) { //
    ' . PHP_EOL; + $form .= '
    ' . PHP_EOL; } else { $style = isset($this->_cssStyles['table']) ? $this->_assembleCSS($this->_cssStyles['table']) : ''; if ($this->_isPdf && $pSheet->getShowGridLines()) { - $html .= '
    ' . PHP_EOL; + $form .= '
    ' . PHP_EOL; } else { - $html .= '
    ' . PHP_EOL; + $form .= '
    ' . PHP_EOL; } } @@ -892,16 +892,16 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { $i = -1; while($i++ < $highestColumnIndex) { if (!$this->_useInlineCss) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; } else { $style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : ''; - $html .= ' ' . PHP_EOL; + $form .= ' ' . 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 .= '
    ' . PHP_EOL; + $form = ''; + $form .= ' ' . 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: - $html .= $this->_generateTableFooter(); + $form .= $this->_generateTableFooter(); // insert page break - $html .= '
    '; + $form .= '
    '; // open table again: + etc. - $html .= $this->_generateTableHeader($pSheet); + $form .= $this->_generateTableHeader($pSheet); } } // Write row start if (!$this->_useInlineCss) { - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; } else { $style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) ? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : ''; - $html .= ' ' . PHP_EOL; + $form .= ' ' . PHP_EOL; } // Write cells @@ -1085,9 +1085,9 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { // Write if ($writeCell) { // Column start - $html .= ' _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 ' . PHP_EOL; + $form .= '' . PHP_EOL; } // Next column @@ -1135,10 +1135,10 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter { } // Write row end - $html .= ' ' . PHP_EOL; + $form .= ' ' . 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 43bd1283f8d..2096aa839b1 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 8b9f8eadee4..47511892e51 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

  • $header_title
  • $hPt
  • $HREF
    • -
  • $htmlLinkColorArray
    • -
  • $htmlLinkFontStyle
    • -
  • $htmlvspace
    • +
  • $formLinkColorArray
    • +
  • $formLinkFontStyle
    • +
  • $formvspace
  • $imagekeys
  • $images
  • $imgscale
    • @@ -3204,9 +3204,9 @@ This is a PHP class for generating PDF documents without requiring external exte
    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 .= '


    [ Top ]

    - +

    -

    $htmlLinkColorArray = array(0, 0, 255)

    +

    $formLinkColorArray = array(0, 0, 255)

    [line 1138]

    Default color for html links



    Tags:

    @@ -3231,9 +3231,9 @@ This is a PHP class for generating PDF documents without requiring external exte


    [ Top ]

    - +

    -

    $htmlLinkFontStyle =  'U'

    +

    $formLinkFontStyle =  'U'

    [line 1145]

    Default font style to add to html links



    Tags:

    @@ -3258,9 +3258,9 @@ This is a PHP class for generating PDF documents without requiring external exte

    [ Top ]

    - +

    -

    $htmlvspace =  0

    +

    $formvspace =  0

    [line 1038]

    Count the latest inserted vertical spaces on HTML



    Tags:

    @@ -8868,7 +8868,7 @@ $h)
    - + @@ -9391,7 +9391,7 @@ $antialias = false])
    author:  Andreas Würmser, Nicola Asuniauthor:  Andreas W�rmser, Nicola Asuni
    since:  3.1.000 (2008-06-09)
    - + @@ -10273,7 +10273,7 @@ $y)
    author:  Andreas Würmser, Nicola Asuniauthor:  Andreas W�rmser, Nicola Asuni
    since:  3.1.000 (2008-06-09)
    string fixHTMLCode( string -$html, [string +$form, [string $default_css = ''], [array $tagvs = ''], [array $tidy_options = '']) @@ -10309,7 +10309,7 @@ $tidy_options = '']) - + @@ -12371,7 +12371,7 @@ $v)
    string  $html  $form   htmlcode to fix
    array getHtmlDomArray( string -$html) +$form)

    @@ -12395,7 +12395,7 @@ $html) - +
    string  $html  $form   html code
    @@ -12410,7 +12410,7 @@ $html)
    float getHTMLUnitToUnits( string -$htmlval, [string +$formval, [string $refsize = 1], [string $defaultunit = 'px'], [ $points = false], boolean @@ -12441,7 +12441,7 @@ $point) - + @@ -12881,7 +12881,7 @@ $border = 0]) - + @@ -13745,7 +13745,7 @@ $border = 0]) - + @@ -14972,7 +14972,7 @@ $script)
    string  $htmlval  $formval   string containing values and unit
    return:  Return the minimal height needed for multicell method for printing the $txt param.
    author:  Alexander Escalona Fernández, Nicola Asuniauthor:  Alexander Escalona Fern�ndez, Nicola Asuni
    since:  4.5.011 return:  Return the minimal height needed for multicell method for printing the $txt param.
    author:  Nicola Asuni, Alexander Escalona Fernándezauthor:  Nicola Asuni, Alexander Escalona Fern�ndez
    access:  public
    - + @@ -15286,7 +15286,7 @@ $coords = array(0,0,1,0)])
    author:  Johannes Güntert, Nicola Asuniauthor:  Johannes G�ntert, Nicola Asuni
    since:  2.1.002 (2008-02-12)
    - + @@ -16768,7 +16768,7 @@ $coords = array(0.5,0.5,0.5,0.5,1)])
    author:  Andreas Würmser, Nicola Asuniauthor:  Andreas W�rmser, Nicola Asuni
    since:  3.1.000 (2008-06-09)
    - + @@ -24806,7 +24806,7 @@ $file)
    author:  Andreas Würmser, Nicola Asuniauthor:  Andreas W�rmser, Nicola Asuni
    since:  3.1.000 (2008-06-09)
    void writeHTML( string -$html, [boolean +$form, [boolean $ln = true], [boolean $fill = false], [boolean $reseth = false], [boolean @@ -24832,7 +24832,7 @@ $align = '']) - + @@ -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]) - + @@ -26734,7 +26734,7 @@ $y3)
    string  $html  $form   text to display
    string  $html  $form   html text to print. Default value: empty string.

    - 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).




    + 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).




    Tags:

    @@ -26801,7 +26801,7 @@ $y3)

    - 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).




    + 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).




    Tags:

    @@ -26860,7 +26860,7 @@ $y2)

    - 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).




    + 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).




    Tags:

    @@ -27805,7 +27805,7 @@ $cidoffset = 0])
    - + diff --git a/htdocs/includes/tcpdf/doc/elementindex.html b/htdocs/includes/tcpdf/doc/elementindex.html index 9176ca9f0d7..a2a3c359f4f 100644 --- a/htdocs/includes/tcpdf/doc/elementindex.html +++ b/htdocs/includes/tcpdf/doc/elementindex.html @@ -817,12 +817,12 @@
    in file tcpdf.php, variable TCPDF::$hPt
    $HREF
    in file tcpdf.php, variable TCPDF::$HREF
    -
    $htmlLinkColorArray
    -
    in file tcpdf.php, variable TCPDF::$htmlLinkColorArray
        Default color for html links
    -
    $htmlLinkFontStyle
    -
    in file tcpdf.php, variable TCPDF::$htmlLinkFontStyle
        Default font style to add to html links
    -
    $htmlvspace
    -
    in file tcpdf.php, variable TCPDF::$htmlvspace
        Count the latest inserted vertical spaces on HTML
    +
    $formLinkColorArray
    +
    in file tcpdf.php, variable TCPDF::$formLinkColorArray
        Default color for html links
    +
    $formLinkFontStyle
    +
    in file tcpdf.php, variable TCPDF::$formLinkFontStyle
        Default font style to add to html links
    +
    $formvspace
    +
    in file tcpdf.php, variable TCPDF::$formvspace
        Count the latest inserted vertical spaces on HTML
    Header
    in file tcpdf.php, method TCPDF::Header()
        This method is used to render the page header.
    HEAD_MAGNIFICATION
    @@ -2038,11 +2038,11 @@
    _out
    in file tcpdf.php, method TCPDF::_out()
        Output a string to the document.
    _outCurve
    -
    in file tcpdf.php, method TCPDF::_outCurve()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurve()
        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.
    _outCurveV
    -
    in file tcpdf.php, method TCPDF::_outCurveV()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurveV()
        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.
    _outCurveY
    -
    in file tcpdf.php, method TCPDF::_outCurveY()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurveY()
        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.
    _outellipticalarc
    in file tcpdf.php, method TCPDF::_outellipticalarc()
        Append an elliptical arc to the current path.
    _outLine
    diff --git a/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html b/htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html index f83d7fc0ac1..4b88509de78 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 @@
    _out
    in file tcpdf.php, method TCPDF::_out()
        Output a string to the document.
    _outCurve
    -
    in file tcpdf.php, method TCPDF::_outCurve()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurve()
        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.
    _outCurveV
    -
    in file tcpdf.php, method TCPDF::_outCurveV()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurveV()
        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.
    _outCurveY
    -
    in file tcpdf.php, method TCPDF::_outCurveY()
        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.
    +
    in file tcpdf.php, method TCPDF::_outCurveY()
        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.
    _outellipticalarc
    in file tcpdf.php, method TCPDF::_outellipticalarc()
        Append an elliptical arc to the current path.
    _outLine
    @@ -1024,12 +1024,12 @@
    in file tcpdf.php, variable TCPDF::$hPt
    $HREF
    in file tcpdf.php, variable TCPDF::$HREF
    -
    $htmlLinkColorArray
    -
    in file tcpdf.php, variable TCPDF::$htmlLinkColorArray
        Default color for html links
    -
    $htmlLinkFontStyle
    -
    in file tcpdf.php, variable TCPDF::$htmlLinkFontStyle
        Default font style to add to html links
    -
    $htmlvspace
    -
    in file tcpdf.php, variable TCPDF::$htmlvspace
        Count the latest inserted vertical spaces on HTML
    +
    $formLinkColorArray
    +
    in file tcpdf.php, variable TCPDF::$formLinkColorArray
        Default color for html links
    +
    $formLinkFontStyle
    +
    in file tcpdf.php, variable TCPDF::$formLinkFontStyle
        Default font style to add to html links
    +
    $formvspace
    +
    in file tcpdf.php, variable TCPDF::$formvspace
        Count the latest inserted vertical spaces on HTML
    Header
    in file tcpdf.php, method TCPDF::Header()
        This method is used to render the page header.
    HEAD_MAGNIFICATION
    diff --git a/htdocs/includes/tcpdf/tcpdf.php b/htdocs/includes/tcpdf/tcpdf.php index ba4bebaba7c..2e01287162d 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
  • 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:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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:
    • 0: no border (default)
    • 1: frame
    or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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 = ''; // 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('
    ', '
    ', $html); + $form = str_replace('
    ', '
    ', $form); // remove some empty tag blocks - $html = preg_replace('/]*)><\/div>/', '', $html); - $html = preg_replace('/]*)><\/p>/', '', $html); + $form = preg_replace('/]*)><\/div>/', '', $form); + $form = preg_replace('/]*)><\/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>/isU', $html, $matches) > 0) { + if (preg_match_all('/([^\<]*)<\/cssarray>/isU', $form, $matches) > 0) { if (isset($matches[1][0])) { $css = array_merge($css, unserialize($this->unhtmlentities($matches[1][0]))); } - $html = preg_replace('/(.*?)<\/cssarray>/isU', '', $html); + $form = preg_replace('/(.*?)<\/cssarray>/isU', '', $form); } // extract external CSS files $matches = array(); - if (preg_match_all('/]*)>/isU', $html, $matches) > 0) { + if (preg_match_all('/]*)>/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>/isU', $html, $matches) > 0) { + if (preg_match_all('/]*)>([^\<]*)<\/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 = ''.htmlentities(serialize($css)).''; // remove head and style blocks - $html = preg_replace('/]*)>(.*?)<\/head>/siU', '', $html); - $html = preg_replace('/]*)>([^\<]*)<\/style>/isU', '', $html); + $form = preg_replace('/]*)>(.*?)<\/head>/siU', '', $form); + $form = preg_replace('/]*)>([^\<]*)<\/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, '


    • author:  Johannes Güntert, Nicola Asuniauthor:  Johannes G�ntert, Nicola Asuni
    since:  2.1.002 (2008-02-12)
    ', $offset)) !== false) { - $html_a = substr($html, 0, $offset); - $html_b = substr($html, $offset, ($pos - $offset + 11)); - while (preg_match("']*)>(.*?)\n(.*?)'si", $html_b)) { + while (($offset < strlen($form)) AND ($pos = strpos($form, '', $offset)) !== false) { + $form_a = substr($form, 0, $offset); + $form_b = substr($form, $offset, ($pos - $offset + 11)); + while (preg_match("']*)>(.*?)\n(.*?)'si", $form_b)) { // preserve newlines on 'si", "\\2\\3", $html_b); - $html_b = preg_replace("']*)>(.*?)[\"](.*?)'si", "\\2''\\3", $html_b); + $form_b = preg_replace("']*)>(.*?)\n(.*?)'si", "\\2\\3", $form_b); + $form_b = preg_replace("']*)>(.*?)[\"](.*?)'si", "\\2''\\3", $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]*)', $html); + $form = preg_replace('/([\s]*)', $form); $offset = 0; - while (($offset < strlen($html)) AND ($pos = strpos($html, '', $offset)) !== false) { - $html_a = substr($html, 0, $offset); - $html_b = substr($html, $offset, ($pos - $offset + 9)); - while (preg_match("']*)>(.*?)'si", $html_b)) { - $html_b = preg_replace("']*)>(.*?)'si", "\\2#!TaB!#\\4#!NwL!#", $html_b); - $html_b = preg_replace("']*)>(.*?)'si", "\\2#!NwL!#", $html_b); + while (($offset < strlen($form)) AND ($pos = strpos($form, '', $offset)) !== false) { + $form_a = substr($form, 0, $offset); + $form_b = substr($form, $offset, ($pos - $offset + 9)); + while (preg_match("']*)>(.*?)'si", $form_b)) { + $form_b = preg_replace("']*)>(.*?)'si", "\\2#!TaB!#\\4#!NwL!#", $form_b); + $form_b = preg_replace("']*)>(.*?)'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("']*)>'si", "'si", "\" />", $html); + if (preg_match("']*)>'si", "'si", "\" />", $form); } - $html = str_replace("\n", ' ', $html); + $form = str_replace("\n", ' ', $form); // restore textarea newlines - $html = str_replace('', "\n", $html); + $form = str_replace('', "\n", $form); // remove extra spaces from code - $html = preg_replace('/[\s]+<\/(table|tr|ul|ol|dl)>/', '', $html); - $html = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '', $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]+<', $html); - $html = preg_replace('/<\/(td|th)>/', '', $html); - $html = preg_replace('/<\/table>([\s]*)/', '
    ', $html); - $html = preg_replace('/'.$this->re_space['p'].'+re_space['m'], chr(32).']*)>[\s]+([^\<])/xi', ' \\2', $html); - $html = preg_replace('/]*)>/xi', '', $html); - $html = preg_replace('/]*)>([^\<]*)<\/textarea>/xi', '', $html); - $html = preg_replace('/]*)><\/li>/', ' ', $html); - $html = preg_replace('/]*)>'.$this->re_space['p'].'*re_space['m'], ' \/]*)>[\s]/', '<\\1> ', $html); // preserve some spaces - $html = preg_replace('/[\s]<\/([^\>]*)>/', ' ', $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)>/', '', $form); + $form = preg_replace('/'.$this->re_space['p'].'+<\/(td|th|li|dt|dd)>/'.$this->re_space['m'], '', $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]+<', $form); + $form = preg_replace('/<\/(td|th)>/', '', $form); + $form = preg_replace('/<\/table>([\s]*)/', '', $form); + $form = preg_replace('/'.$this->re_space['p'].'+re_space['m'], chr(32).']*)>[\s]+([^\<])/xi', ' \\2', $form); + $form = preg_replace('/]*)>/xi', '', $form); + $form = preg_replace('/]*)>([^\<]*)<\/textarea>/xi', '', $form); + $form = preg_replace('/]*)><\/li>/', ' ', $form); + $form = preg_replace('/]*)>'.$this->re_space['p'].'*re_space['m'], ' \/]*)>[\s]/', '<\\1> ', $form); // preserve some spaces + $form = preg_replace('/[\s]<\/([^\>]*)>/', ' ', $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('/^

  • 0: no border (default)
  • 1: frame
    • or a string containing some or all of the following characters (in any order):
    • L: left
    • T: top
    • R: right
    • B: bottom
    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:
    • 0: to the right (or left for RTL language)
    • 1: to the beginning of the next line
    • 2: below
    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).
    * 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:
    • L : left align
    • C : center
    • R : right align
    • '' : empty string : left for LTR or right for RTL
    * @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 56ac0452eda..ae17ade04ff 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 '
    '; } @@ -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 '
    '; } @@ -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 19ff6392f41..436c40527cf 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 '