From 59b8a078e74669481fd5c98a32ee47a17f748f5b Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sun, 6 Dec 2009 10:45:50 +0000
Subject: [PATCH] PDF refinements

---
 e107_plugins/calendar_menu/admin_config.php | 17 +++++++++++------
 e107_plugins/calendar_menu/ec_pf_page.php   |  8 ++++----
 e107_plugins/pdf/e107pdf.php                |  7 +++++--
 e107_plugins/pdf/pdf.php                    |  8 ++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/e107_plugins/calendar_menu/admin_config.php b/e107_plugins/calendar_menu/admin_config.php
index a6b15f35f..a6d9a30d0 100644
--- a/e107_plugins/calendar_menu/admin_config.php
+++ b/e107_plugins/calendar_menu/admin_config.php
@@ -9,8 +9,8 @@
  * Event calendar plugin - admin functions
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/admin_config.php,v $
- * $Revision: 1.15 $
- * $Date: 2009-11-22 10:11:24 $
+ * $Revision: 1.16 $
+ * $Date: 2009-12-06 10:45:49 $
  * $Author: e107steved $
  */
 
@@ -1026,10 +1026,15 @@ $text .= "
 	<tr>
 		<td class='forumheader3'>".EC_ADLAN_A193."<br /></td>
 		<td class='forumheader3'>
-			<select name='eventpost_printlists' class='tbox'>
-			<option value='0' ".($pref['eventpost_printlists']=='0'?" selected='selected' ":"")." >". EC_ADLAN_A194." </option>
-			<option value='1' ".($pref['eventpost_printlists']=='1'?" selected='selected' ":"")." >".EC_ADLAN_A195."  </option>
-			<option value='2' ".($pref['eventpost_printlists']=='2'?" selected='selected' ":"")." >".EC_ADLAN_A196." </option>
+			<select name='eventpost_printlists' class='tbox'>";
+	$listOpts = array( 0 => EC_ADLAN_A194, 1 => EC_ADLAN_A195);
+	if (e107::isInstalled('pdf')) { $listOpts[2] = EC_ADLAN_A196; }
+	foreach ($listOpts as $v => $t)
+	{
+		$s = $pref['eventpost_printlists'] == $v ? " selected='selected'" : '';
+		$text .= "<option value={$v}{$s}>{$t}</option>\n";
+	}
+	$text .= "
 			</select>
 		</td>
 	</tr>
diff --git a/e107_plugins/calendar_menu/ec_pf_page.php b/e107_plugins/calendar_menu/ec_pf_page.php
index 36ced8c1f..a2f6f6405 100644
--- a/e107_plugins/calendar_menu/ec_pf_page.php
+++ b/e107_plugins/calendar_menu/ec_pf_page.php
@@ -9,8 +9,8 @@
  *	Event calendar - generate lists
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ec_pf_page.php,v $
- * $Revision: 1.7 $
- * $Date: 2009-11-22 10:11:30 $
+ * $Revision: 1.8 $
+ * $Date: 2009-12-06 10:45:49 $
  * $Author: e107steved $
  */
 /*
@@ -331,9 +331,9 @@ switch($ec_output_type)
 	case 'pdf':
 		//TODO find a way to pass initialisation options etc to PDF driver
 		include_lan(e_PLUGIN.'pdf/languages/'.e_LANGUAGE.'.php');
-		define('FPDF_FONTPATH', 'font/');
+//		define('FPDF_FONTPATH', 'font/');
 		//require the ufpdf class
-		require_once (e_PLUGIN.'pdf/ufpdf.php');
+//		require_once (e_PLUGIN.'pdf/ufpdf.php');
 		//require the e107pdf class
 		require_once (e_PLUGIN.'pdf/e107pdf.php');
 		$pdf = new e107PDF();
diff --git a/e107_plugins/pdf/e107pdf.php b/e107_plugins/pdf/e107pdf.php
index a00876ae3..8c5e4fbae 100644
--- a/e107_plugins/pdf/e107pdf.php
+++ b/e107_plugins/pdf/e107pdf.php
@@ -9,8 +9,8 @@
  * Plugin - PDF generator
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/pdf/e107pdf.php,v $
- * $Revision: 1.9 $
- * $Date: 2009-12-05 12:33:30 $
+ * $Revision: 1.10 $
+ * $Date: 2009-12-06 10:45:50 $
  * $Author: e107steved $
 */
 if (!defined('e107_INIT')) { exit; }
@@ -35,6 +35,9 @@ It can be downloaded from: http://sourceforge.net/projects/tcpdf/
 */
 
 
+require_once(e_PLUGIN.'pdf/tcpdf.php');		//require the ufpdf class
+include_lan(e_PLUGIN.'pdf/languages/'.e_LANGUAGE.'_admin_pdf.php');
+
 
 //extend tcpdf class from package with custom functions
 class e107PDF extends TCPDF
diff --git a/e107_plugins/pdf/pdf.php b/e107_plugins/pdf/pdf.php
index e512859ef..43b105b88 100644
--- a/e107_plugins/pdf/pdf.php
+++ b/e107_plugins/pdf/pdf.php
@@ -9,8 +9,8 @@
  * Plugin - PDF Generator
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/pdf/pdf.php,v $
- * $Revision: 1.5 $
- * $Date: 2009-12-05 12:33:30 $
+ * $Revision: 1.6 $
+ * $Date: 2009-12-06 10:45:50 $
  * $Author: e107steved $
  *
 */
@@ -22,9 +22,9 @@ $qs = explode('.', e_QUERY,2);
 $source = $qs[0];
 $parms = varset($qs[1],'');
 
-include_lan(e_PLUGIN.'pdf/languages/'.e_LANGUAGE.'_admin_pdf.php');
+//include_lan(e_PLUGIN.'pdf/languages/'.e_LANGUAGE.'_admin_pdf.php');
 
-require_once(e_PLUGIN.'pdf/tcpdf.php');		//require the ufpdf class
+//require_once(e_PLUGIN.'pdf/tcpdf.php');		//require the ufpdf class
 require_once(e_PLUGIN.'pdf/e107pdf.php');	//require the e107pdf class
 $pdf = new e107PDF();