← All changes | admin/class-cf7-grid-layout-admin.php +331 -636 4.12 → 4.5 View file →

		@@ -44,19 +44,9 @@
44	44	* @access private
45	45	* @var string $plugin_name The ID of this plugin.
46	46	*/
47	47	private $plugin_name;
48		-
49	48	/**
50		- * The ID of this plugin.
51		- *
52		- * @since 4.6.0
53		- * @access public
54		- * @var Constant CF7SG_OPTION Options key.
55		- */
56		- const CF7SG_OPTION = 'cf7sg-plugin-version';
57		-
58		- /**
59	49	* The version of this plugin.
60	50	*
61	51	* @since 1.0.0
62	52	* @access private
		@@ -97,9 +87,8 @@
97	87	if (empty($screen) || $this->cf7_post_type() != $screen->post_type){
98	88	return;
99	89	}
100	90	$plugin_dir = plugin_dir_url( __DIR__ );
101		-
102	91	switch( $screen->base ){
103	92	case 'post':
104	93	$page_hook = '';
105	94	if('add' == $screen->action) $page_hook = 'contact_page_wpcf7-new';
		@@ -207,9 +196,8 @@
207	196	}
208	197
209	198	switch( $screen->base ){
210	199	case 'post':
211		- global $post;
212	200	/* register codemirror editor & addons. */
213	201	//codemirror script
214	202	wp_register_script( 'cf7-codemirror-js',
215	203	$plugin_dir . 'assets/codemirror/codemirror.js',
		@@ -229,9 +217,9 @@
229	217	const cssCodeMirror_5_32 = CodeMirror(document.getElementById("cf7-css-codemirror"),cmInitialSettings);
230	218	const jsCodeMirror_5_32 = CodeMirror(document.getElementById("cf7-js-codemirror"),cmInitialSettings);');
231	219	//matchtags.
232	220	wp_enqueue_script( 'codemirror-closetag-js',
233		- $plugin_dir . 'assets/codemirror/addon/edit/closetag.js',
	221	+ $plugin_dir . 'assets/codemirror/edit/closetag.js',
234	222	array('cf7-codemirror-js'), $this->version, true
235	223	);
236	224	//fold code
237	225	wp_enqueue_script( 'codemirror-foldcode-js',
		@@ -365,10 +353,8 @@
365	353	$user_css_theme = ('light'==$user_css_theme ? 'paraiso-light' : 'material-ocean');
366	354	}
367	355	}
368	356	//enqueue the cf7 scripts.
369		- /** @since 4.11.5 force loading of current form for cf7 plugin error handling */
370		- if('auto-draft'!=$post->post_status) WPCF7_ContactForm::get_instance($post);
371	357	wpcf7_admin_enqueue_scripts( 'wpcf7' );
372	358	wp_enqueue_script('jquery-clibboard', $plugin_dir . 'assets/clipboard/clipboard.min.js', array('jquery'),$this->version,true);
373	359	wp_enqueue_script( 'cf7-grid-codemirror-js', $plugin_dir . 'admin/js/cf7-grid-codemirror.js', array( 'jquery', 'jquery-ui-tabs', 'cf7-codemirror-js' ), $this->version, true );
374	360	wp_localize_script(
		@@ -397,11 +383,8 @@
397	383	);
398	384	global $post;
399	385
400	386	wp_enqueue_script( $this->plugin_name, $plugin_dir . 'admin/js/cf7-grid-layout-admin.js', array('cf7-grid-codemirror-js', 'jquery-ui-sortable' ), $this->version, true );
401		- /** @since 4.11.0 abstract out dynamic lists */
402		- do_action('cf7sg_register_dynamic_lists');
403		- $lists = cf7sg_get_dynamic_lists();
404	387	wp_localize_script(
405	388	$this->plugin_name,
406	389	'cf7grid',
407	390	array(
		@@ -407,15 +390,12 @@
407	390	array(
408	391	'preHTML' => apply_filters('cf7sg_pre_cf7_field_html', '<div class="field"><label></label>', $post->post_name),
409	392	'postHTML' => apply_filters('cf7sg_post_cf7_field_html', '<p class="info-tip"></p></div>', $post->post_name),
410	393	'requiredHTML' => apply_filters('cf7sg_required_cf7_field_html', '<em>*</em>', $post->post_name),
411		- 'ui' => apply_filters('cf7sg_grid_ui', true, $post->post_name),
412		- 'dynamicTags' => array_keys($lists)
	394	+ 'ui' => apply_filters('cf7sg_grid_ui', true, $post->post_name)
413	395	)
414	396	);
415	397	wp_enqueue_script( 'cf7sg-dynamic-tag-js', $plugin_dir . 'admin/js/cf7sg-dynamic-tag.js', array('jquery','wpcf7-admin-taggenerator' ), $this->version, true );
416		- wp_enqueue_script( 'cf7sg-dynamic-checkbox-js', $plugin_dir . 'admin/js/cf7sg-dynamic-checkbox.js', array('jquery','wpcf7-admin-taggenerator' ), $this->version, true );
417		- wp_enqueue_script( 'cf7sg-dynamic-select-js', $plugin_dir . 'admin/js/cf7sg-dynamic-select.js', array('jquery','wpcf7-admin-taggenerator' ), $this->version, true );
418	398	wp_enqueue_script( 'cf7-benchmark-tag-js', $plugin_dir . 'admin/js/cf7-benchmark-tag.js', array('jquery','wpcf7-admin-taggenerator' ), $this->version, true );
419	399	/** @since 3.2.0 */
420	400	wp_enqueue_script('cf7sg-mail-tag-js', $plugin_dir.'admin/js/mail-tag-helper.js', array('jquery','jquery-clibboard'));
421	401	wp_localize_script('cf7sg-mail-tag-js','mailTagHelper',
		@@ -426,9 +406,8 @@
426	406	);
427	407	/** @since 3.3.0 enqueue ui-grid helpers js */
428	408	wp_enqueue_script('ui-grid-helpers-js', $plugin_dir.'admin/js/ui-custom-helper.js', array('jquery'));
429	409	do_action('cf7sg_enqueue_admin_editor_scripts');
430		-
431	410	break;
432	411	case 'edit':
433	412	//wp_enqueue_script( $this->plugin_name.'-quick-edit', plugin_dir_url( __FILE__ ) . 'js/cf7-grid-layout-quick-edit.js', false, $this->version, true );
434	413	/** @since 4.4.0 Enabled user script enqueue */
		@@ -559,10 +538,11 @@
559	538	**/
560	539	public function register_dynamic_dropdown_taxonomy(){
561	540	//register the dynamic dropdown taxonomies.
562	541	$dropdowns = get_option('_cf7sg_dynamic_dropdown_taxonomy',array());
	542	+ //debug_msg($dropdowns);
563	543	$created = array();
564		- foreach($dropdowns as $post_id=>$post_lists){
	544	+ foreach($dropdowns as $post_lists){
565	545	foreach($post_lists as $slug=>$taxonomy){
566	546	if(!isset($created[$slug])){
567	547	if(is_array($taxonomy)){
568	548	$this->register_dynamic_dropdown($taxonomy);
		@@ -570,197 +550,16 @@
570	550	}
571	551	}
572	552	}
573	553	}
574		- /** @since 5.0 register dynamic_select list */
575		- do_action('cf7sg_register_dynamic_lists');
576		- // debug_msg('created dynamic select ');
577	554	}
578		- /**
579		- * function to regsiter dyanmic dropdown taxonomies
580		- *
581		- * @since 1.0.0
582		- * @param Object $taxonomy_object std object with parameters $taxonomy_object->slug, $taxonomy_object->singular, $taxonomy_object->plural, $taxonomy_object->hierarchical .
583		- **/
584		- protected function register_dynamic_dropdown($taxonomy_array){
585		- $slug = $taxonomy_array['slug'];
586		- $name = $taxonomy_array['singular'];
587		- $plural = $taxonomy_array['plural'];
588		- $is_hierarchical = $taxonomy_array['hierarchical'];
589	555
590		- $labels = array(
591		- 'name' => $plural,
592		- 'singular_name' => $name,
593		- 'menu_name' => $plural,
594		- 'all_items' => 'All '.$plural,
595		- 'parent_item' => 'Parent '.$name,
596		- 'parent_item_colon' => 'Parent '.$name.':',
597		- 'new_item_name' => 'New '.$name.' Name',
598		- 'add_new_item' => 'Add New '.$name,
599		- 'edit_item' => 'Edit '.$name,
600		- 'update_item' => 'Update '.$name,
601		- 'view_item' => 'View '.$name,
602		- 'separate_items_with_commas' => 'Separate '.$plural.' with commas',
603		- 'add_or_remove_items' => 'Add or remove '.$plural,
604		- 'choose_from_most_used' => 'Choose from the most used',
605		- 'popular_items' => 'Popular '.$plural,
606		- 'search_items' => 'Search '.$plural,
607		- 'not_found' => 'Not Found',
608		- 'no_terms' => 'No '.$plural,
609		- 'items_list' => $plural.' list',
610		- 'items_list_navigation' => $plural.' list navigation',
611		- );
612		- //labels can be modified post registration
613		- $args = array(
614		- 'labels' => $labels,
615		- 'hierarchical' => $is_hierarchical,
616		- 'public' => false,
617		- 'show_ui' => true,
618		- 'show_admin_column' => false,
619		- 'show_in_nav_menus' => false,
620		- 'show_tagcloud' => false,
621		- 'show_in_quick_edit' => false,
622		- 'description' => 'Contact Form 7 dynamic dropdown taxonomy list',
623		- );
624		-
625		- register_taxonomy( $slug, $this->cf7_post_type(), $args );
626		- }
627	556	/**
628		- * CF7 Form saved from backend, check if dynamic lists are used
629		- * Hooked on 'wpcf7_save_contact_form'
630		- * @since 1.0.0
631		- * @param WPCF7_Contact_Form $cf7_form cf7 form object
632		- */
633		- public function save_factory_metas($cf7_form){
634		- $cf7_post_id = $cf7_form->id();
635		- //get the tags used in this form
636		- $tags = $cf7_form->scan_form_tags(); //get your form tags
637		- $dynamic_lists = cf7sg_get_dynamic_lists();
638		- $dynamic_tags = array_keys($dynamic_lists);
639		- $dynamic_fields = array();
640		- $form_classes = array();
641		- foreach($tags as $tag){
642		- if(in_array($tag->basetype, $dynamic_tags)){
643		- $dynamic_fields[$tag->basetype]=$tag;
644		- $form_classes = array_merge($form_classes, $dynamic_lists[$tag->basetype]->get_form_classes($tag, $cf7_post_id));
645		- }
646		- }
647		- if(!empty($form_classes)){
648		- $classes = get_post_meta($cf7_post_id, '_cf7sg_script_classes', true);
649		- if(empty($classes)){
650		- $classes = array();
651		- }
652		- $form_classes = array_diff(array_unique($form_classes), $classes); //any new classes?
653		- if(!empty($form_classes)) {
654		- update_post_meta($cf7_post_id, '_cf7sg_script_classes', array_merge($classes, $form_classes));
655		- }
656		- }
657		- //check for newly created taxonomy lists.
658		- if( isset($_POST['cf72post_dynamic_select_taxonomies']) ){
659		- $created_taxonomies = array();
660		- $taxonomies = json_decode(str_replace('\"','"',$_POST['cf72post_dynamic_select_taxonomies']), true);
661		- if(empty($taxonomies)){
662		- $taxonomies = array();
663		- }
664		- foreach($taxonomies as $taxonomy){
665		- //sanitize fields before saving into the DB.
666		- foreach($taxonomy as $key=>$value){
667		- $key = sanitize_key($key);
668		- $taxonomy[$key] = sanitize_text_field($value);
669		- }
670		- $created_taxonomies[$taxonomy['slug']] = $taxonomy;
671		- }
672		- // debug_msg($created_taxonomies, 'created ');
673		- $post_lists = $saved_lists = $system_list = array();
674		-
675		- $dropdowns = get_option('_cf7sg_dynamic_dropdown_taxonomy',array());
676		- foreach($dropdowns as $id => $lists){
677		- $saved_lists = array_merge($saved_lists, $lists);
678		- }
679		- // debug_msg($dynamic_fields, 'dynamic ');
680		- foreach($dynamic_fields as $tag){
681		- if(isset($tag['values'])){
682		- $slug='';
683		- foreach($tag['values'] as $values){
684		- if(0 == strpos($values, 'slug:') ){
685		- $slug = str_replace('slug:', '', $values);
686		- break;
687		- }
688		- }
689		- if(empty($slug)) continue; //not a taxonomy list.
690		- //is slug newly created?
691		- if(isset($created_taxonomies[$slug])){
692		- //store this taxonomy.
693		- $post_lists[$slug] = $created_taxonomies[$slug];
694		- }else if(isset($saved_lists[$slug])){
695		- //retain previously saved list if we are stil using it.
696		- $post_lists[$slug] = $saved_lists[$slug];
697		- }else{ //system taxonomy.
698		- $system_list[] = $slug;
699		- }
700		- //store the taxonomy slug in the cf7 metas.
701		- //$post_lists[$slug] = null;
702		- }
703		- }
704		- // debug_msg($post_lists,' post lists ');
705		- //list of taxonomy to register.
706		- //unset the old value.
707		- if(isset($dropdowns[$cf7_post_id])) unset($dropdowns[$cf7_post_id]);
708		- //unshift new value to top of array.
709		- $dropdowns[$cf7_post_id] = $post_lists;
710		- update_option('_cf7sg_dynamic_dropdown_taxonomy', $dropdowns);
711		- //list of system taxonomy to register
712		- $system_dropdowns = get_option('_cf7sg_dynamic_dropdown_system_taxonomy',array());
713		- $system_dropdowns[$cf7_post_id] = $system_list;
714		- update_option('_cf7sg_dynamic_dropdown_system_taxonomy', $system_dropdowns);
715		- }
716		- }
717		- /**
718		- * Print hiddend field on cf7 post submit box
719		- * Hooked on 'wpcf7_admin_misc_pub_section'
720		- * @since 1.0.0
721		- * @param string $post_id cf7 form post id .
722		- **/
723		- public function dynamic_select_choices($post_id){
724		- echo '<input id="cf72post-dynamic-select" type="hidden" name="cf72post_dynamic_select_taxonomies" />';
725		- }
726		-
727		- /**
728		- * Hide the cf7 form editor page author metabox by default.
729		- * hooked to 'hidden_meta_boxes'.
730		- *@since 4.6.0
731		- *@param Array $hidden array of hidden metabox ids.
732		- *@param WP_Screen $screen current amdin page screen object.
733		- *@param Boolean $use_defaults wether default settings used.
734		- *@return Array array of hidden metabox ids.
735		- */
736		- public function hide_author_metabox($hidden, $screen, $use_defaults){
737		- if( 'wpcf7_contact_form' != $screen->id ) return $hidden;
738		-
739		- if(in_array('authordiv', $hidden)) return $hidden;
740		-
741		- if($use_defaults) $hidden[] = 'authordiv';
742		- else {
743		- $gs = get_option(self::CF7SG_OPTION, array());
744		-
745		- if(!isset($gs['hide_author'])){
746		- $gs['hide_author']=true; //flag it.
747		- $uo = get_user_option('metaboxhidden_wpcf7_contact_form');
748		- if(false === $uo) $uo = array();
749		- $uo = array_unique( array_merge( $uo + array( 'authordiv' ) ) );
750		- $hidden = array_unique( array_merge( $hidden + array( 'authordiv' ) ) );
751		- update_option(self::CF7SG_OPTION,$gs);
752		- update_user_option( get_current_user_id(), 'metaboxhidden_wpcf7_contact_form', $uo);
753		- }
754		- }
755		- return $hidden;
756		- }
757		- /**
758	557	* Function to add the metabox to the cf7 post edit screen
759	558	* This adds the main editor, hooked on 'add_meta_boxes'
760	559	* @since 1.0.0
761	560	*/
762		- public function edit_page_metabox() {
	561	+ public function main_editor_meta_box() {
763	562	//add_meta_box( string $id, string $title, callable $callback, string $screen, string $context, string $priority, array $callback_args)
764	563	if( post_type_exists( $this->cf7_post_type() ) ) {
765	564	add_meta_box( 'meta-box-main-cf7-editor',
766	565	__cf7sg( 'Edit Contact Form' ),
		@@ -768,51 +567,53 @@
768	567	$this->cf7_post_type(),
769	568	'normal',
770	569	'high'
771	570	);
772		- add_meta_box( 'meta-box-cf7-info',
773		- __cf7sg( 'Information' ),
774		- array($this , 'info_metabox_display'),
775		- $this->cf7_post_type(),
776		- 'side',
777		- 'high'
778		- );
779		- /** @since 1.1.0 add helper metabox */
780		- add_meta_box( 'meta-box-cf7sg-helper',
781		- __( 'Actions & Filters', 'cf7-grid-layout' ),
782		- array($this , 'helper_metabox_display'),
783		- $this->cf7_post_type(),
784		- 'side',
785		- 'default'
786		- );
787		- /** @since 4.6.0 enable page redirect */
788		- add_meta_box(
789		- 'cf7sg-redirect', // Unique ID
790		- 'Redirect on Submission', // Box title
791		- array($this, 'display_rediect_metabox'), // Content callback, must be of type callable
792		- $this->cf7_post_type() // Post type
793		- );
794	571	}
795	572	}
	573	+
796	574	/**
797	575	* Callback function to disolay the main editor meta box
798	576	* @since 1.0.0
799	577	*/
800	578	public function main_editor_metabox_display($post){
801		- $post_id = $post->ID;
802	579	if('auto-draft' !== $post->post_status){
803	580	wpcf7_contact_form($post); //set the post
804	581	}
	582	+ $post_id = $post->ID;
805	583	$cf7_form = wpcf7_get_current_contact_form();
806	584	if ( ! $cf7_form ) {
807	585	$args = apply_filters('cf7sg_new_cf7_form_template_arguments', array());
808	586	$cf7_form = WPCF7_ContactForm::get_template($args);
809	587	}
	588	+
	589	+ // if(empty($post)){
	590	+ // $post_id = -1;
	591	+ // }else{
	592	+ // $post_id = $post->ID;
	593	+ // }
810	594	require_once WPCF7_PLUGIN_DIR . '/admin/includes/editor.php';
811	595	require_once plugin_dir_path( __FILE__ ) . 'partials/cf7-admin-editor-display.php';
812	596	}
813	597
814	598	/**
	599	+ * Function to add the metabox to the cf7 post edit screen
	600	+ * This adds the main editor, hooked on 'add_meta_boxes'
	601	+ * @since 1.0.0
	602	+ */
	603	+ public function info_meta_box() {
	604	+ //add_meta_box( string $id, string $title, callable $callback, string $screen, string $context, string $priority, array $callback_args)
	605	+ if(post_type_exists( $this->cf7_post_type() ) ) {
	606	+ add_meta_box( 'meta-box-cf7-info',
	607	+ __cf7sg( 'Information' ),
	608	+ array($this , 'info_metabox_display'),
	609	+ $this->cf7_post_type(),
	610	+ 'side',
	611	+ 'high'
	612	+ );
	613	+ }
	614	+ }
	615	+ /**
815	616	* Re-introduces the wordpress 'wpcf7_admin_misc_pub_section' for plugins to add their fields for submission
816	617	* Hooked to 'post_submitbox_misc_actions' which fires after post dat/time parameters are printed
817	618	* @since 1.0.0
818	619	* @param WP_Post $post post object being edited/created.
		@@ -829,8 +630,25 @@
829	630	public function info_metabox_display($post){
830	631	require_once plugin_dir_path( __FILE__ ) . 'partials/cf7-info-metabox-display.php';
831	632	}
832	633	/**
	634	+ * Function to add the metabox to the cf7 post edit screen
	635	+ * This adds the helper, hooked on 'add_meta_boxes'
	636	+ * @since 1.1.0
	637	+ */
	638	+ public function helper_meta_box() {
	639	+ //add_meta_box( string $id, string $title, callable $callback, string $screen, string $context, string $priority, array $callback_args).
	640	+ if(post_type_exists( $this->cf7_post_type() ) ) {
	641	+ add_meta_box( 'meta-box-cf7sg-helper',
	642	+ __( 'Actions & Filters', 'cf7-grid-layout' ),
	643	+ array($this , 'helper_metabox_display'),
	644	+ $this->cf7_post_type(),
	645	+ 'side',
	646	+ 'low'
	647	+ );
	648	+ }
	649	+ }
	650	+ /**
833	651	* Callback function to disolay the helper meta box
834	652	* @since 1.0.0
835	653	*/
836	654	public function helper_metabox_display($post){
		@@ -839,24 +657,15 @@
839	657	/**
840	658	* Display the editor panels (wpcf7 / codemirror / grid)
841	659	*
842	660	* @since 1.0.0
843		- * @param WPCF7_Contact_Form $form_post .
	661	+ * @param string $p1 .
	662	+ * @return string $p2 .
844	663	**/
845	664	public function grid_editor_panel($form_post){
846	665	require_once plugin_dir_path( __FILE__ ) . '/partials/cf7-grid-layout-admin-display.php';
847	666	}
848	667	/**
849		- *
850		- *
851		- *@since 4.6.0
852		- *@param string $param text_description
853		- *@return string text_description
854		- */
855		- public function display_rediect_metabox($post){
856		- require_once plugin_dir_path( __FILE__ ) . '/partials/cf7-redirect-metabox-display.php';
857		- }
858		- /**
859	668	* Clean up post meta, delete sgcf7 corresponding view post.
860	669	* Hooked to action 'before_delete_post'.
861	670	*@since 4.3.0
862	671	*@param int $post_id post ID.
		@@ -863,54 +672,13 @@
863	672	*@param WP_Post post object.
864	673	*/
865	674	public function delete_post($post_id){
866	675	if(get_post_type($post_id) != WPCF7_ContactForm::post_type) return;
867		- //remove viewing post.
	676	+ //remove viwing post.
868	677	$preview_id = get_post_meta($post_id, '_cf7sg_form_page',true);
869	678	if(!empty($preview_id)) wp_delete_post($preview_id);
870		- /** @since 4.12.5 delete custom css/js files */
871		- $p = get_post($post_id);
872		- $path = get_stylesheet_directory();
873		- if(realpath("$path/js/{$p->post_name}.js")) unlink( "$path/js/{$p->post_name}.js" );
874		- if(realpath("$path/css/{$p->post_name}.css")) unlink( "$path/css/{$p->post_name}.css" );
875	679	}
876	680	/**
877		- * Bookeeping on trashed posts.
878		- * hooked to 'trashed_post'
879		- *@since 4.12.5
880		- *@param String $post_id
881		- */
882		- public function form_trashed($post_id){
883		- if(get_post_type($post_id) != WPCF7_ContactForm::post_type) return;
884		- $p = get_post($post_id);
885		- $prev = get_post_meta($post_id, '_wp_desired_post_slug', true);
886		- $path = get_stylesheet_directory();
887		- if(realpath("$path/js/{$prev}.js")){ //rename file
888		- rename( "$path/js/{$prev}.js" , "$path/js/{$p->post_name}.js" );
889		- }
890		- if(realpath("$path/css/{$prev}.css")){
891		- rename( "$path/css/{$prev}.css" , "$path/css/{$p->post_name}.css" );
892		- }
893		- }
894		- /**
895		- * Bookeeping on trashed posts.
896		- * hooked to 'trashed_post'
897		- *@since 4.12.5
898		- *@param String $post_id
899		- */
900		- public function form_untrashed($post_id){
901		- if(get_post_type($post_id) != WPCF7_ContactForm::post_type) return;
902		- $p = get_post($post_id);
903		-
904		- $path = get_stylesheet_directory();
905		- if(realpath("$path/js/{$p->post_name}__trashed.js")){ //rename file
906		- rename( "$path/js/{$p->post_name}__trashed.js" , "$path/js/{$p->post_name}.js" );
907		- }
908		- if(realpath("$path/css/{$p->post_name}__trashed.css")){
909		- rename( "$path/css/{$p->post_name}__trashed.css" , "$path/css/{$p->post_name}.css" );
910		- }
911		- }
912		- /**
913	681	* Save cf7 post using ajax
914	682	* Hooked to 'save_post_wpcf7_contact_form'
915	683	* @since 1.0.0
916	684	**/
		@@ -941,14 +709,14 @@
941	709	$args['title'] = isset( $_POST['post_title'] ) ? sanitize_text_field($_POST['post_title'], 'Contact Form', 'save') : null;
942	710	$args['locale'] = isset( $_POST['wpcf7-locale'] ) ? sanitize_text_field($_POST['wpcf7-locale']) : null;
943	711	$args['form'] = '';
944	712	$allowed_tags = wp_kses_allowed_html( 'post' ); //filtered in function below.
945		- /** @since 4.8.1 alllow custom input html*/
	713	+ /** @since 2.10.0 alllow custom input html*/
946	714	$allowed_tags['input']=array( //add additional input html elements
947		- 'type'=>1,'name'=>1,'placeholder'=>1,'value'=>1,'maxlength'=>1,'minlength'=>1, //input fields.
948		- 'spellcheck'=>1,'size'=>1,'readonly'=>1,'pattern'=>1,'list'=>1, //input fields.
	715	+ 'type'=>1,
949	716	'class'=>1,
950	717	'id'=>1,
	718	+ 'value'=>1,
951	719	'data-*'=>1,
952	720	);
953	721	$allowed_tags['script']=array('type'=>1);
954	722	$cf7_key = $post->post_name;
		@@ -963,9 +731,15 @@
963	731	$args['messages'][$key] = sanitize_text_field($value);
964	732	}
965	733	$args['additional_settings'] = isset( $_POST['wpcf7-additional-settings'] ) ? sanitize_textarea_field($_POST['wpcf7-additional-settings']) : '';
966	734
967		-
	735	+ //need to unhook this function so as not to loop infinitely
	736	+ //debug_msg($args, 'saving cf7 posts');
	737	+ remove_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3);
	738	+ $contact_form = wpcf7_save_contact_form( $args );
	739	+ add_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3);
	740	+ //flag as a grid form
	741	+ //update_post_meta($post_id, 'cf7_grid_form', true); removed since v2.3 as not used.
968	742	//save sub-forms if any
969	743	$sub_forms = json_decode(stripslashes($_POST['cf7sg-embeded-forms']));
970	744	if(empty($sub_forms)) $sub_forms = array();
971	745	if(!is_array($sub_forms)) $sub_forms = array($sub_forms);
		@@ -1040,9 +814,13 @@
1040	814	$has_tables = ( 'true' === $_POST['cf7sg-has-tables']) ? true : false;
1041	815	update_post_meta($post_id, '_cf7sg_has_tables', $has_tables);
1042	816	$has_toggles = ( 'true' === $_POST['cf7sg-has-toggles']) ? true : false;
1043	817	update_post_meta($post_id, '_cf7sg_has_toggles', $has_toggles);
1044		-
	818	+ /** @since 3.3.5 track toggles in tabs */
	819	+ // $toggle_in_tabs = json_decode(stripslashes($_POST['cf7sg-toggle-in-tabs']));
	820	+ // if(empty($toggle_in_tabs)) $toggle_in_tabs = array();
	821	+ // if(!is_array($toggle_in_tabs)) $toggle_in_tabs = array($toggle_in_tabs);
	822	+ // update_post_meta($post_id, '_cf7sg_grid_toggle_in_tabs', $toggle_in_tabs);
1045	823	/**
1046	824	* @since 1.2.3 disable cf7sg styling/js for non-cf7sg forms.
1047	825	*/
1048	826	$is_cf7sg = ( 'true' === $_POST['is_cf7sg_form']) ? true : false;
		@@ -1064,15 +842,12 @@
1064	842	update_user_meta(get_current_user_id(),'_cf7sg_js_cm_theme', $_POST['cf7sg_js_codemirror_theme']);
1065	843	}
1066	844	//save js file if used.
1067	845	$path = get_stylesheet_directory();
1068		- if(!empty($_POST['cf7sg_js_file']) || !empty($_POST['cf7sg_prev_js_file'])){
	846	+ if(!empty($_POST['cf7sg_js_file'])){
1069	847	//check if the file name is changed.
1070		- if(!empty($_POST['cf7sg_prev_js_file']) && ($fp = realpath(ABSPATH. $_POST['cf7sg_prev_js_file'])) !== false ){
1071		- $path_match = preg_match('/^'.preg_quote("$path/js/",'/').'[^\s!?.\/#*]+\.js$'.'/', $fp);
1072		- if($path_match && !unlink($fp) ){
1073		- debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_js_file']);
1074		- }
	848	+ if(!empty($_POST['cf7sg_prev_js_file']) && file_exists(ABSPATH. $_POST['cf7sg_prev_js_file'])){
	849	+ if( !unlink(ABSPATH.$_POST['cf7sg_prev_js_file']) ) debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_js_file']);
1075	850	}
1076	851	if( !is_dir("$path/js/") ) mkdir("$path/js/");
1077	852	file_put_contents( "$path/js/{$cf7_key}.js", stripslashes($_POST['cf7sg_js_file']) );
1078	853	}else if( isset($_POST['cf7sg_js_file']) && file_exists("$path/js/{$cf7_key}.js") ) { //delete file.
		@@ -1078,15 +853,12 @@
1078	853	}else if( isset($_POST['cf7sg_js_file']) && file_exists("$path/js/{$cf7_key}.js") ) { //delete file.
1079	854	if( !unlink("$path/js/{$cf7_key}.js") ) debug_msg("CF7SG ADMIN: unable to delete file $path/js/{$cf7_key}.js");
1080	855	}
1081	856	//save css file.
1082		- if(!empty($_POST['cf7sg_css_file']) || !empty($_POST['cf7sg_prev_css_file'])){
	857	+ if(!empty($_POST['cf7sg_css_file'])){
1083	858	//check if the file is changed.
1084		- if(!empty($_POST['cf7sg_prev_css_file']) && ($fp = realpath(ABSPATH.$_POST['cf7sg_prev_css_file'])) !==false ){
1085		- $path_match = preg_match('/^'.preg_quote("$path/css/",'/').'[^\s!?.\/#*]+\.css$'.'/', $fp);
1086		- if($path_match && !unlink($fp) ){
1087		- debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_css_file']);
1088		- }
	859	+ if(!empty($_POST['cf7sg_prev_css_file']) && file_exists(ABSPATH.$_POST['cf7sg_prev_css_file'])){
	860	+ if( !unlink(ABSPATH.$_POST['cf7sg_prev_css_file']) ) debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_css_file']);
1089	861	}
1090	862	if( !is_dir("$path/css/") ) mkdir("$path/css/");
1091	863	file_put_contents( $path."/css/{$cf7_key}.css", stripslashes($_POST['cf7sg_css_file']));
1092	864	}else if( isset($_POST['cf7sg_css_file']) && file_exists("$path/css/{$cf7_key}.css") ) { //delete file.
		@@ -1105,20 +877,8 @@
1105	877	'post_status'=>'draft',
1106	878	'post_type'=>'cf7sg_page',
1107	879	// 'post_name' => sanitize_title( $title ),
1108	880	);
1109		- /** @since 4.6.0 redirect on submit */
1110		- if(isset($_POST['cf7sg_page_redirect'])){
1111		- $redirect_to = absint($_POST['cf7sg_page_redirect']);
1112		- update_post_meta($post->ID, '_cf7sg_page_redirect',$redirect_to);
1113		- if(isset($_POST['cache_cf7sg_submit']) and isset($_POST['cf7sg_cached_time']) and isset($_POST['cf7sg_cached_unit'])){
1114		- $cache = floatval( $_POST['cf7sg_cached_time']);
1115		- if($cache>0){
1116		- $cache=array($cache, absint($_POST['cf7sg_cached_unit']));
1117		- update_post_meta($post->ID, '_cf7sg_cache_redirect_data',$cache);
1118		- }
1119		- }else delete_post_meta($post->ID, '_cf7sg_cache_redirect_data');
1120		- }
1121	881	if(empty($cf7_key)) $prev_page['post_content'] = '[contact-form-7 id="'.$post->ID.'"]';
1122	882	if( !empty($preview_id) ){
1123	883	$prev_page['ID'] = $preview_id;
1124	884	}
		@@ -1125,33 +885,8 @@
1125	885	$preview_id = wp_insert_post($prev_page, true);
1126	886	if(!is_wp_error($preview_id)){
1127	887	update_post_meta($post->ID, '_cf7sg_form_page',$preview_id);
1128	888	}
1129		- //save wpcf7 form
1130		- //need to unhook this function so as not to loop infinitely
1131		- //debug_msg($args, 'saving cf7 posts');
1132		- remove_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3);
1133		- // debug_msg($args['form'],'form ');
1134		- /** @since 4.11.5 filter wp_kses ffrmo cf7 plugin v5.5 */
1135		- add_filter('wpcf7_kses_allowed_html', function($cf7_tags, $context) use ($allowed_tags){
1136		- if('form'==$context) return array_merge($cf7_tags, $allowed_tags);
1137		- return $cf7_tags;
1138		- },1001,2);
1139		- $contact_form = wpcf7_save_contact_form( $args );
1140		- /** @since 4.11.5 cf7 plugin validate form */
1141		- if(function_exists('wpcf7_validate_configuration') &&
1142		- method_exists('WPCF7_ConfigValidator','validate') &&
1143		- method_exists('WPCF7_ConfigValidator','save') ){
1144		- if ( $contact_form and wpcf7_validate_configuration() ) {
1145		- $config_validator = new WPCF7_ConfigValidator( $contact_form );
1146		- $config_validator->validate();
1147		- $config_validator->save();
1148		- }
1149		- }
1150		- add_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3);
1151		-
1152		- /** @since 4.9.2 fire form saving action so as to prevent double save_post hook calls on other plugins */
1153		- do_action('cf7sg_save_post',$post_id, $post, $update);
1154	889	}
1155	890	/**
1156	891	* Print default js template,
1157	892	* Hooked to 'cf7sg_default_custom_js_template'
		@@ -1170,9 +905,9 @@
1170	905	*@param string $form_id form id to duplciate.
1171	906	*/
1172	907	public function duplicate_form_properties($new_form_id, $form_id){
1173	908	//these properties will be preceded with an '_' by the cf7 plugin before being duplicated.
1174		- $properties = array('_cf7sg_sub_forms', '_cf7sg_grid_table_names', '_cf7sg_grid_tabs_names', '_cf7sg_has_tabs', '_cf7sg_has_tables', '_cf7sg_managed_form','_cf7sg_script_classes', '_cf7sg_version', '_cf7sg_grid_toggled_names', '_cf7sg_grid_tabbed_toggles', '_cf7sg_grid_grouped_toggles', '_cf7sg_has_toggles', '_cf7sg_disable_jstags_comments', '_cf7sg_page_redirect', '_cf7sg_cache_redirect_data');
	909	+ $properties = array('_cf7sg_sub_forms', '_cf7sg_grid_table_names', '_cf7sg_grid_tabs_names', '_cf7sg_has_tabs', '_cf7sg_has_tables', '_cf7sg_managed_form','_cf7sg_script_classes', '_cf7sg_version');
1175	910	$properties = apply_filters('cf7sg_duplicate_form_properties', $properties);
1176	911	foreach($properties as $field){
1177	912	$value = get_post_meta($form_id, $field, true);
1178	913	if(!empty($value)) update_post_meta($new_form_id,$field, $value);
		@@ -1181,8 +916,9 @@
1181	916	/**
1182	917	* Duplicate form.
1183	918	*
1184	919	*@since 2.3.0
	920	+ *@param string $param text_description
1185	921	*@return string text_description
1186	922	*/
1187	923	public function duplicate_cf7_form(){
1188	924	global $pagenow;
		@@ -1195,20 +931,8 @@
1195	931	if ( $form = wpcf7_contact_form( $_GET['post'] ) ) {
1196	932	$new_form = $form->copy();
1197	933	$new_form->save();
1198	934	$this->duplicate_form_properties($new_form->id(), $_GET['post']);
1199		- /** @since 4.11 duplicate js/css files */
1200		- $new_key = get_cf7form_key($new_form->id());
1201		- $key = get_cf7form_key($form->id());
1202		- $path = get_stylesheet_directory();
1203		- $js_file = "$path/js/{$key}.js";
1204		- if( file_exists($js_file) ){
1205		- copy($js_file, "$path/js/{$new_key}.js");
1206		- }
1207		- $css_file = "$path/css/{$key}.css";
1208		- if( file_exists($css_file) ){
1209		- copy($css_file, "$path/css/{$new_key}.css");
1210		- }
1211	935	wp_safe_redirect( admin_url( '/post.php?post='.$new_form->id().'&action=edit' ));
1212	936	exit;
1213	937	}
1214	938	}
		@@ -1283,23 +1007,35 @@
1283	1007	* @since 1.0.0
1284	1008	**/
1285	1009	public function cf7_shortcode_tags(){
1286	1010	if ( class_exists( 'WPCF7_TagGenerator' ) ) {
1287		- /** @since 4.10.0 enable extension of dynamic lists */
1288	1011	$tag_generator = WPCF7_TagGenerator::get_instance();
1289	1012	$tag_generator->add(
	1013	+ 'dynamic_select', //tag id
	1014	+ __( 'dynamic-dropdown', 'cf7_2_post' ), //tag button label
	1015	+ array($this,'dynamic_tag_generator') //callback
	1016	+ );
	1017	+ $tag_generator->add(
1290	1018	'benchmark', //tag id
1291	1019	__( 'benchmark', 'cf7_2_post' ), //tag button label
1292	1020	array($this,'benchmark_tag_generator') //callback
1293	1021	);
1294	1022	}
1295		- /** @since 4.10.0 abstract out dynamic lists */
1296		- do_action('cf7sg_register_dynamic_lists');
1297		- $lists = cf7sg_get_dynamic_lists();
1298		- foreach($lists as $l) $l->register_cf7_tag();
1299	1023	}
1300		-
1301	1024	/**
	1025	+ * Dynamic select screen displayt.
	1026	+ *
	1027	+ * This function is called by cf7 plugin, and is registered with a hooked function above
	1028	+ *
	1029	+ * @since 1.0.0
	1030	+ * @param WPCF7_ContactForm $contact_form the cf7 form object
	1031	+ * @param array $args arguments for this form.
	1032	+ */
	1033	+ function dynamic_tag_generator( $contact_form, $args = '' ) {
	1034	+ $args = wp_parse_args( $args, array() );
	1035	+ include( plugin_dir_path( __FILE__ ) . '/partials/cf7-dynamic-tag-display.php');
	1036	+ }
	1037	+ /**
1302	1038	* Benchmark input screen displayt.
1303	1039	*
1304	1040	* This function is called by cf7 plugin, and is registered with a hooked function above
1305	1041	*
		@@ -1311,82 +1047,138 @@
1311	1047	$args = wp_parse_args( $args, array() );
1312	1048	include( plugin_dir_path( __FILE__ ) . '/partials/cf7-benchmark-tag.php');
1313	1049	}
1314	1050	/**
1315		- * Print the dynamic list tag generator form.
1316		- * Hooked on 'cf7sg_display_dynamic_list_tag_manager'.
1317		- * allows other plugins to customise the tag manager for their own dynamic field.
1318		- *@since 4.11.0
1319		- *@param String $tag_id dynamic list tag id.
1320		- *@param CF7SG_Dynamic_list $dlo dynamic list object.
1321		- *@param WPCF7_Contact_Form $form cf7 form object.
1322		- *@param Array $args cf7 form shortcode attributes
1323		- */
1324		- public function print_dynamic_list_generator($tag_id, $dlo, $form, $args){
1325		- include plugin_dir_path( __FILE__ ) . 'partials/cf7-dynamic-tag-display.php';
	1051	+ * Print hiddend field on cf7 post submit box
	1052	+ * Hooked on 'wpcf7_admin_misc_pub_section'
	1053	+ * @since 1.0.0
	1054	+ * @param string $post_id cf7 form post id .
	1055	+ **/
	1056	+ public function dynamic_select_choices($post_id){
	1057	+ echo '<input id="cf72post-dynamic-select" type="hidden" name="cf72post_dynamic_select_taxonomies" />';
1326	1058	}
1327	1059	/**
1328		- * Add custom imagegrid hook to taxonomy source.
1329		- * Hooked to 'cf7sg_dynamic_tag_manager_taxonomy_source'
1330		- *@since 4.11.0
1331		- *@param String $tag_id dynamic list tag id.
	1060	+ * CF7 Form saved from backend, check if dynamic-select are used
	1061	+ * Hooked on 'wpcf7_save_contact_form'
	1062	+ * @since 1.0.0
	1063	+ * @param WPCF7_Contact_Form $cf7_form cf7 form object
1332	1064	*/
1333		- public function add_taxonomy_imagegrid_hook($tag_id){
1334		- if('dynamic_checkbox' != $tag_id) return;
1335		- ?>
1336		- <p class="imagegrid-filter display-none filter-hook">
1337		- <strong><?=__('Filter imagegrid image sources','cf7-grid-layout')?></strong><br />
1338		- <?php echo sprintf(__('Copy the following <a class="%s" href="javascript:void(0);">filter</a> to your <em>functions.php</em> file.', 'cf7-grid-layout'), 'cf7sg_filter_taxonomy_images');?>
1339		- </p>
1340		- <?php
1341		- }
1342		- /**
1343		- * Function to get classes to be added to the form wrapper.
1344		- * these classes will be passed in the resource enqueue action, allowing for specific js/css resources
1345		- * to be queued up and loaded on the page where the form is being displayed.
1346		- * hooked to 'cf7sg_save_dynamic_list_form_classes'
1347		- * @param Array array of classes to be added to the form wrapper.
1348		- * @param WPCF7_FormTag cf7 tag object for the form field.
1349		- * @param int $form_id cf7 fomr post ID..
1350		- * @return Array an array of classes to be added to the form to which this tag belonggs to.
1351		- */
1352		- public function save_dynamic_list_form_classes($form_classes, $tag, $form_id){
1353		- /* Bookeeping, set up tagged select2 fields to filter newly added options in case Post My CF7 Form plugin is running */
1354		- $class = $tag->get_class_option('');
1355		- switch($tag->basetype){
1356		- case 'dynamic_select':
1357		- if(strpos($class, 'select2')){
1358		- $form_classes[] = 'has-select2';
1359		- //track this field if user sets custom options.
1360		- if(strpos($class, 'tags')){
1361		- $tagged_fields = get_post_meta($form_id, '_cf7sg_select2_tagged_fields', true);
1362		- if(empty($tagged_fields)){
1363		- $tagged_fields = array();
	1065	+ public function save_factory_metas($cf7_form){
	1066	+ $cf7_post_id = $cf7_form->id();
	1067	+ //get the tags used in this form
	1068	+ if( isset($_POST['cf72post_dynamic_select_taxonomies']) ){
	1069	+ $created_taxonomies = array();
	1070	+ $taxonomies = json_decode(str_replace('\"','"',$_POST['cf72post_dynamic_select_taxonomies']), true);
	1071	+ if(empty($taxonomies)){
	1072	+ $taxonomies = array();
	1073	+ }
	1074	+ foreach($taxonomies as $taxonomy){
	1075	+ //sanitize fields before saving into the DB.
	1076	+ foreach($taxonomy as $key=>$value){
	1077	+ $key = sanitize_key($key);
	1078	+ $taxonomy[$key] = sanitize_text_field($value);
	1079	+ }
	1080	+ $created_taxonomies[$taxonomy['slug']] = $taxonomy;
	1081	+ }
	1082	+ //debug_msg($created_taxonomies);
	1083	+ $tags = $cf7_form->scan_form_tags(); //get your form tags
	1084	+ $post_lists = $saved_lists = $system_list = array();
	1085	+
	1086	+ $dropdowns = get_option('_cf7sg_dynamic_dropdown_taxonomy',array());
	1087	+ foreach($dropdowns as $id => $lists){
	1088	+ $saved_lists = array_merge($saved_lists, $lists);
	1089	+ }
	1090	+ foreach($tags as $tag){
	1091	+ if('dynamic_select' == $tag['basetype']){
	1092	+ if(isset($tag['values'])){
	1093	+ $slug='';
	1094	+ foreach($tag['values'] as $values){
	1095	+ if(0 == strpos($values, 'slug:') ){
	1096	+ $slug = str_replace('slug:', '', $values);
	1097	+ break;
	1098	+ }
1364	1099	}
1365		- if( !isset($tagged_fields[$tag->name]) ){
1366		- $tagged_fields[$tag->name] = $source;
1367		- update_post_meta($form_id, '_cf7sg_select2_tagged_fields',$tagged_fields);
	1100	+ if(empty($slug)) continue; //not a taxonomy list.
	1101	+ //is slug newly created?
	1102	+ if(isset($created_taxonomies[$slug])){
	1103	+ //store this taxonomy.
	1104	+ $post_lists[$slug] = $created_taxonomies[$slug];
	1105	+ }else if(isset($saved_lists[$slug])){
	1106	+ //retain previously saved list if we are stil using it.
	1107	+ $post_lists[$slug] = $saved_lists[$slug];
	1108	+ }else{ //system taxonomy.
	1109	+ $system_list[] = $slug;
1368	1110	}
	1111	+ //store the taxonomy slug in the cf7 metas.
	1112	+ //$post_lists[$slug] = null;
1369	1113	}
1370	1114	}
1371		- if(false != strpos($class, 'nice-select') || false !=strpos($class, 'ui-select')){
1372		- $form_classes[] = 'has-nice-select';
1373		- }
1374		- break;
1375		- case 'dynamic_checkbox':
1376		- switch(true){
1377		- case strpos($class, 'hybriddd'):
1378		- case strpos($class, 'imagehdd'):
1379		- case strpos($class, 'imagegrid'):
1380		- case strpos($class, 'treeview'):
1381		- $form_classes[] = 'has-hybriddd';
1382		- break;
1383		- }
1384		- break;
	1115	+ }
	1116	+ //list of taxonomy to register.
	1117	+ //unset the old value.
	1118	+ unset($dropdowns[$cf7_post_id]);
	1119	+ //unshift new value to top of array.
	1120	+ $dropdowns = array($cf7_post_id => $post_lists) + $dropdowns ;
	1121	+
	1122	+ update_option('_cf7sg_dynamic_dropdown_taxonomy', $dropdowns);
	1123	+ //list of system taxonomy to register
	1124	+ $system_dropdowns = get_option('_cf7sg_dynamic_dropdown_system_taxonomy',array());
	1125	+ $system_dropdowns[$cf7_post_id] = $system_list;
	1126	+ update_option('_cf7sg_dynamic_dropdown_system_taxonomy', $system_dropdowns);
	1127	+
1385	1128	}
1386		- return $form_classes;
1387	1129	}
	1130	+
1388	1131	/**
	1132	+ * function to regsiter dyanmic dropdown taxonomies
	1133	+ *
	1134	+ * @since 1.0.0
	1135	+ * @param Object $taxonomy_object std object with parameters $taxonomy_object->slug, $taxonomy_object->singular, $taxonomy_object->plural, $taxonomy_object->hierarchical .
	1136	+ **/
	1137	+ protected function register_dynamic_dropdown($taxonomy_array){
	1138	+ $slug = $taxonomy_array['slug'];
	1139	+ $name = $taxonomy_array['singular'];
	1140	+ $plural = $taxonomy_array['plural'];
	1141	+ $is_hierarchical = $taxonomy_array['hierarchical'];
	1142	+
	1143	+ $labels = array(
	1144	+ 'name' => $plural,
	1145	+ 'singular_name' => $name,
	1146	+ 'menu_name' => $plural,
	1147	+ 'all_items' => 'All '.$plural,
	1148	+ 'parent_item' => 'Parent '.$name,
	1149	+ 'parent_item_colon' => 'Parent '.$name.':',
	1150	+ 'new_item_name' => 'New '.$name.' Name',
	1151	+ 'add_new_item' => 'Add New '.$name,
	1152	+ 'edit_item' => 'Edit '.$name,
	1153	+ 'update_item' => 'Update '.$name,
	1154	+ 'view_item' => 'View '.$name,
	1155	+ 'separate_items_with_commas' => 'Separate '.$plural.' with commas',
	1156	+ 'add_or_remove_items' => 'Add or remove '.$plural,
	1157	+ 'choose_from_most_used' => 'Choose from the most used',
	1158	+ 'popular_items' => 'Popular '.$plural,
	1159	+ 'search_items' => 'Search '.$plural,
	1160	+ 'not_found' => 'Not Found',
	1161	+ 'no_terms' => 'No '.$plural,
	1162	+ 'items_list' => $plural.' list',
	1163	+ 'items_list_navigation' => $plural.' list navigation',
	1164	+ );
	1165	+ //labels can be modified post registration
	1166	+ $args = array(
	1167	+ 'labels' => $labels,
	1168	+ 'hierarchical' => $is_hierarchical,
	1169	+ 'public' => false,
	1170	+ 'show_ui' => true,
	1171	+ 'show_admin_column' => false,
	1172	+ 'show_in_nav_menus' => false,
	1173	+ 'show_tagcloud' => false,
	1174	+ 'show_in_quick_edit' => false,
	1175	+ 'description' => 'Contact Form 7 dynamic dropdown taxonomy list',
	1176	+ );
	1177	+
	1178	+ register_taxonomy( $slug, $this->cf7_post_type(), $args );
	1179	+ }
	1180	+ /**
1389	1181	* Deactivate this plugin if CF7 plugin is deactivated.
1390	1182	* Hooks on action 'admin_init'
1391	1183	* @since 2.1
1392	1184	*/
		@@ -1442,20 +1234,20 @@
1442	1234	// Get array list of dismissed pointers for current user and convert it to array
1443	1235	$user_id = get_current_user_id();
1444	1236	$dismissed_pointers = explode( ',', get_user_meta( $user_id, 'dismissed_wp_pointers', true ) );
1445	1237	$pointers = array();
1446		- $helpers = array();
1447	1238	/**
1448	1239	* Filter to add custom pointers for user iterface.
1449	1240	* @var array $pointers an array of $pointer_id=>array($content, $arrow, $valign) key/value pairs to filter. The key is the pointer id to identify which ones the user has dismissed. The value is an array with the message $content, the position of the $arrow (left|right|top|bottom), the vertical alignment ($valign) of the box (center|top|bottom).
1450	1241	* @return array an array of pointers, which will be checked agains the current user.
1451	1242	*/
1452		- $filter_pointers = apply_filters('cf7sg_plugin_pointers-'.$screen->id, array(),$dismissed_pointers);
	1243	+ $filter_pointers = apply_filters('cf7sg_plugin_pointers-'.$screen->id, array());
1453	1244	foreach($filter_pointers as $id=>$pointer){
1454		- $enqueue_pointer = true;
1455		- if(is_array($pointer)){
	1245	+ // Check if our pointer is not among dismissed ones
	1246	+ if( !in_array( $id, $dismissed_pointers ) ) {
	1247	+ $enqueue_pointer = true;
1456	1248	$pointers[$id] = array($pointer[0], $pointer[1], $pointer[2], $pointer[3]);
1457		- }else $helpers[$id] = $pointer;
	1249	+ }
1458	1250	}
1459	1251	// Enqueue pointer CSS and JS files, if needed
1460	1252	if( $enqueue_pointer ) {
1461	1253	wp_enqueue_style( 'wp-pointer' );
		@@ -1461,56 +1253,41 @@
1461	1253	wp_enqueue_style( 'wp-pointer' );
1462	1254	wp_enqueue_script( 'wp-pointer' );
1463	1255	wp_enqueue_script('cf7sg-pointer-js', plugin_dir_url( __DIR__ ).'admin/js/cf7sg-pointers.js', array('jquery'), $this->version, true);
1464	1256	wp_localize_script('cf7sg-pointer-js', 'cf7sg_pointers',
1465		- array(
1466		- 'pointers'=>$pointers,
1467		- 'helpers'=>$helpers,
1468		- 'next'=>__('Next', 'cf7-grid-layout')
1469		- )
	1257	+ array('pointers'=>$pointers, 'next'=>__('Next', 'cf7-grid-layout'))
1470	1258	);
1471	1259	// Add footer scripts using callback function
1472		-
	1260	+ //add_action( 'admin_print_footer_scripts', array($this, 'pretty_pointer_script') );
1473	1261	}
1474	1262	}
1475		-
1476	1263	/**
1477	1264	* CF7 Table pointer notices.
1478	1265	* Hooked on 'cf7sg_plugin_pointers-edit-wpcf7_contact_form'
1479	1266	*@since 2.6.0
1480		- *@param Array $pointers array of pointers to suplement
1481		- *@param Array $dismissed array of dismissed pointer ids.
1482		- *@return Array array of pointers element-id=>hmtl to display key value pairs.
	1267	+ *@param array $pointers array of pointers to suplement
	1268	+ *@return array array of pointers element-id=>hmtl to display key value pairs.
1483	1269	*/
1484		- public function edit_pointers($pointers, $dismissed){
	1270	+ public function edit_pointers($pointers){
1485	1271	ob_start();
1486		- /* update forms */
1487		- if( !in_array( 'update_forms_pointer', $dismissed ) ) {
1488		- include_once 'partials/pointers/cf7sg-pointer-update-forms.php';
1489		- $content =ob_get_contents();
1490		- $pointers['update_forms_pointer'] = array($content, 'left', 'center','');
1491		- ob_clean();
1492		- }
	1272	+ include_once 'partials/pointers/cf7sg-pointer-update-forms.php';
	1273	+ $content =ob_get_contents();
	1274	+ $pointers['update_forms_pointer'] = array($content, 'left', 'center','');
1493	1275	/* tutorials */
1494		- if( !in_array( 'tutorials_pointer', $dismissed ) ) {
1495		- include_once 'partials/pointers/cf7sg-pointer-tutorials.php';
1496		- $content =ob_get_contents();
1497		- $pointers['tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]');
1498		- ob_clean();
1499		- }else if( !in_array( 'new_tutorials_pointer', $dismissed ) ) { /* new tutorials */
1500		- include_once 'partials/pointers/cf7sg-pointer-tutorial-advance.php';
1501		- $content =ob_get_contents();
1502		- $pointers['new_tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]');
1503		- ob_clean();
1504		- }
	1276	+ ob_clean();
	1277	+ include_once 'partials/pointers/cf7sg-pointer-tutorials.php';
	1278	+ $content =ob_get_contents();
	1279	+ $pointers['tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]');
	1280	+ /* new tutorials */
	1281	+ ob_clean();
	1282	+ include_once 'partials/pointers/cf7sg-pointer-tutorial-advance.php';
	1283	+ $content =ob_get_contents();
	1284	+ $pointers['new_tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]');
1505	1285	/* shortcodes */
1506		- if( !in_array( 'cf7sg_shortcodes', $dismissed ) ) {
1507		- include_once 'partials/pointers/cf7sg-pointer-shortcodes.php';
1508		- $content = ob_get_contents();
1509		- $pointers['cf7sg_shortcodes'] = array($content, 'top', 'top','');
1510		- ob_clean();
1511		- }
1512		- ob_end_clean();
	1286	+ ob_clean();
	1287	+ include_once 'partials/pointers/cf7sg-pointer-shortcodes.php';
	1288	+ $content = ob_get_clean();
	1289	+ $pointers['cf7sg_shortcodes'] = array($content, 'top', 'top','');
1513	1290	return $pointers;
1514	1291	}
1515	1292	/**
1516	1293	* CF7 Edit pointer notices.
		@@ -1515,83 +1292,56 @@
1515	1292	/**
1516	1293	* CF7 Edit pointer notices.
1517	1294	* Hooked on 'cf7sg_plugin_pointers-wpcf7_contact_form'
1518	1295	*@since 2.6.0
1519		- *@param Array $pointers array of pointers to suplement
1520		- *@param Array $dismissed array of dismissed pointer ids.
1521		- *@return Array array of pointers element-id=>hmtl to display key value pairs.
	1296	+ *@param array $pointers array of pointers to suplement
	1297	+ *@return array array of pointers element-id=>hmtl to display key value pairs.
1522	1298	*/
1523		- public function post_pointers($pointers, $dismissed){
	1299	+ public function post_pointers($pointers){
1524	1300	ob_start();
1525		- /* full screen button */
1526		- if( !in_array( 'full_screen', $dismissed ) ) {
1527		- include_once 'partials/pointers/cf7sg-pointer-editor-full-screen.php';
1528		- $content =ob_get_contents();
1529		- //content / arrow [top,bottom,left,right] / box align [top,bottom,center] / css selector.
1530		- $pointers['full_screen'] = array($content, 'left', 'center','#full-screen-cf7');
1531		- ob_clean();
1532		- }
1533		- /* editor_tabs */
1534		- if( !in_array( 'editor_tabs', $dismissed ) ) {
1535		- include_once 'partials/pointers/cf7sg-pointer-editor-tabs.php';
1536		- $content =ob_get_contents();
1537		- $pointers['editor_tabs'] = array($content, 'right', 'center','#form-editor-tabs>ul>li.ui-tabs-active');
1538		- ob_clean();
1539		- }
1540		- /* row_controls */
1541		- if( !in_array( 'row_controls', $dismissed ) ) {
1542		- include_once 'partials/pointers/cf7sg-pointer-editor-rows-control.php';
1543		- $content = ob_get_contents();
	1301	+ include_once 'partials/pointers/cf7sg-pointer-editor-full-screen.php';
	1302	+ $content =ob_get_contents();
	1303	+ //content / arrow [top,bottom,left,right] / box align [top,bottom,center] / css selector.
	1304	+ $pointers['full_screen'] = array($content, 'left', 'center','#full-screen-cf7');
	1305	+ /* shortcodes */
	1306	+ ob_clean();
	1307	+ include_once 'partials/pointers/cf7sg-pointer-editor-tabs.php';
	1308	+ $content =ob_get_contents();
	1309	+ $pointers['editor_tabs'] = array($content, 'right', 'center','#form-editor-tabs>ul>li.ui-tabs-active');
	1310	+ /* shortcodes */
	1311	+ ob_clean();
	1312	+ include_once 'partials/pointers/cf7sg-pointer-editor-rows-control.php';
	1313	+ $content = ob_get_contents();
	1314	+ if(!empty($content)){
1544	1315	$pointers['row_controls'] = array($content, 'right', 'center','#grid-form>.container>.row>.row-controls');
1545	1316	ob_clean();
1546	1317	}
1547	1318	/* preview form */
1548		- if( !in_array( 'preview_form', $dismissed ) ) {
1549		- include_once 'partials/pointers/cf7sg-pointer-editor-preview-form.php';
1550		- $content = ob_get_contents();
	1319	+ ob_clean();
	1320	+ include_once 'partials/pointers/cf7sg-pointer-editor-preview-form.php';
	1321	+ $content = ob_get_contents();
	1322	+ if(!empty($content)){
1551	1323	$pointers['preview_form'] = array($content, 'right', 'center','#preview-form-link');
1552	1324	ob_clean();
1553	1325	}
1554		- /* column controls */
1555		- if( !in_array( 'column_controls', $dismissed ) ) {
1556		- include_once 'partials/pointers/cf7sg-pointer-editor-column-control.php';
1557		- $content = ob_get_contents();
1558		- $pointers['column_controls'] = array($content, 'left', 'center','#grid-form > .container:first-child > .row > .columns:first-child > .grid-column > span.icon-code');
	1326	+ include_once 'partials/pointers/cf7sg-pointer-editor-column-control.php';
	1327	+ $content = ob_get_contents();
	1328	+ if(!empty($content)){
	1329	+ $pointers['column_controls'] = array($content, 'left', 'center','#grid-form>.container>.row>.columns:first-child>.grid-column>span.icon-code');
1559	1330	ob_clean();
1560	1331	}
1561		- /*dynamic-dropdown pointer*/
1562		- if( !in_array( 'dynamic_dropdown', $dismissed ) ) {
1563		- include_once 'partials/pointers/cf7sg-pointer-tag-dynamic-dropdown.php';
1564		- $content = ob_get_contents();
1565		- $pointers['dynamic_dropdown'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="dynamic-dropdown"]');
1566		- ob_clean();
1567		- }
1568		- /*dynamic-checkbox pointer*/
1569		- if( !in_array( 'dynamic_checkbox', $dismissed ) ) {
1570		- include_once 'partials/pointers/cf7sg-pointer-tag-dynamic-checkbox.php';
1571		- $content = ob_get_contents();
1572		- $pointers['dynamic_checkbox'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="dynamic-checkbox"]');
1573		- ob_clean();
1574		- }
	1332	+ include_once 'partials/pointers/cf7sg-pointer-tag-dynamic-dropdown.php';
	1333	+ $content = ob_get_contents();
	1334	+ $pointers['dynamic_dropdown'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="dynamic-dropdown"]');
	1335	+ ob_clean();
1575	1336	/* #optional-editors */
1576		- if( !in_array( 'js_css_editors', $dismissed ) ) {
1577		- include_once 'partials/pointers/cf7sg-pointers-editor-optional-js-css.php';
1578		- $content = ob_get_contents();
1579		- $pointers['js_css_editors'] = array($content, 'left', 'center','#optional-editors');
1580		- ob_clean();
1581		- }
1582		- /*benchmark pointer*/
1583		- if( !in_array( 'benchmark', $dismissed ) ) {
1584		- include_once 'partials/pointers/cf7sg-pointer-tag-benchmark.php';
1585		- $content = ob_get_contents();
1586		- $pointers['benchmark'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="benchmark"]');
1587		- ob_clean();
1588		- }
1589		- /*UI tags pointer include always*/
1590		- include_once 'partials/pointers/cf7sg-pointer-tag-ui-editor-tags.php';
	1337	+ include_once 'partials/pointers/cf7sg-pointers-editor-optional-js-css.php';
1591	1338	$content = ob_get_contents();
1592		- $pointers['ui_editor_tags'] = $content; //controlled within js script
1593		- ob_end_clean();
	1339	+ $pointers['js_css_editors'] = array($content, 'left', 'center','#optional-editors');
	1340	+ ob_clean();
	1341	+ include_once 'partials/pointers/cf7sg-pointer-tag-benchmark.php';
	1342	+ $content = ob_get_clean();
	1343	+ $pointers['benchmark'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="benchmark"]');
1594	1344	return $pointers;
1595	1345	}
1596	1346	/**
1597	1347	* Rest meta_caps for better fine tuning of user caps.
		@@ -1622,14 +1372,14 @@
1622	1372	*@since 3.0.0
1623	1373	*@param array $data sanitised post data.
1624	1374	*@return array post data.
1625	1375	*/
1626		- public function pending_for_review($data, $post){
	1376	+ public function pending_for_review($data){
1627	1377	if($this->cf7_post_type() != $data['post_type']) return $data;
1628	1378
1629	1379	$post_type_object = get_post_type_object( $this->cf7_post_type() );
1630	1380	//check if user can publish.
1631		- if(isset($post['ID']) && !current_user_can($post_type_object->cap->publish_posts, $post['ID']) && $data['post_status']=='publish'){
	1381	+ if(!current_user_can($post_type_object->cap->publish_posts) && $data['post_status']=='publish'){
1632	1382	$data['post_status']='pending';
1633	1383	}
1634	1384	// debug_msg('post status '.$data['post_status']);
1635	1385	return $data;
		@@ -1654,9 +1404,8 @@
1654	1404	}
1655	1405
1656	1406	/** @since 3.1.3 redirect cf7 plugin pages*/
1657	1407	global $pagenow;
1658		- // debug_msg("page: $pagenow");
1659	1408	if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) ) {
1660	1409	$url = '';
1661	1410	switch($_GET['page']){
1662	1411	case 'wpcf7-new':
		@@ -1670,12 +1419,8 @@
1670	1419	if(!empty($url)){
1671	1420	wp_redirect( admin_url( $url ));
1672	1421	exit;
1673	1422	}
1674		- }else if( $pagenow == 'edit.php' && isset( $_GET['post_type']) && $this->cf7_post_type()==$_GET['post_type'] ){ /** @since 4.11.5 buld validate */
1675		- if(isset($_POST['action']) && 'validate'==$_POST['action'] && function_exists('wpcf7_load_bulk_validate_page')){
1676		- wpcf7_load_bulk_validate_page('wpcf7','validate');
1677		- }
1678	1423	}
1679	1424	}
1680	1425	/**
1681	1426	* Add grid helper hooks for individual tags.
		@@ -1686,15 +1431,14 @@
1686	1431	require_once plugin_dir_path( __FILE__ ) .'partials/helpers/cf7sg-form-fields.php';
1687	1432	}
1688	1433	/**
1689	1434	* Setup mailtags or toggles.
1690		- * Hooked to 'wpcf7_collect_mail_tags'
	1435	+ *
1691	1436	*@since 4.0.0
1692	1437	*@param string $param text_description
1693	1438	*@return string text_description
1694	1439	*/
1695		- public function setup_cf7_mailtags($mailtags){
1696		- // debug_msg($mailtags, 'mail tags ');
	1440	+ public function setup_cf7_mailtags($mailtags = array()){
1697	1441	// return $mailtags;
1698	1442	$contact_form = WPCF7_ContactForm::get_current();
1699	1443	$fields = get_post_meta($contact_form->id(), '_cf7sg_grid_toggled_names', true);
1700	1444	//update_post_meta($post_id, '_cf7sg_grid_tabbed_toggles', $ttgls);
		@@ -1718,106 +1462,64 @@
1718	1462	* hooked on 'admin_init'
1719	1463	*@since 4.1.0
1720	1464	*/
1721	1465	public function init_notices(){
1722		- global $pagenow;
1723		- switch($pagenow){
1724		- case 'edit.php':
1725		- case 'post.php':
1726		- case 'plugins.php':
1727		- break;
1728		- default:
1729		- return;
1730		- }
1731		- $grid_settings = get_option( self::CF7SG_OPTION, array());
	1466	+ $grid_settings = get_option( 'cf7sg-plugin-version', array());
1732	1467	//if plugin settings exists and this is not an update, then no need to run.
	1468	+ if( !empty($grid_settings) and !isset($grid_settings['update']) ) return;
	1469	+
	1470	+ $warning = false;
1733	1471	$notices = array();
1734		- if( !empty($grid_settings) and isset($grid_settings['update']) ){
1735		- $warning = false;
1736	1472
1737		- if(isset($grid_settings['update']) and CF7SG_VERSION_FORM_UPDATE==CF7_GRID_VERSION){
1738		- $warning = true;
1739		- }else if(isset($grid_settings['fv']) ) {
1740		- if(version_compare($grid_settings['fv'], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true;
1741		- }else{ //check the forms directly
1742		- global $wpdb;
1743		- $post_type = $this->cf7_post_type();
1744		- $result = $wpdb->get_col("SELECT pm.meta_value FROM {$wpdb->postmeta} as pm
1745		- INNER JOIN {$wpdb->posts} as p on p.ID = pm.post_id INNER JOIN {$wpdb->postmeta} as pmf on pmf.post_id = pm.post_id
1746		- WHERE pmf.meta_key = '_cf7sg_managed_form'
1747		- AND pmf.meta_value = 1
1748		- AND p.post_type = '{$post_type}'
1749		- AND pm.meta_key = '_cf7sg_version'
1750		- ");
1751		- if(!empty($result) and version_compare($result[0], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true;
1752		- }
	1473	+ if(isset($grid_settings['update']) and CF7SG_VERSION_FORM_UPDATE==CF7_GRID_VERSION){
	1474	+ $warning = true;
	1475	+ }else if(isset($grid_settings['fv']) ) {
	1476	+ if(version_compare($grid_settings['fv'], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true;
	1477	+ }else{ //check the forms directly
	1478	+ global $wpdb;
	1479	+ $post_type = $this->cf7_post_type();
	1480	+ $result = $wpdb->get_col("SELECT pm.meta_value FROM {$wpdb->postmeta} as pm
	1481	+ INNER JOIN {$wpdb->posts} as p on p.ID = pm.post_id
	1482	+ WHERE p.post_type = '{$post_type}'
	1483	+ AND pm.meta_key = '_cf7sg_version'
	1484	+ ORDER BY pm.meta_key
	1485	+ ");
	1486	+ if(!empty($result) and version_compare($result[0], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true;
	1487	+ }
1753	1488
1754		- if($warning){
1755		- $link = admin_url('edit.php?post_type=wpcf7_contact_form');
1756		- /* translators: %s is the url to the forms admin table */
1757		- $msg = __('You need to <strong>update</strong> your <a href="%s">forms</a>','cf7-grid-layout');
1758		- $notices['cf7sg_notice-'.CF7_GRID_VERSION] = array(
1759		- 'type'=>'notice-warning', //[notice-update|notice-error]
1760		- 'msg'=>sprintf($msg , $link),
1761		- 'pages'=>array('plugins.php','edit.php')
1762		- );
1763		- }
1764		- /** @since 4.2.0 new sliders tutorial */
1765		- if( isset($grid_settings['update']) ){
1766		- $notices['cf7sg_sliders_tutorial'] = array(
1767		- 'type'=>'notice-update', //[notice-update|notice-error]
1768		- /* translators: %s is the link to the tuorial page*/
1769		- 'msg'=>sprintf( __('There is a new tutorial for <a href="%s">multistep slider forms</a>','cf7-grid-layout'), admin_url('admin.php?page=cf7sg_help')),
1770		- 'html'=>'<div class="inline-top"><iframe width="230" height="130" src="https://www.youtube.com/embed/WiweQRhOr0g" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div><div class="inline-top"><strong>Learn how to create multi-step multi-slide CF7 forms using a slider construct functionality of the Smart Grid-layout extension plugin.</strong></div>',
1771		- 'pages'=>array('plugins.php','edit.php')
1772		- );
1773		- $notices['cf7sg_modular_tutorial'] = array(
1774		- 'type'=>'notice-update', //[notice-update|notice-error]
1775		- /* translators: %s is the link to the tuorial page*/
1776		- 'msg'=>sprintf( __('There is a new tutorial for <a href="%s">modular form construct</a>','cf7-grid-layout'), admin_url('admin.php?page=cf7sg_help')),
1777		- 'html'=>'<div class="inline-top"><iframe width="230" height="130" src="https://www.youtube.com/embed/vPc3M5Emro4" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div><div class="inline-top"><strong>Learn how to use modular form construct functionality allowing complex forms to be assembled from other child forms.</strong></div>',
1778		- 'pages'=>array('plugins.php','edit.php')
1779		- );
1780		- }
1781		- update_option(self::CF7SG_OPTION, array(
1782		- 'gv'=>CF7_GRID_VERSION,
1783		- 'fv'=>CF7SG_VERSION_FORM_UPDATE
1784		- ));
	1489	+ if($warning){
	1490	+ $link = admin_url('edit.php?post_type=wpcf7_contact_form');
	1491	+ /* translators: %s is the url to the forms admin table */
	1492	+ $msg = __('You need to <strong>update</strong> your <a href="%s">forms</a>','cf7-grid-layout');
	1493	+ $notices['cf7sg_notice-'.CF7_GRID_VERSION] = array(
	1494	+ 'type'=>'notice-warning', //[notice-update|notice-error]
	1495	+ 'msg'=>sprintf($msg , $link),
	1496	+ 'pages'=>array('plugins.php','edit.php')
	1497	+ );
1785	1498	}
1786		- /** @since 4.11.5 add admin notices for bulk cf7 validation */
1787		- //check if cf7 found issues:
1788		-
1789		- if(method_exists('WPCF7','get_option')){
1790		- $result = WPCF7::get_option( 'bulk_validate' );
1791		- if(!empty($result)){
1792		- $has_errors = ( isset($result['count_invalid']) and $result['count_invalid']>0);
1793		- $is_old = (defined('WPCF7_ConfigValidator::last_important_update') &&
1794		- isset($result['version']) &&
1795		- version_compare( $result['version'], WPCF7_ConfigValidator::last_important_update, '<'));
1796		- if( $is_old or $has_errors){
1797		- ob_start();
1798		- wpcf7_admin_bulk_validate_page();
1799		- $html = ob_get_contents();
1800		- ob_end_clean();
1801		- $msg = '';
1802		- if($is_old){
1803		- $msg = __('CF7 plugin udpate requires you to revalidate your forms.','cf7-grid-layout');
1804		- }else if($has_errors){
1805		- $msg = sprintf( /* translators : %s is number of forms */
1806		- __('You have %s form(s) with errors flagged below, fix those before attempting to revalidate your forms','cf7-grid-layout'),
1807		- $result['count_invalid']
1808		- );
1809		- }
1810		- $notices['cf7sg_notice-cf7_validate'] = array(
1811		- 'type'=>'notice-error',
1812		- 'msg' => $msg,
1813		- 'html'=>$html,
1814		- 'pages'=>array('edit.php')
1815		- );
1816		- }
1817		- }
	1499	+ /** @since 4.2.0 new sliders tutorial */
	1500	+ if( isset($grid_settings['update']) ){
	1501	+ $notices['cf7sg_sliders_tutorial'] = array(
	1502	+ 'type'=>'notice-update', //[notice-update|notice-error]
	1503	+ /* translators: %s is the link to the tuorial page*/
	1504	+ 'msg'=>sprintf( __('There is a new tutorial for <a href="%s">multistep slider forms</a>','cf7-grid-layout'), admin_url('admin.php?page=cf7sg_help')),
	1505	+ 'html'=>'<div class="inline-top"><iframe width="230" height="130" src="https://www.youtube.com/embed/WiweQRhOr0g" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div><div class="inline-top"><strong>Learn how to create multi-step multi-slide CF7 forms using a slider construct functionality of the Smart Grid-layout extension plugin.</strong></div>',
	1506	+ 'pages'=>array('plugins.php','edit.php')
	1507	+ );
	1508	+ $notices['cf7sg_modular_tutorial'] = array(
	1509	+ 'type'=>'notice-update', //[notice-update|notice-error]
	1510	+ /* translators: %s is the link to the tuorial page*/
	1511	+ 'msg'=>sprintf( __('There is a new tutorial for <a href="%s">modular form construct</a>','cf7-grid-layout'), admin_url('admin.php?page=cf7sg_help')),
	1512	+ 'html'=>'<div class="inline-top"><iframe width="230" height="130" src="https://www.youtube.com/embed/vPc3M5Emro4" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div><div class="inline-top"><strong>Learn how to use modular form construct functionality allowing complex forms to be assembled from other child forms.</strong></div>',
	1513	+ 'pages'=>array('plugins.php','edit.php')
	1514	+ );
1818	1515	}
1819	1516	if(!empty($notices)) update_option('cf7sg-admin-notices', $notices);
	1517	+
	1518	+ update_option('cf7sg-plugin-version', array(
	1519	+ 'gv'=>CF7_GRID_VERSION,
	1520	+ 'fv'=>CF7SG_VERSION_FORM_UPDATE
	1521	+ ));
1820	1522	}
1821	1523	/**
1822	1524	* Display admin notices
1823	1525	* Hooked on 'admin_notices'
		@@ -1826,9 +1528,8 @@
1826	1528	public function admin_notices(){
1827	1529	//check if we have any notices.
1828	1530	global $pagenow;
1829	1531	$notices = get_option('cf7sg-admin-notices', array());
1830		-
1831	1532	if(empty($notices)) return;
1832	1533
1833	1534	if(!isset(self::$admin_notice_pages[$pagenow])) return;
1834	1535
		@@ -1833,8 +1534,9 @@
1833	1534	if(!isset(self::$admin_notice_pages[$pagenow])) return;
1834	1535
1835	1536	$notify=false;
1836	1537	$rule = self::$admin_notice_pages[$pagenow];
	1538	+ // debug_msg($rule, 'notice rules ');
1837	1539	if($pagenow=='post.php'){
1838	1540	$screen = get_current_screen();
1839	1541	if($this->cf7_post_type() == $screen->post_type) $notify=true;
1840	1542	}else if( !empty($rule) and is_array($rule) ){
		@@ -1857,16 +1559,10 @@
1857	1559	}
1858	1560	if(!isset($notice['html'])) $notice['html'] = '';
1859	1561	?>
1860	1562	<style>.notice .inline-top{display: inline-block;vertical-align: top;margin-right: 10px;max-width: 300px;}</style>
1861		- <div data-dismissible="<?=$dismiss?>" class="notice <?=$notice['type']?> is-dismissible cf7sg-notice">
1862		- <?= empty($notice['msg'])?'':'<p>'.$notice['msg'].'</p>'?>
1863		- <?=$notice['html']?>
1864		- </div>
	1563	+ <div data-dismissible="<?=$dismiss?>" class="notice <?=$notice['type']?> is-dismissible"><p><?=$notice['msg']?></p><?=$notice['html']?></div>
1865	1564	<?php
1866		- /** @since 4.7.1 dismiss notices once displayed */
1867		- unset($notices[$id]);
1868		- update_option('cf7sg-admin-notices', $notices);
1869	1565	}
1870	1566	}
1871	1567	/**
1872	1568	* ajax request to validate plugin update.
		@@ -1877,9 +1573,9 @@
1877	1573	if( !isset($_POST['nonce']) or !wp_verify_nonce($_POST['nonce'], 'cf7sg_udpate_plugin') ){
1878	1574	echo 'error, nonce failed, try to reload the page.';
1879	1575	wp_die();
1880	1576	}
1881		- $grid_settings = get_option(self::CF7SG_OPTION, array());
	1577	+ $grid_settings = get_option('cf7sg-plugin-version', array());
1882	1578	$warning = false;
1883	1579	if(isset($grid_settings['fv']) ) {
1884	1580	if(version_compare($grid_settings['fv'], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true;
1885	1581	}
		@@ -1885,9 +1581,9 @@
1885	1581	}
1886	1582	$grid_settings['fv'] = CF7SG_VERSION_FORM_UPDATE;
1887	1583	$grid_settings['gv'] = CF7_GRID_VERSION;
1888	1584	$grid_settings['update'] = true;
1889		- update_option(self::CF7SG_OPTION, $grid_settings);
	1585	+ update_option('cf7sg-plugin-version', $grid_settings);
1890	1586	$update_msg = __('Version validated, thank you!','cf7-grid-layout');
1891	1587	if($warning){
1892	1588	$link = admin_url('edit.php?post_type=wpcf7_contact_form');
1893	1589	/* translators: %s link to form table */
		@@ -1896,9 +1592,8 @@
1896	1592	}
1897	1593	echo $update_msg;
1898	1594	wp_die();
1899	1595	}
1900		-
1901	1596	/**
1902	1597	* Check if plugin is getting updated.
1903	1598	* Hooked to 'upgrader_post_install'.
1904	1599	*@since 4.1.0
		@@ -1909,11 +1604,11 @@
1909	1604	*/
1910	1605	public function post_plugin_upgrade($response, $extras, $result){
1911	1606	if( ( isset($response['destination_name']) and 'cf7-grid-layout' == $response['destination_name'] )
1912	1607	or ( isset($extras['plugin']) and 'cf7-grid-layout/cf7-grid-layout.php' == $extras['plugin'] ) ){
1913		- $grid_settings = get_option(self::CF7SG_OPTION, array());
	1608	+ $grid_settings = get_option('cf7sg-plugin-version', array());
1914	1609	$grid_settings['update'] = true;
1915		- update_option(self::CF7SG_OPTION, $grid_settings);
	1610	+ update_option('cf7sg-plugin-version', $grid_settings);
1916	1611	}
1917	1612	return $response;
1918	1613	}
1919	1614	/**