Push new changes

README.txt

@@ -4,7 +4,7 @@ Donate link: http://www.formidablepropdfextended.com
 Tags: formidable, pro, pdf, extended, automation, attachment
 Requires at least: 3.6
 Tested up to: 3.6.1
-Stable tag: 1.2.1
+Stable tag: 1.3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -79,6 +79,15 @@ All FAQs can be [viewed on the Formidable Pro PDF Extended website](http://formi
 
 == Changelog ==
 
+= 1.3.0 =
+* Changed $form_data array keys to use the unique field key instead of the field ID. This means if you are importing and exporting forms across multiple website your PDF template will function without any additional changes. 
+
+Note: This release isn't backwards compatible with custom PDF templates.
+
+= 1.2.2 = 
+* Fix multi PDF dropdown view cutting off
+* Fix mPDF UTF-8 error
+
 = 1.2.1 =
 * Added auto 'print' prompt feature when PDF opens. Create a link to the PDF and add &print=1 to the URL. Doesn't work with security features enabled.
 * Fixed initilisation notice link so the settings page shows correctly. Previously blank.

css/admin.css

@@ -87,4 +87,8 @@ padding-bottom: 1.5em;
 
 #fppdfextended-setting .icon32 {
 display: none;	
+}
+
+#form_entries_page .widefat td, #form_entries_page .widefat th {
+	overflow: visible;
 }

pdf-entry-detail.php

@@ -67,9 +67,8 @@ public static function show_entry($atts){
 
 		}
 
-        foreach($fields as $f){
+        foreach($fields as $f) {
 
-
 			$fname = $f->name;        
 
 			if($hidden === true && $f->type == 'html')
@@ -97,7 +96,7 @@ public static function show_entry($atts){
 				}
 				elseif($type == 'array')
 				{
-					$array[$f->id] = $f->description;
+					$array[$f->field_key] = $f->description;
 				}								
 			}
 
@@ -140,9 +139,10 @@ public static function show_entry($atts){
 						{
 							if (preg_match('/<img src="(.*?)" alt="(.*?)" \/>/i', $val, $matches))
 							{	
-								$array['signature'][$f->id]['img'] = $val;							
-								$array['signature'][$f->id]['url'] = $matches[1];
-								$array['signature'][$f->id]['path'] = str_replace(home_url(). '/', ABSPATH, $matches[1]);							
+
+								$array['signature'][$f->field_key]['img'] = $val;							
+								$array['signature'][$f->field_key]['url'] = $matches[1];
+								$array['signature'][$f->field_key]['path'] = str_replace(home_url(). '/', ABSPATH, $matches[1]);															
 							}
 
 							continue;
@@ -167,16 +167,16 @@ public static function show_entry($atts){
 
 				if($type == 'array')				 
 				{
-					$fname = $f->name;   
-					
-					$array['field'][$f->id] = array(
+					$fname = $f->name;  
+
+					$array['field'][$f->field_key] = array(
 						'title' => $fname,
 						'value' => $val,
 						'label' => $new_val,
-						'string' => implode(', ', $new_val),						
-					);
+						'string' => implode(', ', $new_val),
+					);						
 
-					$array['field'][$f->id . '.' . $fname] = array(
+					$array['field'][$f->field_key . '.' . $fname] = array(
 						'title' => $fname,
 						'value' => $val,
 						'label' => $new_val,
@@ -210,7 +210,8 @@ public static function show_entry($atts){
 				if($type == 'array')
 				{
 					$array['field'][$f->id]                = self::get_table_data($f, $table_html, $prev_val);
-					$array['field'][$f->id . '.' . $fname] = $array['field'][$f->id];
+					$array['field'][$f->field_key . '.' . $fname] = $array['field'][$f->id];
+					$array['field'][$f->field_key] = $array['field'][$f->id];
 				}
 				else
 				{
@@ -225,8 +226,8 @@ public static function show_entry($atts){
 			{
 				if($type == 'array')				 
 				{			
-					$array['field'][$f->id] = $val;
-					$array['field'][$f->id . '.' . $fname] = $val;
+					$array['field'][$f->field_key . '.' . $fname] = $val;
+					$array['field'][$f->field_key] = $val;
 				}
 				else
 				{
@@ -272,15 +273,16 @@ public static function show_entry($atts){
 			}
 			elseif($type == 'array' && $f->type != 'checkbox' && $f->type != 'select' && $f->type != 'radio' && $f->type != 'table' && $f->type != 'image' && $f->type != 'url' && $f->type != 'file')
 			{
-				$array['field'][$f->id] = array(
+
+				$array['field'][$f->field_key . '.' . $fname] = array(
 					'title' => $fname,
 					'value' => $val
-				);
-				
-				$array['field'][$f->id . '.' . $fname] = array(
+				);		
+
+				$array['field'][$f->field_key] = array(
 					'title' => $fname,
 					'value' => $val
-				);				
+				);										
 			}			
 
             unset($fname);

pdf.php

@@ -4,7 +4,7 @@
 Plugin Name: Formidable Pro PDF Extended
 Plugin URI: http://www.formidablepropdfextended.com
 Description: Formidable Pro PDF Extended allows you to save/view/download a PDF from the front- and back-end, and automate PDF creation on form submission. Our Business Plus package also allows you to overlay field onto an existing PDF.
-Version: 1.2.1
+Version: 1.3.0
 Author: Blue Liquid Designs
 Author URI: http://www.blueliquiddesigns.com.au
 
@@ -33,7 +33,7 @@
 	/*
 	* Define our constants
 	*/
-	if(!defined('FP_PDF_EXTENDED_VERSION')) { define('FP_PDF_EXTENDED_VERSION', '1.2.1'); }
+	if(!defined('FP_PDF_EXTENDED_VERSION')) { define('FP_PDF_EXTENDED_VERSION', '1.3.0'); }
 	if(!defined('FP_PDF_EXTENDED_SUPPORTED_VERSION')) { define('FP_PDF_EXTENDED_SUPPORTED_VERSION', '1.07.01'); }
 	if(!defined('FP_PDF_EXTENDED_WP_SUPPORTED_VERSION')) { define('FP_PDF_EXTENDED_WP_SUPPORTED_VERSION', '3.6'); }