- FPDF Version 1.81

- FPDI Version 2.2.0
- FpdiProtection 2

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7352 0d5edaf7-2b12-4e95-93f4-047927463d4b

8 files changed, 20 insertions, 19 deletions

diff --git a/views/admin/musterwiderruf.pdf.phtml b/views/admin/musterwiderruf.pdf.phtml
index 115a6bc..9eac0f3 100644
--- a/views/admin/musterwiderruf.pdf.phtml
+++ b/views/admin/musterwiderruf.pdf.phtml
@@ -3,9 +3,9 @@
 	/**

 	 * Template für die PDF Rechnung

 	 */

-

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php'; 

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

     	

 	// Positionierung der Zieladress

diff --git a/views/admin/widerrufsbelehrung.phtml b/views/admin/widerrufsbelehrung.phtml
index 01b9f23..66a3c3c 100644
--- a/views/admin/widerrufsbelehrung.phtml
+++ b/views/admin/widerrufsbelehrung.phtml
@@ -31,7 +31,7 @@
 			<?php echo wpsg_drawForm_TextStart(); ?>

 			<?php if (wpsg_isSizedString($this->view['revocationform'])) { ?>

 			

-				<a target="_blank" href="<?php echo WPSG_URL_UPLOADS.'wpsg_revocation/'.$this->get_option('wpsg_revocationform'); ?>"><?php echo $this->view['revocationform']; ?></a>

+				<a target="_blank" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php/?page=wpsg-Admin&subaction=widerrufsbelehrung&download&noheader=1"><?php echo $this->view['revocationform']; ?></a>

 				<a onclick="if (!confirm('<?php echo __('Sind Sie sich sicher, dass Sie das Widerrufsformular löschen möchten?', 'wpsg'); ?>')) return false;" style="float:right;" href="<?php echo WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=widerrufsbelehrung&noheader=1&do=removeWiderrufsformular'; ?>"><?php echo __('Widerrufsformular löschen', 'wpsg'); ?></a>

 			

 			<?php } else { ?>

diff --git a/views/mods/mod_coverletter/coverletter_pdf.phtml b/views/mods/mod_coverletter/coverletter_pdf.phtml
index a7e9040..f81eb5c 100644
--- a/views/mods/mod_coverletter/coverletter_pdf.phtml
+++ b/views/mods/mod_coverletter/coverletter_pdf.phtml
@@ -3,9 +3,9 @@
 	/**

 	 * FPDF Template für die Generierung des Lieferscheins

 	 */

-

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

 	

 	global $absender_left, $absender_top, $adress_left, $adress_top, $dndata_left, $dndata_top;

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 1a5a478..34a4338 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -3,9 +3,9 @@
 	/**

 	 * FPDF Template für die Generierung des Lieferscheins

 	 */

-

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

 	

 	global $absender_left, $absender_top, $adress_left, $adress_top, $dndata_left, $dndata_top;

diff --git a/views/mods/mod_downloadplus/settings_edit.phtml b/views/mods/mod_downloadplus/settings_edit.phtml
index 6e653aa..64fcb8f 100644
--- a/views/mods/mod_downloadplus/settings_edit.phtml
+++ b/views/mods/mod_downloadplus/settings_edit.phtml
@@ -137,7 +137,7 @@
                             </select>

                         </td>

                         <td>

-                            <input type="checkbox" title="<?php echo __('Hier können Sie die Zeile deaktivieren/aktivieren.', 'wpsg'); ?>" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo (($this->view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> />&nbsp

+                            <input type="checkbox" title="<?php echo __('Hier können Sie die Zeile deaktivieren/aktivieren.', 'wpsg'); ?>" value="1" name="text[<?php echo $i; ?>][aktiv]" <?php echo ((@$this->view['arTexte'][$i]['aktiv'] == 1)?'checked="checked"':''); ?> />&nbsp

                         </td>

                     </tr>

                     <tr>

diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml
index 8d4036a..d7a3d81 100644
--- a/views/mods/mod_rechnungen/accounting_pdf.phtml
+++ b/views/mods/mod_rechnungen/accounting_pdf.phtml
@@ -3,9 +3,9 @@
 	/**

 	 * Template für die PDF Rechnungskorrektur

 	 */

-

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

   

 	global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top;

diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index 64b3427..d373c38 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -4,8 +4,9 @@
 	 * Template für die PDF Rechnung

 	 */

 	

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';

+	 

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

 	

 	global $absender_left, $absender_top, $adress_left, $adress_top, $rdata_left, $rdata_top;

diff --git a/views/mods/mod_voucherproduct/voucher_pdf.phtml b/views/mods/mod_voucherproduct/voucher_pdf.phtml
index 5727a70..b8831d9 100644
--- a/views/mods/mod_voucherproduct/voucher_pdf.phtml
+++ b/views/mods/mod_voucherproduct/voucher_pdf.phtml
@@ -3,9 +3,9 @@
 	/**

 	 * Template für den PDF Gutschein

 	 */

-

-	require_once WPSG_PATH_LIB.'fpdf/fpdf.php';

-	require_once WPSG_PATH_LIB.'fpdf/fpdi.php';

+	

+	require_once WPSG_PATH_LIB.'FPDF_1.81/fpdf.php';

+	require_once WPSG_PATH_LIB.'FPDI_2.2.0/autoload.php';

 	require_once WPSG_PATH_LIB.'wpsg_fpdf.class.php';

 

 	if ($this->get_option('wpsg_voucherproduct_width') > $this->get_option('wpsg_voucherproduct_height'))