Added unavailable tag name tracking

Author: maxguru

js/admin.js

@@ -98,7 +98,7 @@ jQuery(document).ready(function($) {
 		jQuery.ajax({
 			url: wpcf7_pdf_forms.ajax_url,
 			type: 'POST',
-			data: { 'action': 'wpcf7_pdf_forms_query_tags', 'attachments': attachments, 'all': all, 'nonce': wpcf7_pdf_forms.ajax_nonce },
+			data: { 'action': 'wpcf7_pdf_forms_query_tags', 'attachments': attachments, 'all': all, 'wpcf7-form': wpcf7_form.val(), 'nonce': wpcf7_pdf_forms.ajax_nonce },
 			cache: false,
 			dataType: 'json',
 
@@ -1260,9 +1260,10 @@ jQuery(document).ready(function($) {
 		clearMessages();
 
 		var data = new FormData();
+		data.append("action", 'wpcf7_pdf_forms_get_attachment_info');
 		data.append("post_id", post_id);
 		data.append("file_id", file_id);
-		data.append("action", 'wpcf7_pdf_forms_get_attachment_info');
+		data.append("wpcf7-form", wpcf7_form.val());
 		data.append("nonce", wpcf7_pdf_forms.ajax_nonce);
 
 		// submit request

pdf-forms-for-contact-form-7.php

@@ -1221,6 +1221,7 @@ public function wp_ajax_get_attachment_info()
 					throw new Exception( __( "Nonce mismatch", 'pdf-forms-for-contact-form-7' ) );
 
 				$attachment_id = $_POST[ 'file_id' ];
+				$form = isset( $_POST['wpcf7-form'] ) ? wp_unslash( $_POST['wpcf7-form'] ) : null;
 
 				$filepath = get_attached_file( $attachment_id );
 				if( !$filepath )
@@ -1236,13 +1237,19 @@ public function wp_ajax_get_attachment_info()
 						)
 					);
 
+				$cf7_fields = $this->query_cf7_fields( $form );
+				
+				$unavailableNames = array();
+				foreach( $cf7_fields as $cf7_field )
+					$unavailableNames[] = $cf7_field['name'];
+				
+				$info = $this->get_info( $attachment_id );
+				$info['fields'] = $this->query_pdf_fields( $attachment_id, $unavailableNames );
+				
 				$options = array( );
 				foreach( self::$pdf_options as $option => $default )
 					$options[$option] = $default;
 
-				$info = $this->get_info( $attachment_id );
-				$info['fields'] = $this->query_pdf_fields( $attachment_id );
-				
 				return wp_send_json( array(
 					'success' => true,
 					'attachment_id' => $attachment_id,
@@ -1386,7 +1393,7 @@ private static function escape_tag_value($value)
 		 * Generates CF7 field tag based on field data
 		 * $tagName must already be sanitized
 		 */
-		private static function generate_tag( $field, &$tagName )
+		private static function generate_tag( $field, &$tagName, $unavailableNames = array() )
 		{
 			$type = strval($field['type']);
 
@@ -1494,7 +1501,7 @@ private static function generate_tag( $field, &$tagName )
 					$tagOptions .= 'readonly ';
 			}
 
-			$unavailableNames = array(
+			$reservedNames = array(
 				'm','p','posts','w','cat','withcomments','withoutcomments'
 				,'s','search','exact','sentence','calendar','page','paged'
 				,'more','tb','pb','author','order','orderby','year','monthnum'
@@ -1503,6 +1510,7 @@ private static function generate_tag( $field, &$tagName )
 				,'attachment_id','subpost','subpost_id','preview','robots','taxonomy'
 				,'term','cpage','post_type','embed'
 			);
+			$unavailableNames = array_merge( $unavailableNames, $reservedNames );
 			if( array_search( $tagName, $unavailableNames ) !== FALSE )
 			{
 				$tagName .= '-0000';
@@ -1525,6 +1533,7 @@ public function wp_ajax_query_tags()
 
 				$attachments = isset( $_POST['attachments'] ) ? $_POST['attachments'] : null;
 				$all = isset( $_POST['all'] ) ? $_POST['all'] : null;
+				$form = isset( $_POST['wpcf7-form'] ) ? wp_unslash( $_POST['wpcf7-form'] ) : null;
 
 				if( !isset($attachments) || !is_array($attachments) )
 					$attachments = array();
@@ -1542,8 +1551,13 @@ public function wp_ajax_query_tags()
 					$tags = __( "This PDF file does not appear to contain a PDF form.  See https://acrobat.adobe.com/us/en/acrobat/how-to/create-fillable-pdf-forms-creator.html for more information.", 'pdf-forms-for-contact-form-7' );
 				else
 				{
-					$tags = "";
+					$cf7_fields = $this->query_cf7_fields( $form );
+					
+					$unavailableNames = array();
+					foreach( $cf7_fields as $cf7_field )
+						$unavailableNames[] = $cf7_field['name'];
 
+					$tags = "";
 					foreach ( $fields as $attachment_id => $fs )
 						foreach ( $fs as $field )
 						{
@@ -1558,13 +1572,15 @@ public function wp_ajax_query_tags()
 									$tag_flag = "all";
 
 								$tagName = self::wpcf7_field_name_encode( $tag_flag, $name );
-								$generated_tag = self::generate_tag( $field, $tagName );
+								$generated_tag = self::generate_tag( $field, $tagName, $unavailableNames );
 
 								if( $generated_tag === null)
 									continue;
 
 								$tag .= '    ' . $generated_tag;
 								$tags .= $tag . "\n\n";
+								
+								$unavailableNames[] = $tagName;
 							}
 						}
 				}
@@ -1587,7 +1603,7 @@ public function wp_ajax_query_tags()
 		/**
 		 * Helper function used in wp-admin interface
 		 */
-		private function query_pdf_fields( $attachment_id )
+		private function query_pdf_fields( $attachment_id, &$unavailableNames = array() )
 		{
 			$fields = $this->get_fields( $attachment_id );
 			foreach( $fields as $id => &$field )
@@ -1613,10 +1629,11 @@ private function query_pdf_fields( $attachment_id )
 				$slug = sanitize_title( $name );
 				if( preg_match( '/^[a-zA-Z]$/', $slug[0] ) === 0 )
 					$slug = 'f-'.$slug;
-				$tag_hint = self::generate_tag( $field, $slug );
+				$tag_hint = self::generate_tag( $field, $slug, $unavailableNames );
 				$field['id'] = $encoded_name;
 				$field['tag_hint'] = $tag_hint;
 				$field['tag_name'] = $slug;
+				$unavailableNames[] = $slug;
 			}
 
 			return $fields;
@@ -1641,6 +1658,12 @@ public function wp_ajax_preload_data()
 				if ( ! current_user_can( 'wpcf7_edit_contact_form', $post_id ) )
 					throw new Exception( __( "Permission denied", 'pdf-forms-for-contact-form-7' ) );
 
+				$cf7_fields = $this->query_cf7_fields( $form );
+				
+				$unavailableNames = array();
+				foreach( $cf7_fields as $cf7_field )
+					$unavailableNames[] = $cf7_field['name'];
+				
 				$attachments = array();
 				$attachment_ids = array();
 				foreach( $this->post_get_all_pdfs( $post_id ) as $attachment_id => $attachment )
@@ -1650,7 +1673,7 @@ public function wp_ajax_preload_data()
 						$options = $attachment['options'];
 
 					$info = $this->get_info( $attachment_id );
-					$info['fields'] = $this->query_pdf_fields( $attachment_id );
+					$info['fields'] = $this->query_pdf_fields( $attachment_id, $unavailableNames );
 
 					$attachments[] = array(
 						'attachment_id' => $attachment_id,
@@ -1661,8 +1684,6 @@ public function wp_ajax_preload_data()
 					$attachment_ids[] = $attachment_id;
 				}
 
-				$cf7_fields = $this->query_cf7_fields( $form );
-				
 				$mappings = self::get_meta( $post_id, 'mappings' );
 				if( $mappings )
 					$mappings = json_decode( $mappings, true );