';
print '';
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 '';
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 ' ';
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 ' ';
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 ' ';
print '';
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 ' '.$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 ''.$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 '';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print ' ';
print ''.$langs->trans("Ref").' ';
print '';
- print $html->showrefnav($commande,'ref','',1,'ref','ref');
+ print $form->showrefnav($commande,'ref','',1,'ref','ref');
print ' ';
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 ' ';
print '';
$formcompany->selectTypeContact($facture, '', 'type','internal');
@@ -230,7 +230,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/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 ' ';
- $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+ $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print $desc;
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("NoReplacableInvoice").' ';
}
$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.=''.$langs->trans("NoInvoiceToCorrect").' ';
}
$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 ''.$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').' ';
@@ -1101,7 +1101,7 @@ if ($action == 'create')
print '';
- print $html->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
+ print $form->load_tva('tauxtva'.$i,$value_tauxtva,$societe,$mysoc);
print ' ';
print ''.$langs->trans("Ref").' ';
- print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
print ' ';
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 ' ';
/*
@@ -1333,13 +1333,13 @@ else
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 ' ';
// Due date
- 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 ' ';
// Status
@@ -1388,11 +1388,11 @@ else
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 '';
- 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 ' ';
// 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 '';
$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 ' ';
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 '';
print ' ';
print '';
- $html->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre);
+ $form->select_produits_fournisseurs($fac->socid,'','idprodfournprice','',$filtre);
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 ' '.$langs->trans("Ref").' ';
- print $html->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
+ print $form->showrefnav($fac,'facid','',1,'rowid','ref',$morehtmlref);
print ' ';
print "'.$langs->trans('Date').' ';
- $html->select_date($dateinvoice,'','','','',"addpaiement",1,1);
+ $form->select_date($dateinvoice,'','','','',"addpaiement",1,1);
print ' ';
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 '';
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 ' ';
print '';
- $html->select_comptes($_REQUEST["search_account"],'search_account',0,'',1);
+ $form->select_comptes($_REQUEST["search_account"],'search_account',0,'',1);
print ' ';
print '';
print ' '.$langs->trans('Ref').' '.$paiement->id.' ';
// Date payment
- print ''.$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 ' ';
print ''.img_picto_common($key,$objmodelimport->getPicto($key)).' ';
$text=$objmodelimport->getDriverDesc($key);
- print ''.$html->textwithpicto($objmodelimport->getDriverLabel($key),$text).' ';
+ print ''.$form->textwithpicto($objmodelimport->getDriverLabel($key),$text).' ';
print ''.$langs->trans("DownloadEmptyExample").' ';
@@ -478,7 +478,7 @@ if ($step == 3 && $datatoimport)
print ' '.$langs->trans("SourceFileFormat").' ';
print '';
$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").' ';
print '';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print ' ".$langs->trans($newlabel)." '.$tablename." -> ".preg_replace('/^.*\./','',$code)." '.$langs->trans("SourceFileFormat").' ';
print '';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
print ' '.$langs->trans("SourceFileFormat").' ';
print '';
$text=$objmodelimport->getDriverDesc($format);
- print $html->textwithpicto($objmodelimport->getDriverLabel($format),$text);
+ print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text);
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/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 L: left T: top R: right B: bottom 0: no border (default) 1: frame L: left T: top R: right B: bottom ([^\<]*)<\/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, '
', $form);
+ $form = preg_replace('/'.$this->re_space['p'].'+]*)>/xi', ']*)>([^\<]*)<\/textarea>/xi', ']*)><\/li>/', ' ', $form);
+ $form = preg_replace('/]*)>'.$this->re_space['p'].'* \/]*)>[\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 L: left T: top R: right B: bottom 0: to the right (or left for RTL language) 1: to the beginning of the next line 2: below L : left align C : center R : right align '' : empty string : left for LTR or right for RTL ' . htmlspecialchars($this->_phpExcel->getProperties()->getTitle()) . ' ' . 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) {
// ?
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;
+ $form .= '' . PHP_EOL;
+ $form .= ' ' . 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;
} 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 = '';
+ $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: + ' . 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 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 .= ' ' . 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
- $htmlLinkColorArray = array(0, 0, 255)
+ $formLinkColorArray = array(0, 0, 255)
[line 1138]
Default color for html linksTags:
@@ -3231,9 +3231,9 @@ This is a PHP class for generating PDF documents without requiring external exte
- $htmlLinkFontStyle = 'U'
+ $formLinkFontStyle = 'U'
[line 1145]
Default font style to add to html linksTags:
@@ -3258,9 +3258,9 @@ This is a PHP class for generating PDF documents without requiring external exte
- $htmlvspace = 0
+ $formvspace = 0
[line 1038]
Count the latest inserted vertical spaces on HTMLTags:
@@ -8868,7 +8868,7 @@ $h)