From c3003a326683df9b4366eee6fee68596b75c6bca Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 2 Nov 2010 17:28:51 +0000 Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20de=20la=20librairie=20html2p?= =?UTF-8?q?df?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/{ => lib}/html2pdf/_LGPL.txt | 0 includes/{ => lib}/html2pdf/_fpdf/FAQ.htm | 0 .../html2pdf/_fpdf/doc/acceptpagebreak.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/addfont.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/addlink.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/addpage.htm | 0 .../html2pdf/_fpdf/doc/aliasnbpages.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/cell.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/close.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/error.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/footer.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/fpdf.htm | 0 .../html2pdf/_fpdf/doc/getstringwidth.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/getx.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/gety.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/header.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/image.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/index.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/line.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/link.htm | 0 includes/{ => lib}/html2pdf/_fpdf/doc/ln.htm | 0 .../html2pdf/_fpdf/doc/multicell.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/output.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/pageno.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/rect.htm | 0 .../html2pdf/_fpdf/doc/setauthor.htm | 0 .../html2pdf/_fpdf/doc/setautopagebreak.htm | 0 .../html2pdf/_fpdf/doc/setcompression.htm | 0 .../html2pdf/_fpdf/doc/setcreator.htm | 0 .../html2pdf/_fpdf/doc/setdisplaymode.htm | 0 .../html2pdf/_fpdf/doc/setdrawcolor.htm | 0 .../html2pdf/_fpdf/doc/setfillcolor.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/setfont.htm | 0 .../html2pdf/_fpdf/doc/setfontsize.htm | 0 .../html2pdf/_fpdf/doc/setkeywords.htm | 0 .../html2pdf/_fpdf/doc/setleftmargin.htm | 0 .../html2pdf/_fpdf/doc/setlinewidth.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/setlink.htm | 0 .../html2pdf/_fpdf/doc/setmargins.htm | 0 .../html2pdf/_fpdf/doc/setrightmargin.htm | 0 .../html2pdf/_fpdf/doc/setsubject.htm | 0 .../html2pdf/_fpdf/doc/settextcolor.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/settitle.htm | 0 .../html2pdf/_fpdf/doc/settopmargin.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/setx.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/setxy.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/sety.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/text.htm | 0 .../{ => lib}/html2pdf/_fpdf/doc/write.htm | 0 .../{ => lib}/html2pdf/_fpdf/font/courier.php | 0 .../html2pdf/_fpdf/font/helvetica.php | 0 .../html2pdf/_fpdf/font/helveticab.php | 0 .../html2pdf/_fpdf/font/helveticabi.php | 0 .../html2pdf/_fpdf/font/helveticai.php | 0 .../html2pdf/_fpdf/font/makefont/cp1250.map | 0 .../html2pdf/_fpdf/font/makefont/cp1251.map | 0 .../html2pdf/_fpdf/font/makefont/cp1252.map | 0 .../html2pdf/_fpdf/font/makefont/cp1253.map | 0 .../html2pdf/_fpdf/font/makefont/cp1254.map | 0 .../html2pdf/_fpdf/font/makefont/cp1255.map | 0 .../html2pdf/_fpdf/font/makefont/cp1257.map | 0 .../html2pdf/_fpdf/font/makefont/cp1258.map | 0 .../html2pdf/_fpdf/font/makefont/cp874.map | 0 .../_fpdf/font/makefont/iso-8859-1.map | 0 .../_fpdf/font/makefont/iso-8859-11.map | 0 .../_fpdf/font/makefont/iso-8859-15.map | 0 .../_fpdf/font/makefont/iso-8859-16.map | 0 .../_fpdf/font/makefont/iso-8859-2.map | 0 .../_fpdf/font/makefont/iso-8859-4.map | 0 .../_fpdf/font/makefont/iso-8859-5.map | 0 .../_fpdf/font/makefont/iso-8859-7.map | 0 .../_fpdf/font/makefont/iso-8859-9.map | 0 .../html2pdf/_fpdf/font/makefont/koi8-r.map | 0 .../html2pdf/_fpdf/font/makefont/koi8-u.map | 0 .../html2pdf/_fpdf/font/makefont/makefont.php | 0 .../{ => lib}/html2pdf/_fpdf/font/symbol.php | 0 .../{ => lib}/html2pdf/_fpdf/font/times.php | 0 .../{ => lib}/html2pdf/_fpdf/font/timesb.php | 0 .../{ => lib}/html2pdf/_fpdf/font/timesbi.php | 0 .../{ => lib}/html2pdf/_fpdf/font/timesi.php | 0 .../html2pdf/_fpdf/font/zapfdingbats.php | 0 includes/{ => lib}/html2pdf/_fpdf/fpdf.css | 0 includes/{ => lib}/html2pdf/_fpdf/fpdf.php | 0 includes/{ => lib}/html2pdf/_fpdf/histo.htm | 0 includes/{ => lib}/html2pdf/_fpdf/install.txt | 0 includes/{ => lib}/html2pdf/_fpdf/license.txt | 0 .../html2pdf/_fpdf/tutorial/20k_c1.txt | 0 .../html2pdf/_fpdf/tutorial/20k_c2.txt | 0 .../html2pdf/_fpdf/tutorial/calligra.afm | 0 .../html2pdf/_fpdf/tutorial/calligra.php | 0 .../html2pdf/_fpdf/tutorial/calligra.ttf | Bin .../html2pdf/_fpdf/tutorial/countries.txt | 0 .../html2pdf/_fpdf/tutorial/index.htm | 0 .../html2pdf/_fpdf/tutorial/logo.png | Bin .../html2pdf/_fpdf/tutorial/logo_pb.png | Bin .../html2pdf/_fpdf/tutorial/makefont.php | 0 .../html2pdf/_fpdf/tutorial/tuto1.htm | 0 .../html2pdf/_fpdf/tutorial/tuto1.php | 0 .../html2pdf/_fpdf/tutorial/tuto2.htm | 0 .../html2pdf/_fpdf/tutorial/tuto2.php | 0 .../html2pdf/_fpdf/tutorial/tuto3.htm | 0 .../html2pdf/_fpdf/tutorial/tuto3.php | 0 .../html2pdf/_fpdf/tutorial/tuto4.htm | 0 .../html2pdf/_fpdf/tutorial/tuto4.php | 0 .../html2pdf/_fpdf/tutorial/tuto5.htm | 0 .../html2pdf/_fpdf/tutorial/tuto5.php | 0 .../html2pdf/_fpdf/tutorial/tuto6.htm | 0 .../html2pdf/_fpdf/tutorial/tuto6.php | 0 .../html2pdf/_fpdf/tutorial/tuto7.htm | 0 .../html2pdf/_fpdf/tutorial/tuto7.php | 0 includes/{ => lib}/html2pdf/_lisez_moi.txt | 0 .../html2pdf/_mypdf/00_fpdf_codebar.class.php | 0 .../_mypdf/01_fpdf_bookmark.class.php | 0 .../_mypdf/02_fpdf_formulaire.class.php | 0 .../html2pdf/_mypdf/03_fpdf_alpha.class.php | 0 .../_mypdf/99_fpdf_protection.class.php | 0 .../{ => lib}/html2pdf/_mypdf/mypdf.class.php | 0 includes/{ => lib}/html2pdf/_read_me.txt | 0 .../{ => lib}/html2pdf/html2pdf.class.php | 0 includes/{ => lib}/html2pdf/langues/ca.txt | 0 includes/{ => lib}/html2pdf/langues/da.txt | 0 includes/{ => lib}/html2pdf/langues/de.txt | 0 includes/{ => lib}/html2pdf/langues/en.txt | 0 includes/{ => lib}/html2pdf/langues/es.txt | 0 includes/{ => lib}/html2pdf/langues/fr.txt | 0 includes/{ => lib}/html2pdf/langues/it.txt | 0 includes/{ => lib}/html2pdf/langues/nl.txt | 0 includes/{ => lib}/html2pdf/langues/pt.txt | 0 includes/{ => lib}/html2pdf/langues/tr.txt | 0 .../{ => lib}/html2pdf/parsingHTML.class.php | 0 .../html2pdf/qrcode/qrcode.class.php | 0 .../{ => lib}/html2pdf/styleHTML.class.php | 0 www/html2pdf.php | 19 +++++++++--------- 133 files changed, 10 insertions(+), 9 deletions(-) rename includes/{ => lib}/html2pdf/_LGPL.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/FAQ.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/acceptpagebreak.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/addfont.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/addlink.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/addpage.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/aliasnbpages.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/cell.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/close.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/error.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/footer.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/fpdf.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/getstringwidth.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/getx.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/gety.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/header.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/image.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/index.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/line.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/link.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/ln.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/multicell.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/output.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/pageno.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/rect.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setauthor.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setautopagebreak.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setcompression.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setcreator.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setdisplaymode.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setdrawcolor.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setfillcolor.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setfont.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setfontsize.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setkeywords.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setleftmargin.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setlinewidth.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setlink.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setmargins.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setrightmargin.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setsubject.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/settextcolor.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/settitle.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/settopmargin.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setx.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/setxy.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/sety.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/text.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/doc/write.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/courier.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/helvetica.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/helveticab.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/helveticabi.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/helveticai.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1250.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1251.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1252.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1253.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1254.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1255.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1257.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp1258.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/cp874.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-1.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-11.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-15.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-16.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-2.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-4.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-5.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-7.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/iso-8859-9.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/koi8-r.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/koi8-u.map (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/makefont/makefont.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/symbol.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/times.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/timesb.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/timesbi.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/timesi.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/font/zapfdingbats.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/fpdf.css (100%) rename includes/{ => lib}/html2pdf/_fpdf/fpdf.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/histo.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/install.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/license.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/20k_c1.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/20k_c2.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/calligra.afm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/calligra.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/calligra.ttf (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/countries.txt (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/index.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/logo.png (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/logo_pb.png (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/makefont.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto1.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto1.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto2.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto2.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto3.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto3.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto4.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto4.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto5.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto5.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto6.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto6.php (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto7.htm (100%) rename includes/{ => lib}/html2pdf/_fpdf/tutorial/tuto7.php (100%) rename includes/{ => lib}/html2pdf/_lisez_moi.txt (100%) rename includes/{ => lib}/html2pdf/_mypdf/00_fpdf_codebar.class.php (100%) rename includes/{ => lib}/html2pdf/_mypdf/01_fpdf_bookmark.class.php (100%) rename includes/{ => lib}/html2pdf/_mypdf/02_fpdf_formulaire.class.php (100%) rename includes/{ => lib}/html2pdf/_mypdf/03_fpdf_alpha.class.php (100%) rename includes/{ => lib}/html2pdf/_mypdf/99_fpdf_protection.class.php (100%) rename includes/{ => lib}/html2pdf/_mypdf/mypdf.class.php (100%) rename includes/{ => lib}/html2pdf/_read_me.txt (100%) rename includes/{ => lib}/html2pdf/html2pdf.class.php (100%) rename includes/{ => lib}/html2pdf/langues/ca.txt (100%) rename includes/{ => lib}/html2pdf/langues/da.txt (100%) rename includes/{ => lib}/html2pdf/langues/de.txt (100%) rename includes/{ => lib}/html2pdf/langues/en.txt (100%) rename includes/{ => lib}/html2pdf/langues/es.txt (100%) rename includes/{ => lib}/html2pdf/langues/fr.txt (100%) rename includes/{ => lib}/html2pdf/langues/it.txt (100%) rename includes/{ => lib}/html2pdf/langues/nl.txt (100%) rename includes/{ => lib}/html2pdf/langues/pt.txt (100%) rename includes/{ => lib}/html2pdf/langues/tr.txt (100%) rename includes/{ => lib}/html2pdf/parsingHTML.class.php (100%) rename includes/{ => lib}/html2pdf/qrcode/qrcode.class.php (100%) rename includes/{ => lib}/html2pdf/styleHTML.class.php (100%) diff --git a/includes/html2pdf/_LGPL.txt b/includes/lib/html2pdf/_LGPL.txt similarity index 100% rename from includes/html2pdf/_LGPL.txt rename to includes/lib/html2pdf/_LGPL.txt diff --git a/includes/html2pdf/_fpdf/FAQ.htm b/includes/lib/html2pdf/_fpdf/FAQ.htm similarity index 100% rename from includes/html2pdf/_fpdf/FAQ.htm rename to includes/lib/html2pdf/_fpdf/FAQ.htm diff --git a/includes/html2pdf/_fpdf/doc/acceptpagebreak.htm b/includes/lib/html2pdf/_fpdf/doc/acceptpagebreak.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/acceptpagebreak.htm rename to includes/lib/html2pdf/_fpdf/doc/acceptpagebreak.htm diff --git a/includes/html2pdf/_fpdf/doc/addfont.htm b/includes/lib/html2pdf/_fpdf/doc/addfont.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/addfont.htm rename to includes/lib/html2pdf/_fpdf/doc/addfont.htm diff --git a/includes/html2pdf/_fpdf/doc/addlink.htm b/includes/lib/html2pdf/_fpdf/doc/addlink.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/addlink.htm rename to includes/lib/html2pdf/_fpdf/doc/addlink.htm diff --git a/includes/html2pdf/_fpdf/doc/addpage.htm b/includes/lib/html2pdf/_fpdf/doc/addpage.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/addpage.htm rename to includes/lib/html2pdf/_fpdf/doc/addpage.htm diff --git a/includes/html2pdf/_fpdf/doc/aliasnbpages.htm b/includes/lib/html2pdf/_fpdf/doc/aliasnbpages.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/aliasnbpages.htm rename to includes/lib/html2pdf/_fpdf/doc/aliasnbpages.htm diff --git a/includes/html2pdf/_fpdf/doc/cell.htm b/includes/lib/html2pdf/_fpdf/doc/cell.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/cell.htm rename to includes/lib/html2pdf/_fpdf/doc/cell.htm diff --git a/includes/html2pdf/_fpdf/doc/close.htm b/includes/lib/html2pdf/_fpdf/doc/close.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/close.htm rename to includes/lib/html2pdf/_fpdf/doc/close.htm diff --git a/includes/html2pdf/_fpdf/doc/error.htm b/includes/lib/html2pdf/_fpdf/doc/error.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/error.htm rename to includes/lib/html2pdf/_fpdf/doc/error.htm diff --git a/includes/html2pdf/_fpdf/doc/footer.htm b/includes/lib/html2pdf/_fpdf/doc/footer.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/footer.htm rename to includes/lib/html2pdf/_fpdf/doc/footer.htm diff --git a/includes/html2pdf/_fpdf/doc/fpdf.htm b/includes/lib/html2pdf/_fpdf/doc/fpdf.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/fpdf.htm rename to includes/lib/html2pdf/_fpdf/doc/fpdf.htm diff --git a/includes/html2pdf/_fpdf/doc/getstringwidth.htm b/includes/lib/html2pdf/_fpdf/doc/getstringwidth.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/getstringwidth.htm rename to includes/lib/html2pdf/_fpdf/doc/getstringwidth.htm diff --git a/includes/html2pdf/_fpdf/doc/getx.htm b/includes/lib/html2pdf/_fpdf/doc/getx.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/getx.htm rename to includes/lib/html2pdf/_fpdf/doc/getx.htm diff --git a/includes/html2pdf/_fpdf/doc/gety.htm b/includes/lib/html2pdf/_fpdf/doc/gety.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/gety.htm rename to includes/lib/html2pdf/_fpdf/doc/gety.htm diff --git a/includes/html2pdf/_fpdf/doc/header.htm b/includes/lib/html2pdf/_fpdf/doc/header.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/header.htm rename to includes/lib/html2pdf/_fpdf/doc/header.htm diff --git a/includes/html2pdf/_fpdf/doc/image.htm b/includes/lib/html2pdf/_fpdf/doc/image.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/image.htm rename to includes/lib/html2pdf/_fpdf/doc/image.htm diff --git a/includes/html2pdf/_fpdf/doc/index.htm b/includes/lib/html2pdf/_fpdf/doc/index.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/index.htm rename to includes/lib/html2pdf/_fpdf/doc/index.htm diff --git a/includes/html2pdf/_fpdf/doc/line.htm b/includes/lib/html2pdf/_fpdf/doc/line.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/line.htm rename to includes/lib/html2pdf/_fpdf/doc/line.htm diff --git a/includes/html2pdf/_fpdf/doc/link.htm b/includes/lib/html2pdf/_fpdf/doc/link.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/link.htm rename to includes/lib/html2pdf/_fpdf/doc/link.htm diff --git a/includes/html2pdf/_fpdf/doc/ln.htm b/includes/lib/html2pdf/_fpdf/doc/ln.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/ln.htm rename to includes/lib/html2pdf/_fpdf/doc/ln.htm diff --git a/includes/html2pdf/_fpdf/doc/multicell.htm b/includes/lib/html2pdf/_fpdf/doc/multicell.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/multicell.htm rename to includes/lib/html2pdf/_fpdf/doc/multicell.htm diff --git a/includes/html2pdf/_fpdf/doc/output.htm b/includes/lib/html2pdf/_fpdf/doc/output.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/output.htm rename to includes/lib/html2pdf/_fpdf/doc/output.htm diff --git a/includes/html2pdf/_fpdf/doc/pageno.htm b/includes/lib/html2pdf/_fpdf/doc/pageno.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/pageno.htm rename to includes/lib/html2pdf/_fpdf/doc/pageno.htm diff --git a/includes/html2pdf/_fpdf/doc/rect.htm b/includes/lib/html2pdf/_fpdf/doc/rect.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/rect.htm rename to includes/lib/html2pdf/_fpdf/doc/rect.htm diff --git a/includes/html2pdf/_fpdf/doc/setauthor.htm b/includes/lib/html2pdf/_fpdf/doc/setauthor.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setauthor.htm rename to includes/lib/html2pdf/_fpdf/doc/setauthor.htm diff --git a/includes/html2pdf/_fpdf/doc/setautopagebreak.htm b/includes/lib/html2pdf/_fpdf/doc/setautopagebreak.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setautopagebreak.htm rename to includes/lib/html2pdf/_fpdf/doc/setautopagebreak.htm diff --git a/includes/html2pdf/_fpdf/doc/setcompression.htm b/includes/lib/html2pdf/_fpdf/doc/setcompression.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setcompression.htm rename to includes/lib/html2pdf/_fpdf/doc/setcompression.htm diff --git a/includes/html2pdf/_fpdf/doc/setcreator.htm b/includes/lib/html2pdf/_fpdf/doc/setcreator.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setcreator.htm rename to includes/lib/html2pdf/_fpdf/doc/setcreator.htm diff --git a/includes/html2pdf/_fpdf/doc/setdisplaymode.htm b/includes/lib/html2pdf/_fpdf/doc/setdisplaymode.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setdisplaymode.htm rename to includes/lib/html2pdf/_fpdf/doc/setdisplaymode.htm diff --git a/includes/html2pdf/_fpdf/doc/setdrawcolor.htm b/includes/lib/html2pdf/_fpdf/doc/setdrawcolor.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setdrawcolor.htm rename to includes/lib/html2pdf/_fpdf/doc/setdrawcolor.htm diff --git a/includes/html2pdf/_fpdf/doc/setfillcolor.htm b/includes/lib/html2pdf/_fpdf/doc/setfillcolor.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setfillcolor.htm rename to includes/lib/html2pdf/_fpdf/doc/setfillcolor.htm diff --git a/includes/html2pdf/_fpdf/doc/setfont.htm b/includes/lib/html2pdf/_fpdf/doc/setfont.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setfont.htm rename to includes/lib/html2pdf/_fpdf/doc/setfont.htm diff --git a/includes/html2pdf/_fpdf/doc/setfontsize.htm b/includes/lib/html2pdf/_fpdf/doc/setfontsize.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setfontsize.htm rename to includes/lib/html2pdf/_fpdf/doc/setfontsize.htm diff --git a/includes/html2pdf/_fpdf/doc/setkeywords.htm b/includes/lib/html2pdf/_fpdf/doc/setkeywords.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setkeywords.htm rename to includes/lib/html2pdf/_fpdf/doc/setkeywords.htm diff --git a/includes/html2pdf/_fpdf/doc/setleftmargin.htm b/includes/lib/html2pdf/_fpdf/doc/setleftmargin.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setleftmargin.htm rename to includes/lib/html2pdf/_fpdf/doc/setleftmargin.htm diff --git a/includes/html2pdf/_fpdf/doc/setlinewidth.htm b/includes/lib/html2pdf/_fpdf/doc/setlinewidth.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setlinewidth.htm rename to includes/lib/html2pdf/_fpdf/doc/setlinewidth.htm diff --git a/includes/html2pdf/_fpdf/doc/setlink.htm b/includes/lib/html2pdf/_fpdf/doc/setlink.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setlink.htm rename to includes/lib/html2pdf/_fpdf/doc/setlink.htm diff --git a/includes/html2pdf/_fpdf/doc/setmargins.htm b/includes/lib/html2pdf/_fpdf/doc/setmargins.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setmargins.htm rename to includes/lib/html2pdf/_fpdf/doc/setmargins.htm diff --git a/includes/html2pdf/_fpdf/doc/setrightmargin.htm b/includes/lib/html2pdf/_fpdf/doc/setrightmargin.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setrightmargin.htm rename to includes/lib/html2pdf/_fpdf/doc/setrightmargin.htm diff --git a/includes/html2pdf/_fpdf/doc/setsubject.htm b/includes/lib/html2pdf/_fpdf/doc/setsubject.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setsubject.htm rename to includes/lib/html2pdf/_fpdf/doc/setsubject.htm diff --git a/includes/html2pdf/_fpdf/doc/settextcolor.htm b/includes/lib/html2pdf/_fpdf/doc/settextcolor.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/settextcolor.htm rename to includes/lib/html2pdf/_fpdf/doc/settextcolor.htm diff --git a/includes/html2pdf/_fpdf/doc/settitle.htm b/includes/lib/html2pdf/_fpdf/doc/settitle.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/settitle.htm rename to includes/lib/html2pdf/_fpdf/doc/settitle.htm diff --git a/includes/html2pdf/_fpdf/doc/settopmargin.htm b/includes/lib/html2pdf/_fpdf/doc/settopmargin.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/settopmargin.htm rename to includes/lib/html2pdf/_fpdf/doc/settopmargin.htm diff --git a/includes/html2pdf/_fpdf/doc/setx.htm b/includes/lib/html2pdf/_fpdf/doc/setx.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setx.htm rename to includes/lib/html2pdf/_fpdf/doc/setx.htm diff --git a/includes/html2pdf/_fpdf/doc/setxy.htm b/includes/lib/html2pdf/_fpdf/doc/setxy.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/setxy.htm rename to includes/lib/html2pdf/_fpdf/doc/setxy.htm diff --git a/includes/html2pdf/_fpdf/doc/sety.htm b/includes/lib/html2pdf/_fpdf/doc/sety.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/sety.htm rename to includes/lib/html2pdf/_fpdf/doc/sety.htm diff --git a/includes/html2pdf/_fpdf/doc/text.htm b/includes/lib/html2pdf/_fpdf/doc/text.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/text.htm rename to includes/lib/html2pdf/_fpdf/doc/text.htm diff --git a/includes/html2pdf/_fpdf/doc/write.htm b/includes/lib/html2pdf/_fpdf/doc/write.htm similarity index 100% rename from includes/html2pdf/_fpdf/doc/write.htm rename to includes/lib/html2pdf/_fpdf/doc/write.htm diff --git a/includes/html2pdf/_fpdf/font/courier.php b/includes/lib/html2pdf/_fpdf/font/courier.php similarity index 100% rename from includes/html2pdf/_fpdf/font/courier.php rename to includes/lib/html2pdf/_fpdf/font/courier.php diff --git a/includes/html2pdf/_fpdf/font/helvetica.php b/includes/lib/html2pdf/_fpdf/font/helvetica.php similarity index 100% rename from includes/html2pdf/_fpdf/font/helvetica.php rename to includes/lib/html2pdf/_fpdf/font/helvetica.php diff --git a/includes/html2pdf/_fpdf/font/helveticab.php b/includes/lib/html2pdf/_fpdf/font/helveticab.php similarity index 100% rename from includes/html2pdf/_fpdf/font/helveticab.php rename to includes/lib/html2pdf/_fpdf/font/helveticab.php diff --git a/includes/html2pdf/_fpdf/font/helveticabi.php b/includes/lib/html2pdf/_fpdf/font/helveticabi.php similarity index 100% rename from includes/html2pdf/_fpdf/font/helveticabi.php rename to includes/lib/html2pdf/_fpdf/font/helveticabi.php diff --git a/includes/html2pdf/_fpdf/font/helveticai.php b/includes/lib/html2pdf/_fpdf/font/helveticai.php similarity index 100% rename from includes/html2pdf/_fpdf/font/helveticai.php rename to includes/lib/html2pdf/_fpdf/font/helveticai.php diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1250.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1250.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1250.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1250.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1251.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1251.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1251.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1251.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1252.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1252.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1252.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1252.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1253.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1253.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1253.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1253.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1254.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1254.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1254.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1254.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1255.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1255.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1255.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1255.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1257.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1257.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1257.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1257.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp1258.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp1258.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp1258.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp1258.map diff --git a/includes/html2pdf/_fpdf/font/makefont/cp874.map b/includes/lib/html2pdf/_fpdf/font/makefont/cp874.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/cp874.map rename to includes/lib/html2pdf/_fpdf/font/makefont/cp874.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-1.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-1.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-1.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-1.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-11.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-11.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-11.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-11.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-15.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-15.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-15.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-15.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-16.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-16.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-16.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-16.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-2.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-2.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-2.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-2.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-4.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-4.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-4.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-4.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-5.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-5.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-5.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-5.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-7.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-7.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-7.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-7.map diff --git a/includes/html2pdf/_fpdf/font/makefont/iso-8859-9.map b/includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-9.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/iso-8859-9.map rename to includes/lib/html2pdf/_fpdf/font/makefont/iso-8859-9.map diff --git a/includes/html2pdf/_fpdf/font/makefont/koi8-r.map b/includes/lib/html2pdf/_fpdf/font/makefont/koi8-r.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/koi8-r.map rename to includes/lib/html2pdf/_fpdf/font/makefont/koi8-r.map diff --git a/includes/html2pdf/_fpdf/font/makefont/koi8-u.map b/includes/lib/html2pdf/_fpdf/font/makefont/koi8-u.map similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/koi8-u.map rename to includes/lib/html2pdf/_fpdf/font/makefont/koi8-u.map diff --git a/includes/html2pdf/_fpdf/font/makefont/makefont.php b/includes/lib/html2pdf/_fpdf/font/makefont/makefont.php similarity index 100% rename from includes/html2pdf/_fpdf/font/makefont/makefont.php rename to includes/lib/html2pdf/_fpdf/font/makefont/makefont.php diff --git a/includes/html2pdf/_fpdf/font/symbol.php b/includes/lib/html2pdf/_fpdf/font/symbol.php similarity index 100% rename from includes/html2pdf/_fpdf/font/symbol.php rename to includes/lib/html2pdf/_fpdf/font/symbol.php diff --git a/includes/html2pdf/_fpdf/font/times.php b/includes/lib/html2pdf/_fpdf/font/times.php similarity index 100% rename from includes/html2pdf/_fpdf/font/times.php rename to includes/lib/html2pdf/_fpdf/font/times.php diff --git a/includes/html2pdf/_fpdf/font/timesb.php b/includes/lib/html2pdf/_fpdf/font/timesb.php similarity index 100% rename from includes/html2pdf/_fpdf/font/timesb.php rename to includes/lib/html2pdf/_fpdf/font/timesb.php diff --git a/includes/html2pdf/_fpdf/font/timesbi.php b/includes/lib/html2pdf/_fpdf/font/timesbi.php similarity index 100% rename from includes/html2pdf/_fpdf/font/timesbi.php rename to includes/lib/html2pdf/_fpdf/font/timesbi.php diff --git a/includes/html2pdf/_fpdf/font/timesi.php b/includes/lib/html2pdf/_fpdf/font/timesi.php similarity index 100% rename from includes/html2pdf/_fpdf/font/timesi.php rename to includes/lib/html2pdf/_fpdf/font/timesi.php diff --git a/includes/html2pdf/_fpdf/font/zapfdingbats.php b/includes/lib/html2pdf/_fpdf/font/zapfdingbats.php similarity index 100% rename from includes/html2pdf/_fpdf/font/zapfdingbats.php rename to includes/lib/html2pdf/_fpdf/font/zapfdingbats.php diff --git a/includes/html2pdf/_fpdf/fpdf.css b/includes/lib/html2pdf/_fpdf/fpdf.css similarity index 100% rename from includes/html2pdf/_fpdf/fpdf.css rename to includes/lib/html2pdf/_fpdf/fpdf.css diff --git a/includes/html2pdf/_fpdf/fpdf.php b/includes/lib/html2pdf/_fpdf/fpdf.php similarity index 100% rename from includes/html2pdf/_fpdf/fpdf.php rename to includes/lib/html2pdf/_fpdf/fpdf.php diff --git a/includes/html2pdf/_fpdf/histo.htm b/includes/lib/html2pdf/_fpdf/histo.htm similarity index 100% rename from includes/html2pdf/_fpdf/histo.htm rename to includes/lib/html2pdf/_fpdf/histo.htm diff --git a/includes/html2pdf/_fpdf/install.txt b/includes/lib/html2pdf/_fpdf/install.txt similarity index 100% rename from includes/html2pdf/_fpdf/install.txt rename to includes/lib/html2pdf/_fpdf/install.txt diff --git a/includes/html2pdf/_fpdf/license.txt b/includes/lib/html2pdf/_fpdf/license.txt similarity index 100% rename from includes/html2pdf/_fpdf/license.txt rename to includes/lib/html2pdf/_fpdf/license.txt diff --git a/includes/html2pdf/_fpdf/tutorial/20k_c1.txt b/includes/lib/html2pdf/_fpdf/tutorial/20k_c1.txt similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/20k_c1.txt rename to includes/lib/html2pdf/_fpdf/tutorial/20k_c1.txt diff --git a/includes/html2pdf/_fpdf/tutorial/20k_c2.txt b/includes/lib/html2pdf/_fpdf/tutorial/20k_c2.txt similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/20k_c2.txt rename to includes/lib/html2pdf/_fpdf/tutorial/20k_c2.txt diff --git a/includes/html2pdf/_fpdf/tutorial/calligra.afm b/includes/lib/html2pdf/_fpdf/tutorial/calligra.afm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/calligra.afm rename to includes/lib/html2pdf/_fpdf/tutorial/calligra.afm diff --git a/includes/html2pdf/_fpdf/tutorial/calligra.php b/includes/lib/html2pdf/_fpdf/tutorial/calligra.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/calligra.php rename to includes/lib/html2pdf/_fpdf/tutorial/calligra.php diff --git a/includes/html2pdf/_fpdf/tutorial/calligra.ttf b/includes/lib/html2pdf/_fpdf/tutorial/calligra.ttf similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/calligra.ttf rename to includes/lib/html2pdf/_fpdf/tutorial/calligra.ttf diff --git a/includes/html2pdf/_fpdf/tutorial/countries.txt b/includes/lib/html2pdf/_fpdf/tutorial/countries.txt similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/countries.txt rename to includes/lib/html2pdf/_fpdf/tutorial/countries.txt diff --git a/includes/html2pdf/_fpdf/tutorial/index.htm b/includes/lib/html2pdf/_fpdf/tutorial/index.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/index.htm rename to includes/lib/html2pdf/_fpdf/tutorial/index.htm diff --git a/includes/html2pdf/_fpdf/tutorial/logo.png b/includes/lib/html2pdf/_fpdf/tutorial/logo.png similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/logo.png rename to includes/lib/html2pdf/_fpdf/tutorial/logo.png diff --git a/includes/html2pdf/_fpdf/tutorial/logo_pb.png b/includes/lib/html2pdf/_fpdf/tutorial/logo_pb.png similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/logo_pb.png rename to includes/lib/html2pdf/_fpdf/tutorial/logo_pb.png diff --git a/includes/html2pdf/_fpdf/tutorial/makefont.php b/includes/lib/html2pdf/_fpdf/tutorial/makefont.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/makefont.php rename to includes/lib/html2pdf/_fpdf/tutorial/makefont.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto1.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto1.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto1.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto1.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto1.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto1.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto1.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto1.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto2.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto2.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto2.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto2.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto2.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto2.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto2.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto2.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto3.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto3.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto3.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto3.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto3.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto3.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto3.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto3.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto4.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto4.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto4.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto4.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto4.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto4.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto4.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto4.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto5.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto5.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto5.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto5.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto5.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto5.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto5.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto5.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto6.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto6.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto6.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto6.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto6.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto6.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto6.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto6.php diff --git a/includes/html2pdf/_fpdf/tutorial/tuto7.htm b/includes/lib/html2pdf/_fpdf/tutorial/tuto7.htm similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto7.htm rename to includes/lib/html2pdf/_fpdf/tutorial/tuto7.htm diff --git a/includes/html2pdf/_fpdf/tutorial/tuto7.php b/includes/lib/html2pdf/_fpdf/tutorial/tuto7.php similarity index 100% rename from includes/html2pdf/_fpdf/tutorial/tuto7.php rename to includes/lib/html2pdf/_fpdf/tutorial/tuto7.php diff --git a/includes/html2pdf/_lisez_moi.txt b/includes/lib/html2pdf/_lisez_moi.txt similarity index 100% rename from includes/html2pdf/_lisez_moi.txt rename to includes/lib/html2pdf/_lisez_moi.txt diff --git a/includes/html2pdf/_mypdf/00_fpdf_codebar.class.php b/includes/lib/html2pdf/_mypdf/00_fpdf_codebar.class.php similarity index 100% rename from includes/html2pdf/_mypdf/00_fpdf_codebar.class.php rename to includes/lib/html2pdf/_mypdf/00_fpdf_codebar.class.php diff --git a/includes/html2pdf/_mypdf/01_fpdf_bookmark.class.php b/includes/lib/html2pdf/_mypdf/01_fpdf_bookmark.class.php similarity index 100% rename from includes/html2pdf/_mypdf/01_fpdf_bookmark.class.php rename to includes/lib/html2pdf/_mypdf/01_fpdf_bookmark.class.php diff --git a/includes/html2pdf/_mypdf/02_fpdf_formulaire.class.php b/includes/lib/html2pdf/_mypdf/02_fpdf_formulaire.class.php similarity index 100% rename from includes/html2pdf/_mypdf/02_fpdf_formulaire.class.php rename to includes/lib/html2pdf/_mypdf/02_fpdf_formulaire.class.php diff --git a/includes/html2pdf/_mypdf/03_fpdf_alpha.class.php b/includes/lib/html2pdf/_mypdf/03_fpdf_alpha.class.php similarity index 100% rename from includes/html2pdf/_mypdf/03_fpdf_alpha.class.php rename to includes/lib/html2pdf/_mypdf/03_fpdf_alpha.class.php diff --git a/includes/html2pdf/_mypdf/99_fpdf_protection.class.php b/includes/lib/html2pdf/_mypdf/99_fpdf_protection.class.php similarity index 100% rename from includes/html2pdf/_mypdf/99_fpdf_protection.class.php rename to includes/lib/html2pdf/_mypdf/99_fpdf_protection.class.php diff --git a/includes/html2pdf/_mypdf/mypdf.class.php b/includes/lib/html2pdf/_mypdf/mypdf.class.php similarity index 100% rename from includes/html2pdf/_mypdf/mypdf.class.php rename to includes/lib/html2pdf/_mypdf/mypdf.class.php diff --git a/includes/html2pdf/_read_me.txt b/includes/lib/html2pdf/_read_me.txt similarity index 100% rename from includes/html2pdf/_read_me.txt rename to includes/lib/html2pdf/_read_me.txt diff --git a/includes/html2pdf/html2pdf.class.php b/includes/lib/html2pdf/html2pdf.class.php similarity index 100% rename from includes/html2pdf/html2pdf.class.php rename to includes/lib/html2pdf/html2pdf.class.php diff --git a/includes/html2pdf/langues/ca.txt b/includes/lib/html2pdf/langues/ca.txt similarity index 100% rename from includes/html2pdf/langues/ca.txt rename to includes/lib/html2pdf/langues/ca.txt diff --git a/includes/html2pdf/langues/da.txt b/includes/lib/html2pdf/langues/da.txt similarity index 100% rename from includes/html2pdf/langues/da.txt rename to includes/lib/html2pdf/langues/da.txt diff --git a/includes/html2pdf/langues/de.txt b/includes/lib/html2pdf/langues/de.txt similarity index 100% rename from includes/html2pdf/langues/de.txt rename to includes/lib/html2pdf/langues/de.txt diff --git a/includes/html2pdf/langues/en.txt b/includes/lib/html2pdf/langues/en.txt similarity index 100% rename from includes/html2pdf/langues/en.txt rename to includes/lib/html2pdf/langues/en.txt diff --git a/includes/html2pdf/langues/es.txt b/includes/lib/html2pdf/langues/es.txt similarity index 100% rename from includes/html2pdf/langues/es.txt rename to includes/lib/html2pdf/langues/es.txt diff --git a/includes/html2pdf/langues/fr.txt b/includes/lib/html2pdf/langues/fr.txt similarity index 100% rename from includes/html2pdf/langues/fr.txt rename to includes/lib/html2pdf/langues/fr.txt diff --git a/includes/html2pdf/langues/it.txt b/includes/lib/html2pdf/langues/it.txt similarity index 100% rename from includes/html2pdf/langues/it.txt rename to includes/lib/html2pdf/langues/it.txt diff --git a/includes/html2pdf/langues/nl.txt b/includes/lib/html2pdf/langues/nl.txt similarity index 100% rename from includes/html2pdf/langues/nl.txt rename to includes/lib/html2pdf/langues/nl.txt diff --git a/includes/html2pdf/langues/pt.txt b/includes/lib/html2pdf/langues/pt.txt similarity index 100% rename from includes/html2pdf/langues/pt.txt rename to includes/lib/html2pdf/langues/pt.txt diff --git a/includes/html2pdf/langues/tr.txt b/includes/lib/html2pdf/langues/tr.txt similarity index 100% rename from includes/html2pdf/langues/tr.txt rename to includes/lib/html2pdf/langues/tr.txt diff --git a/includes/html2pdf/parsingHTML.class.php b/includes/lib/html2pdf/parsingHTML.class.php similarity index 100% rename from includes/html2pdf/parsingHTML.class.php rename to includes/lib/html2pdf/parsingHTML.class.php diff --git a/includes/html2pdf/qrcode/qrcode.class.php b/includes/lib/html2pdf/qrcode/qrcode.class.php similarity index 100% rename from includes/html2pdf/qrcode/qrcode.class.php rename to includes/lib/html2pdf/qrcode/qrcode.class.php diff --git a/includes/html2pdf/styleHTML.class.php b/includes/lib/html2pdf/styleHTML.class.php similarity index 100% rename from includes/html2pdf/styleHTML.class.php rename to includes/lib/html2pdf/styleHTML.class.php diff --git a/www/html2pdf.php b/www/html2pdf.php index 1d9edd2bb..d50177fba 100644 --- a/www/html2pdf.php +++ b/www/html2pdf.php @@ -15,13 +15,14 @@ if($nomFic == ''){ }else{ /** Déclation du client Soap auprès du webservice **/ - $client = new SoapClient(null, array( 'trace' => 1, - 'soap_version' => SOAP_1_1, - 'location' => 'http://78.31.45.206/ws/', - 'uri' => 'http://78.31.45.206/', - 'login' => $_SESSION['tabInfo']['login'], - 'password' => $_SESSION['tabInfo']['password'] - )); + $client = new SoapClient(null, array( + 'trace' => 1, + 'soap_version' => SOAP_1_1, + 'location' => 'http://78.31.45.206/ws/', + 'uri' => 'http://78.31.45.206/', + 'login' => $_SESSION['tabInfo']['login'], + 'password' => $_SESSION['tabInfo']['password'] + )); require_once 'surveillance/survliste.php'; $file = PATH_DATA.'/survliste/'.$nomFic; @@ -110,13 +111,13 @@ if($nomFic == ''){ } }else{ /* - * Fermenture la balise page lorsqu'il n'y a aucune annonce + * Fermeture de la balise page lorsqu'il n'y a aucune annonce * afin de générer un fichier pdf vide et non pas une erreur */ $output = ''; } // conversion HTML => PDF - require_once 'html2pdf/html2pdf.class.php'; + require_once './lib/html2pdf/html2pdf.class.php'; $html2pdf = new HTML2PDF('P','A4','fr'); $html2pdf->WriteHTML(utf8_decode($output)); $html2pdf->Output(str_replace('.csv', '.pdf', $nomFic), 'D');