From dd13c334c7d56260f58bd76e9e68cb5920d71841 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 20 Apr 2013 20:30:18 +0200 Subject: [PATCH] New: Compatibility with jmobile --- htdocs/comm/action/rapport/index.php | 2 +- htdocs/comm/propal/apercu.php | 2 +- htdocs/commande/apercu.php | 4 ++-- htdocs/compta/facture/apercu.php | 4 ++-- htdocs/compta/paiement/rapport.php | 2 +- htdocs/compta/prelevement/bon.php | 2 +- htdocs/compta/prelevement/factures.php | 2 +- htdocs/compta/prelevement/fiche-rejet.php | 2 +- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/fiche.php | 2 +- htdocs/compta/prelevement/lignes.php | 2 +- htdocs/core/class/html.formfile.class.php | 12 ++++++------ htdocs/fichinter/apercu.php | 4 ++-- htdocs/imports/import.php | 8 ++++---- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php index 33a30e9c6b6..fa100e532f3 100644 --- a/htdocs/comm/action/rapport/index.php +++ b/htdocs/comm/action/rapport/index.php @@ -132,7 +132,7 @@ if ($resql) if (file_exists($file)) { - print ''.img_pdf().''; + print ''.img_pdf().''; print ''.dol_print_date(dol_filemtime($file),'dayhour').''; print ''.dol_print_size(dol_filesize($file)).''; } diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index fa01f818b16..8972baaac88 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -142,7 +142,7 @@ if ($id > 0 || ! empty($ref)) print "".$langs->trans("Propal")." PDF"; - print ''.$object->ref.'.pdf'; + print ''.$object->ref.'.pdf'; print ''.dol_print_size(dol_filesize($file)).''; print ''.dol_print_date(dol_filemtime($file),'dayhour').''; diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index 03957361ae2..f92a309a53c 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -128,7 +128,7 @@ if ($id > 0 || ! empty($ref)) print "".$langs->trans("Order")." PDF"; - print ''.$object->ref.'.pdf'; + print ''.$object->ref.'.pdf'; print ''.dol_print_size(dol_filesize($file)).''; print ''.dol_print_date(dol_filemtime($file),'dayhour').''; print ''; @@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref)) { print "Commande detaillee"; - print ''.$object->ref.'-detail.pdf'; + print ''.$object->ref.'-detail.pdf'; print ''.dol_print_size(dol_filesize($filedetail)).''; print ''.dol_print_date(dol_filemtime($filedetail),'dayhour').''; print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 2db60bada79..f31f0a50f0f 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -318,7 +318,7 @@ if ($id > 0 || ! empty($ref)) print "".$langs->trans("Bill")." PDF"; - print ''.$object->ref.'.pdf'; + print ''.$object->ref.'.pdf'; print ''.dol_print_size(dol_filesize($file)). ''; print ''.dol_print_date(dol_filemtime($file),'dayhour').''; print ''; @@ -328,7 +328,7 @@ if ($id > 0 || ! empty($ref)) { print "Facture detaillee"; - print ''.$object->ref.'-detail.pdf'; + print ''.$object->ref.'-detail.pdf'; print ''.dol_print_size(dol_filesize($filedetail)).''; print ''.dol_print_date(dol_filemtime($filedetail),'dayhour').''; print ''; diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index 1bb4ad3a9ca..ce4a3b7cb7f 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -154,7 +154,7 @@ if ($year) $var=!$var; $tfile = $dir . '/'.$year.'/'.$file; $relativepath = $year.'/'.$file; - print "".''.img_pdf().' '.$file.''; + print "".''.img_pdf().' '.$file.''; print ''.dol_print_size(dol_filesize($tfile)).''; print ''.dol_print_date(dol_filemtime($tfile),"dayhour").''; } diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php index 6448a5b3df5..89b40e095bc 100644 --- a/htdocs/compta/prelevement/bon.php +++ b/htdocs/compta/prelevement/bon.php @@ -63,7 +63,7 @@ if ($id > 0 || ! empty($ref)) $relativepath = 'bon/'.$object->ref; - print ''.$object->ref.''; + print ''.$object->ref.''; print ''; print '
'; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 5271dbd03b4..ee5558b8ba2 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -94,7 +94,7 @@ if ($prev_id) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; - print ''.$relativepath.''; + print ''.$relativepath.''; print '
'; dol_fiche_end(); diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index 3cc372094a3..335bfbc26c6 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -93,7 +93,7 @@ if ($prev_id) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; - print ''.$relativepath.''; + print ''.$relativepath.''; print '
'; dol_fiche_end(); diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 20e9c09145f..ee03e0d18b2 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -92,7 +92,7 @@ if ($prev_id) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; - print ''.$relativepath.''; + print ''.$relativepath.''; print '
'; dol_fiche_end(); diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 283f0c24183..fee2f1ecc24 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -191,7 +191,7 @@ if ($id > 0) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; - print ''.$relativepath.''; + print ''.$relativepath.''; print '
'; dol_fiche_end(); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 298effa2b15..5e186774abe 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -101,7 +101,7 @@ if ($prev_id) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref; - print ''.$relativepath.''; + print ''.$relativepath.''; print '
'; dol_fiche_end(); diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 71541ab4a5d..699977c05ff 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -480,10 +480,10 @@ class FormFile // Show file name with link to download $out.= ''; - $out.= 'trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength); $out.= ''."\n"; $out.= ''; @@ -575,7 +575,7 @@ class FormFile } // Show file name with link to download - $out.= ''; print ''; //print "XX".$file['name']; //$file['name'] must be utf8 - print ''; @@ -855,7 +855,7 @@ class FormFile print ''; print ''; //print "XX".$file['name']; //$file['name'] must be utf8 - print ''; print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' '; @@ -865,7 +865,7 @@ class FormFile print ''.dol_print_size($file['size'],1,1).''; print ''.dol_print_date($file['date'],"dayhour").''; print ''; - if (! empty($useinecm)) print ''; print img_view().'   '; diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 2bac1eae624..507a48d2dee 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -100,7 +100,7 @@ if ($id > 0 || ! empty($ref)) print "".$langs->trans("Intervention")." PDF"; - print ''.$object->ref.'.pdf'; + print ''.$object->ref.'.pdf'; print ''.dol_print_size(dol_filesize($file)).''; print ''.dol_print_date(dol_filemtime($file),'dayhour').''; print ''; @@ -110,7 +110,7 @@ if ($id > 0 || ! empty($ref)) { print "Fiche d'intervention detaillee"; - print ''.$object->ref.'-detail.pdf'; + print ''.$object->ref.'-detail.pdf'; print ''.dol_print_size(dol_filesize($filedetail)).''; print ''.dol_print_date(dol_filemtime($filedetail),'dayhour').''; print ''; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 85c8410da7e..d6d35335bed 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -569,7 +569,7 @@ if ($step == 3 && $datatoimport) print ''; print ''.img_mime($file).''; print ''; - print ''; + print ''; print $file; print ''; print ''; @@ -742,7 +742,7 @@ if ($step == 4 && $datatoimport) print ''; $modulepart='import'; $relativepath=GETPOST('filetoimport'); - print ''; + print ''; print $filetoimport; print ''; print ''; @@ -1172,7 +1172,7 @@ if ($step == 5 && $datatoimport) print ''; $modulepart='import'; $relativepath=GETPOST('filetoimport'); - print ''; + print ''; print $filetoimport; print ''; print ''; @@ -1506,7 +1506,7 @@ if ($step == 6 && $datatoimport) print ''; $modulepart='import'; $relativepath=GETPOST('filetoimport'); - print ''; + print ''; print $filetoimport; print ''; print '';