| @@ -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 */ |
| @@ -571,196 +550,16 @@ | ||
| 571 | 550 | } |
| 572 | 551 | } |
| 573 | 552 | } |
| 574 | 553 | } |
| 575 | - /** @since 5.0 register dynamic_select list */ | |
| 576 | - do_action('cf7sg_register_dynamic_lists'); | |
| 577 | - // debug_msg('created dynamic select '); | |
| 578 | 554 | } |
| 579 | - /** | |
| 580 | - * function to regsiter dyanmic dropdown taxonomies | |
| 581 | - * | |
| 582 | - * @since 1.0.0 | |
| 583 | - * @param Object $taxonomy_object std object with parameters $taxonomy_object->slug, $taxonomy_object->singular, $taxonomy_object->plural, $taxonomy_object->hierarchical . | |
| 584 | - **/ | |
| 585 | - protected function register_dynamic_dropdown($taxonomy_array){ | |
| 586 | - $slug = $taxonomy_array['slug']; | |
| 587 | - $name = $taxonomy_array['singular']; | |
| 588 | - $plural = $taxonomy_array['plural']; | |
| 589 | - $is_hierarchical = $taxonomy_array['hierarchical']; | |
| 590 | 555 | |
| 591 | - $labels = array( | |
| 592 | - 'name' => $plural, | |
| 593 | - 'singular_name' => $name, | |
| 594 | - 'menu_name' => $plural, | |
| 595 | - 'all_items' => 'All '.$plural, | |
| 596 | - 'parent_item' => 'Parent '.$name, | |
| 597 | - 'parent_item_colon' => 'Parent '.$name.':', | |
| 598 | - 'new_item_name' => 'New '.$name.' Name', | |
| 599 | - 'add_new_item' => 'Add New '.$name, | |
| 600 | - 'edit_item' => 'Edit '.$name, | |
| 601 | - 'update_item' => 'Update '.$name, | |
| 602 | - 'view_item' => 'View '.$name, | |
| 603 | - 'separate_items_with_commas' => 'Separate '.$plural.' with commas', | |
| 604 | - 'add_or_remove_items' => 'Add or remove '.$plural, | |
| 605 | - 'choose_from_most_used' => 'Choose from the most used', | |
| 606 | - 'popular_items' => 'Popular '.$plural, | |
| 607 | - 'search_items' => 'Search '.$plural, | |
| 608 | - 'not_found' => 'Not Found', | |
| 609 | - 'no_terms' => 'No '.$plural, | |
| 610 | - 'items_list' => $plural.' list', | |
| 611 | - 'items_list_navigation' => $plural.' list navigation', | |
| 612 | - ); | |
| 613 | - //labels can be modified post registration | |
| 614 | - $args = array( | |
| 615 | - 'labels' => $labels, | |
| 616 | - 'hierarchical' => $is_hierarchical, | |
| 617 | - 'public' => false, | |
| 618 | - 'show_ui' => true, | |
| 619 | - 'show_admin_column' => false, | |
| 620 | - 'show_in_nav_menus' => false, | |
| 621 | - 'show_tagcloud' => false, | |
| 622 | - 'show_in_quick_edit' => false, | |
| 623 | - 'description' => 'Contact Form 7 dynamic dropdown taxonomy list', | |
| 624 | - ); | |
| 625 | - | |
| 626 | - register_taxonomy( $slug, $this->cf7_post_type(), $args ); | |
| 627 | - } | |
| 628 | 556 | /** |
| 629 | - * CF7 Form saved from backend, check if dynamic lists are used | |
| 630 | - * Hooked on 'wpcf7_save_contact_form' | |
| 631 | - * @since 1.0.0 | |
| 632 | - * @param WPCF7_Contact_Form $cf7_form cf7 form object | |
| 633 | - */ | |
| 634 | - public function save_factory_metas($cf7_form){ | |
| 635 | - $cf7_post_id = $cf7_form->id(); | |
| 636 | - //get the tags used in this form | |
| 637 | - $tags = $cf7_form->scan_form_tags(); //get your form tags | |
| 638 | - $dynamic_lists = cf7sg_get_dynamic_lists(); | |
| 639 | - $dynamic_tags = array_keys($dynamic_lists); | |
| 640 | - $dynamic_fields = array(); | |
| 641 | - $form_classes = array(); | |
| 642 | - foreach($tags as $tag){ | |
| 643 | - if(in_array($tag->basetype, $dynamic_tags)){ | |
| 644 | - $dynamic_fields[$tag->basetype]=$tag; | |
| 645 | - $form_classes = array_merge($form_classes, $dynamic_lists[$tag->basetype]->get_form_classes($tag, $cf7_post_id)); | |
| 646 | - } | |
| 647 | - } | |
| 648 | - if(!empty($form_classes)){ | |
| 649 | - $classes = get_post_meta($cf7_post_id, '_cf7sg_script_classes', true); | |
| 650 | - if(empty($classes)){ | |
| 651 | - $classes = array(); | |
| 652 | - } | |
| 653 | - $form_classes = array_diff(array_unique($form_classes), $classes); //any new classes? | |
| 654 | - if(!empty($form_classes)) { | |
| 655 | - update_post_meta($cf7_post_id, '_cf7sg_script_classes', array_merge($classes, $form_classes)); | |
| 656 | - } | |
| 657 | - } | |
| 658 | - //check for newly created taxonomy lists. | |
| 659 | - if( isset($_POST['cf72post_dynamic_select_taxonomies']) ){ | |
| 660 | - $created_taxonomies = array(); | |
| 661 | - $taxonomies = json_decode(str_replace('\"','"',$_POST['cf72post_dynamic_select_taxonomies']), true); | |
| 662 | - if(empty($taxonomies)){ | |
| 663 | - $taxonomies = array(); | |
| 664 | - } | |
| 665 | - foreach($taxonomies as $taxonomy){ | |
| 666 | - //sanitize fields before saving into the DB. | |
| 667 | - foreach($taxonomy as $key=>$value){ | |
| 668 | - $key = sanitize_key($key); | |
| 669 | - $taxonomy[$key] = sanitize_text_field($value); | |
| 670 | - } | |
| 671 | - $created_taxonomies[$taxonomy['slug']] = $taxonomy; | |
| 672 | - } | |
| 673 | - //debug_msg($created_taxonomies); | |
| 674 | - $post_lists = $saved_lists = $system_list = array(); | |
| 675 | - | |
| 676 | - $dropdowns = get_option('_cf7sg_dynamic_dropdown_taxonomy',array()); | |
| 677 | - foreach($dropdowns as $id => $lists){ | |
| 678 | - $saved_lists = array_merge($saved_lists, $lists); | |
| 679 | - } | |
| 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 | - //list of taxonomy to register. | |
| 705 | - //unset the old value. | |
| 706 | - unset($dropdowns[$cf7_post_id]); | |
| 707 | - //unshift new value to top of array. | |
| 708 | - $dropdowns = array($cf7_post_id => $post_lists) + $dropdowns ; | |
| 709 | - | |
| 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. |
| @@ -900,14 +709,14 @@ | ||
| 900 | 709 | $args['title'] = isset( $_POST['post_title'] ) ? sanitize_text_field($_POST['post_title'], 'Contact Form', 'save') : null; |
| 901 | 710 | $args['locale'] = isset( $_POST['wpcf7-locale'] ) ? sanitize_text_field($_POST['wpcf7-locale']) : null; |
| 902 | 711 | $args['form'] = ''; |
| 903 | 712 | $allowed_tags = wp_kses_allowed_html( 'post' ); //filtered in function below. |
| 904 | - /** @since 4.8.1 alllow custom input html*/ | |
| 713 | + /** @since 2.10.0 alllow custom input html*/ | |
| 905 | 714 | $allowed_tags['input']=array( //add additional input html elements |
| 906 | - 'type'=>1,'name'=>1,'placeholder'=>1,'value'=>1,'maxlength'=>1,'minlength'=>1, //input fields. | |
| 907 | - 'spellcheck'=>1,'size'=>1,'readonly'=>1,'pattern'=>1,'list'=>1, //input fields. | |
| 715 | + 'type'=>1, | |
| 908 | 716 | 'class'=>1, |
| 909 | 717 | 'id'=>1, |
| 718 | + 'value'=>1, | |
| 910 | 719 | 'data-*'=>1, |
| 911 | 720 | ); |
| 912 | 721 | $allowed_tags['script']=array('type'=>1); |
| 913 | 722 | $cf7_key = $post->post_name; |
| @@ -922,9 +731,15 @@ | ||
| 922 | 731 | $args['messages'][$key] = sanitize_text_field($value); |
| 923 | 732 | } |
| 924 | 733 | $args['additional_settings'] = isset( $_POST['wpcf7-additional-settings'] ) ? sanitize_textarea_field($_POST['wpcf7-additional-settings']) : ''; |
| 925 | 734 | |
| 926 | - | |
| 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. | |
| 927 | 742 | //save sub-forms if any |
| 928 | 743 | $sub_forms = json_decode(stripslashes($_POST['cf7sg-embeded-forms'])); |
| 929 | 744 | if(empty($sub_forms)) $sub_forms = array(); |
| 930 | 745 | if(!is_array($sub_forms)) $sub_forms = array($sub_forms); |
| @@ -999,9 +814,13 @@ | ||
| 999 | 814 | $has_tables = ( 'true' === $_POST['cf7sg-has-tables']) ? true : false; |
| 1000 | 815 | update_post_meta($post_id, '_cf7sg_has_tables', $has_tables); |
| 1001 | 816 | $has_toggles = ( 'true' === $_POST['cf7sg-has-toggles']) ? true : false; |
| 1002 | 817 | update_post_meta($post_id, '_cf7sg_has_toggles', $has_toggles); |
| 1003 | - | |
| 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); | |
| 1004 | 823 | /** |
| 1005 | 824 | * @since 1.2.3 disable cf7sg styling/js for non-cf7sg forms. |
| 1006 | 825 | */ |
| 1007 | 826 | $is_cf7sg = ( 'true' === $_POST['is_cf7sg_form']) ? true : false; |
| @@ -1023,15 +842,12 @@ | ||
| 1023 | 842 | update_user_meta(get_current_user_id(),'_cf7sg_js_cm_theme', $_POST['cf7sg_js_codemirror_theme']); |
| 1024 | 843 | } |
| 1025 | 844 | //save js file if used. |
| 1026 | 845 | $path = get_stylesheet_directory(); |
| 1027 | - if(!empty($_POST['cf7sg_js_file']) || !empty($_POST['cf7sg_prev_js_file'])){ | |
| 846 | + if(!empty($_POST['cf7sg_js_file'])){ | |
| 1028 | 847 | //check if the file name is changed. |
| 1029 | - if(!empty($_POST['cf7sg_prev_js_file']) && ($fp = realpath(ABSPATH. $_POST['cf7sg_prev_js_file'])) !== false ){ | |
| 1030 | - $path_match = preg_match('/^'.preg_quote("$path/js/",'/').'[^\s!?.\/#*]+\.js$'.'/', $fp); | |
| 1031 | - if($path_match && !unlink($fp) ){ | |
| 1032 | - debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_js_file']); | |
| 1033 | - } | |
| 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']); | |
| 1034 | 850 | } |
| 1035 | 851 | if( !is_dir("$path/js/") ) mkdir("$path/js/"); |
| 1036 | 852 | file_put_contents( "$path/js/{$cf7_key}.js", stripslashes($_POST['cf7sg_js_file']) ); |
| 1037 | 853 | }else if( isset($_POST['cf7sg_js_file']) && file_exists("$path/js/{$cf7_key}.js") ) { //delete file. |
| @@ -1037,15 +853,12 @@ | ||
| 1037 | 853 | }else if( isset($_POST['cf7sg_js_file']) && file_exists("$path/js/{$cf7_key}.js") ) { //delete file. |
| 1038 | 854 | if( !unlink("$path/js/{$cf7_key}.js") ) debug_msg("CF7SG ADMIN: unable to delete file $path/js/{$cf7_key}.js"); |
| 1039 | 855 | } |
| 1040 | 856 | //save css file. |
| 1041 | - if(!empty($_POST['cf7sg_css_file']) || !empty($_POST['cf7sg_prev_css_file'])){ | |
| 857 | + if(!empty($_POST['cf7sg_css_file'])){ | |
| 1042 | 858 | //check if the file is changed. |
| 1043 | - if(!empty($_POST['cf7sg_prev_css_file']) && ($fp = realpath(ABSPATH.$_POST['cf7sg_prev_css_file'])) !==false ){ | |
| 1044 | - $path_match = preg_match('/^'.preg_quote("$path/css/",'/').'[^\s!?.\/#*]+\.css$'.'/', $fp); | |
| 1045 | - if($path_match && !unlink($fp) ){ | |
| 1046 | - debug_msg('CF7SG ADMIN: unable to delete file '.$_POST['cf7sg_prev_css_file']); | |
| 1047 | - } | |
| 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']); | |
| 1048 | 861 | } |
| 1049 | 862 | if( !is_dir("$path/css/") ) mkdir("$path/css/"); |
| 1050 | 863 | file_put_contents( $path."/css/{$cf7_key}.css", stripslashes($_POST['cf7sg_css_file'])); |
| 1051 | 864 | }else if( isset($_POST['cf7sg_css_file']) && file_exists("$path/css/{$cf7_key}.css") ) { //delete file. |
| @@ -1064,20 +877,8 @@ | ||
| 1064 | 877 | 'post_status'=>'draft', |
| 1065 | 878 | 'post_type'=>'cf7sg_page', |
| 1066 | 879 | // 'post_name' => sanitize_title( $title ), |
| 1067 | 880 | ); |
| 1068 | - /** @since 4.6.0 redirect on submit */ | |
| 1069 | - if(isset($_POST['cf7sg_page_redirect'])){ | |
| 1070 | - $redirect_to = absint($_POST['cf7sg_page_redirect']); | |
| 1071 | - update_post_meta($post->ID, '_cf7sg_page_redirect',$redirect_to); | |
| 1072 | - if(isset($_POST['cache_cf7sg_submit']) and isset($_POST['cf7sg_cached_time']) and isset($_POST['cf7sg_cached_unit'])){ | |
| 1073 | - $cache = floatval( $_POST['cf7sg_cached_time']); | |
| 1074 | - if($cache>0){ | |
| 1075 | - $cache=array($cache, absint($_POST['cf7sg_cached_unit'])); | |
| 1076 | - update_post_meta($post->ID, '_cf7sg_cache_redirect_data',$cache); | |
| 1077 | - } | |
| 1078 | - }else delete_post_meta($post->ID, '_cf7sg_cache_redirect_data'); | |
| 1079 | - } | |
| 1080 | 881 | if(empty($cf7_key)) $prev_page['post_content'] = '[contact-form-7 id="'.$post->ID.'"]'; |
| 1081 | 882 | if( !empty($preview_id) ){ |
| 1082 | 883 | $prev_page['ID'] = $preview_id; |
| 1083 | 884 | } |
| @@ -1084,33 +885,8 @@ | ||
| 1084 | 885 | $preview_id = wp_insert_post($prev_page, true); |
| 1085 | 886 | if(!is_wp_error($preview_id)){ |
| 1086 | 887 | update_post_meta($post->ID, '_cf7sg_form_page',$preview_id); |
| 1087 | 888 | } |
| 1088 | - //save wpcf7 form | |
| 1089 | - //need to unhook this function so as not to loop infinitely | |
| 1090 | - //debug_msg($args, 'saving cf7 posts'); | |
| 1091 | - remove_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3); | |
| 1092 | - // debug_msg($args['form'],'form '); | |
| 1093 | - /** @since 4.11.5 filter wp_kses ffrmo cf7 plugin v5.5 */ | |
| 1094 | - add_filter('wpcf7_kses_allowed_html', function($cf7_tags, $context) use ($allowed_tags){ | |
| 1095 | - if('form'==$context) return array_merge($cf7_tags, $allowed_tags); | |
| 1096 | - return $cf7_tags; | |
| 1097 | - },1001,2); | |
| 1098 | - $contact_form = wpcf7_save_contact_form( $args ); | |
| 1099 | - /** @since 4.11.5 cf7 plugin validate form */ | |
| 1100 | - if(function_exists('wpcf7_validate_configuration') && | |
| 1101 | - method_exists('WPCF7_ConfigValidator','validate') && | |
| 1102 | - method_exists('WPCF7_ConfigValidator','save') ){ | |
| 1103 | - if ( $contact_form and wpcf7_validate_configuration() ) { | |
| 1104 | - $config_validator = new WPCF7_ConfigValidator( $contact_form ); | |
| 1105 | - $config_validator->validate(); | |
| 1106 | - $config_validator->save(); | |
| 1107 | - } | |
| 1108 | - } | |
| 1109 | - add_action('save_post_wpcf7_contact_form', array($this, 'save_post'), 10,3); | |
| 1110 | - | |
| 1111 | - /** @since 4.9.2 fire form saving action so as to prevent double save_post hook calls on other plugins */ | |
| 1112 | - do_action('cf7sg_save_post',$post_id, $post, $update); | |
| 1113 | 889 | } |
| 1114 | 890 | /** |
| 1115 | 891 | * Print default js template, |
| 1116 | 892 | * Hooked to 'cf7sg_default_custom_js_template' |
| @@ -1129,9 +905,9 @@ | ||
| 1129 | 905 | *@param string $form_id form id to duplciate. |
| 1130 | 906 | */ |
| 1131 | 907 | public function duplicate_form_properties($new_form_id, $form_id){ |
| 1132 | 908 | //these properties will be preceded with an '_' by the cf7 plugin before being duplicated. |
| 1133 | - $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'); | |
| 1134 | 910 | $properties = apply_filters('cf7sg_duplicate_form_properties', $properties); |
| 1135 | 911 | foreach($properties as $field){ |
| 1136 | 912 | $value = get_post_meta($form_id, $field, true); |
| 1137 | 913 | if(!empty($value)) update_post_meta($new_form_id,$field, $value); |
| @@ -1155,19 +931,8 @@ | ||
| 1155 | 931 | if ( $form = wpcf7_contact_form( $_GET['post'] ) ) { |
| 1156 | 932 | $new_form = $form->copy(); |
| 1157 | 933 | $new_form->save(); |
| 1158 | 934 | $this->duplicate_form_properties($new_form->id(), $_GET['post']); |
| 1159 | - /** @since 4.11 duplicate js/css files */ | |
| 1160 | - $new_key = get_cf7form_key($new_form->id()); | |
| 1161 | - $key = get_cf7form_key($form->id()); | |
| 1162 | - $js_file = get_stylesheet_directory()."/js/{$key}.js"; | |
| 1163 | - if( file_exists($js_file) ){ | |
| 1164 | - copy($js_file, get_stylesheet_directory()."/js/{$new_key}.js"); | |
| 1165 | - } | |
| 1166 | - $css_file = get_stylesheet_directory()."/css/{$key}.css"; | |
| 1167 | - if( file_exists($css_file) ){ | |
| 1168 | - copy($css_file, get_stylesheet_directory()."/css/{$new_key}.css"); | |
| 1169 | - } | |
| 1170 | 935 | wp_safe_redirect( admin_url( '/post.php?post='.$new_form->id().'&action=edit' )); |
| 1171 | 936 | exit; |
| 1172 | 937 | } |
| 1173 | 938 | } |
| @@ -1242,23 +1007,35 @@ | ||
| 1242 | 1007 | * @since 1.0.0 |
| 1243 | 1008 | **/ |
| 1244 | 1009 | public function cf7_shortcode_tags(){ |
| 1245 | 1010 | if ( class_exists( 'WPCF7_TagGenerator' ) ) { |
| 1246 | - /** @since 4.10.0 enable extension of dynamic lists */ | |
| 1247 | 1011 | $tag_generator = WPCF7_TagGenerator::get_instance(); |
| 1248 | 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( | |
| 1249 | 1018 | 'benchmark', //tag id |
| 1250 | 1019 | __( 'benchmark', 'cf7_2_post' ), //tag button label |
| 1251 | 1020 | array($this,'benchmark_tag_generator') //callback |
| 1252 | 1021 | ); |
| 1253 | 1022 | } |
| 1254 | - /** @since 4.10.0 abstract out dynamic lists */ | |
| 1255 | - do_action('cf7sg_register_dynamic_lists'); | |
| 1256 | - $lists = cf7sg_get_dynamic_lists(); | |
| 1257 | - foreach($lists as $l) $l->register_cf7_tag(); | |
| 1258 | 1023 | } |
| 1259 | - | |
| 1260 | 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 | + /** | |
| 1261 | 1038 | * Benchmark input screen displayt. |
| 1262 | 1039 | * |
| 1263 | 1040 | * This function is called by cf7 plugin, and is registered with a hooked function above |
| 1264 | 1041 | * |
| @@ -1270,82 +1047,138 @@ | ||
| 1270 | 1047 | $args = wp_parse_args( $args, array() ); |
| 1271 | 1048 | include( plugin_dir_path( __FILE__ ) . '/partials/cf7-benchmark-tag.php'); |
| 1272 | 1049 | } |
| 1273 | 1050 | /** |
| 1274 | - * Print the dynamic list tag generator form. | |
| 1275 | - * Hooked on 'cf7sg_display_dynamic_list_tag_manager'. | |
| 1276 | - * allows other plugins to customise the tag manager for their own dynamic field. | |
| 1277 | - *@since 4.11.0 | |
| 1278 | - *@param String $tag_id dynamic list tag id. | |
| 1279 | - *@param CF7SG_Dynamic_list $dlo dynamic list object. | |
| 1280 | - *@param WPCF7_Contact_Form $form cf7 form object. | |
| 1281 | - *@param Array $args cf7 form shortcode attributes | |
| 1282 | - */ | |
| 1283 | - public function print_dynamic_list_generator($tag_id, $dlo, $form, $args){ | |
| 1284 | - 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" />'; | |
| 1285 | 1058 | } |
| 1286 | 1059 | /** |
| 1287 | - * Add custom imagegrid hook to taxonomy source. | |
| 1288 | - * Hooked to 'cf7sg_dynamic_tag_manager_taxonomy_source' | |
| 1289 | - *@since 4.11.0 | |
| 1290 | - *@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 | |
| 1291 | 1064 | */ |
| 1292 | - public function add_taxonomy_imagegrid_hook($tag_id){ | |
| 1293 | - if('dynamic_checkbox' != $tag_id) return; | |
| 1294 | - ?> | |
| 1295 | - <p class="imagegrid-filter display-none filter-hook"> | |
| 1296 | - <strong><?=__('Filter imagegrid image sources','cf7-grid-layout')?></strong><br /> | |
| 1297 | - <?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');?> | |
| 1298 | - </p> | |
| 1299 | - <?php | |
| 1300 | - } | |
| 1301 | - /** | |
| 1302 | - * Function to get classes to be added to the form wrapper. | |
| 1303 | - * these classes will be passed in the resource enqueue action, allowing for specific js/css resources | |
| 1304 | - * to be queued up and loaded on the page where the form is being displayed. | |
| 1305 | - * hooked to 'cf7sg_save_dynamic_list_form_classes' | |
| 1306 | - * @param Array array of classes to be added to the form wrapper. | |
| 1307 | - * @param WPCF7_FormTag cf7 tag object for the form field. | |
| 1308 | - * @param int $form_id cf7 fomr post ID.. | |
| 1309 | - * @return Array an array of classes to be added to the form to which this tag belonggs to. | |
| 1310 | - */ | |
| 1311 | - public function save_dynamic_list_form_classes($form_classes, $tag, $form_id){ | |
| 1312 | - /* Bookeeping, set up tagged select2 fields to filter newly added options in case Post My CF7 Form plugin is running */ | |
| 1313 | - $class = $tag->get_class_option(''); | |
| 1314 | - switch($tag->basetype){ | |
| 1315 | - case 'dynamic_select': | |
| 1316 | - if(strpos($class, 'select2')){ | |
| 1317 | - $form_classes[] = 'has-select2'; | |
| 1318 | - //track this field if user sets custom options. | |
| 1319 | - if(strpos($class, 'tags')){ | |
| 1320 | - $tagged_fields = get_post_meta($form_id, '_cf7sg_select2_tagged_fields', true); | |
| 1321 | - if(empty($tagged_fields)){ | |
| 1322 | - $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 | + } | |
| 1323 | 1099 | } |
| 1324 | - if( !isset($tagged_fields[$tag->name]) ){ | |
| 1325 | - $tagged_fields[$tag->name] = $source; | |
| 1326 | - 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; | |
| 1327 | 1110 | } |
| 1111 | + //store the taxonomy slug in the cf7 metas. | |
| 1112 | + //$post_lists[$slug] = null; | |
| 1328 | 1113 | } |
| 1329 | 1114 | } |
| 1330 | - if(false != strpos($class, 'nice-select') || false !=strpos($class, 'ui-select')){ | |
| 1331 | - $form_classes[] = 'has-nice-select'; | |
| 1332 | - } | |
| 1333 | - break; | |
| 1334 | - case 'dynamic_checkbox': | |
| 1335 | - switch(true){ | |
| 1336 | - case strpos($class, 'hybriddd'): | |
| 1337 | - case strpos($class, 'imagehdd'): | |
| 1338 | - case strpos($class, 'imagegrid'): | |
| 1339 | - case strpos($class, 'treeview'): | |
| 1340 | - $form_classes[] = 'has-hybriddd'; | |
| 1341 | - break; | |
| 1342 | - } | |
| 1343 | - 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 | + | |
| 1344 | 1128 | } |
| 1345 | - return $form_classes; | |
| 1346 | 1129 | } |
| 1130 | + | |
| 1347 | 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 | + /** | |
| 1348 | 1181 | * Deactivate this plugin if CF7 plugin is deactivated. |
| 1349 | 1182 | * Hooks on action 'admin_init' |
| 1350 | 1183 | * @since 2.1 |
| 1351 | 1184 | */ |
| @@ -1401,20 +1234,20 @@ | ||
| 1401 | 1234 | // Get array list of dismissed pointers for current user and convert it to array |
| 1402 | 1235 | $user_id = get_current_user_id(); |
| 1403 | 1236 | $dismissed_pointers = explode( ',', get_user_meta( $user_id, 'dismissed_wp_pointers', true ) ); |
| 1404 | 1237 | $pointers = array(); |
| 1405 | - $helpers = array(); | |
| 1406 | 1238 | /** |
| 1407 | 1239 | * Filter to add custom pointers for user iterface. |
| 1408 | 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). |
| 1409 | 1241 | * @return array an array of pointers, which will be checked agains the current user. |
| 1410 | 1242 | */ |
| 1411 | - $filter_pointers = apply_filters('cf7sg_plugin_pointers-'.$screen->id, array(),$dismissed_pointers); | |
| 1243 | + $filter_pointers = apply_filters('cf7sg_plugin_pointers-'.$screen->id, array()); | |
| 1412 | 1244 | foreach($filter_pointers as $id=>$pointer){ |
| 1413 | - $enqueue_pointer = true; | |
| 1414 | - 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; | |
| 1415 | 1248 | $pointers[$id] = array($pointer[0], $pointer[1], $pointer[2], $pointer[3]); |
| 1416 | - }else $helpers[$id] = $pointer; | |
| 1249 | + } | |
| 1417 | 1250 | } |
| 1418 | 1251 | // Enqueue pointer CSS and JS files, if needed |
| 1419 | 1252 | if( $enqueue_pointer ) { |
| 1420 | 1253 | wp_enqueue_style( 'wp-pointer' ); |
| @@ -1420,56 +1253,41 @@ | ||
| 1420 | 1253 | wp_enqueue_style( 'wp-pointer' ); |
| 1421 | 1254 | wp_enqueue_script( 'wp-pointer' ); |
| 1422 | 1255 | wp_enqueue_script('cf7sg-pointer-js', plugin_dir_url( __DIR__ ).'admin/js/cf7sg-pointers.js', array('jquery'), $this->version, true); |
| 1423 | 1256 | wp_localize_script('cf7sg-pointer-js', 'cf7sg_pointers', |
| 1424 | - array( | |
| 1425 | - 'pointers'=>$pointers, | |
| 1426 | - 'helpers'=>$helpers, | |
| 1427 | - 'next'=>__('Next', 'cf7-grid-layout') | |
| 1428 | - ) | |
| 1257 | + array('pointers'=>$pointers, 'next'=>__('Next', 'cf7-grid-layout')) | |
| 1429 | 1258 | ); |
| 1430 | 1259 | // Add footer scripts using callback function |
| 1431 | - | |
| 1260 | + //add_action( 'admin_print_footer_scripts', array($this, 'pretty_pointer_script') ); | |
| 1432 | 1261 | } |
| 1433 | 1262 | } |
| 1434 | - | |
| 1435 | 1263 | /** |
| 1436 | 1264 | * CF7 Table pointer notices. |
| 1437 | 1265 | * Hooked on 'cf7sg_plugin_pointers-edit-wpcf7_contact_form' |
| 1438 | 1266 | *@since 2.6.0 |
| 1439 | - *@param Array $pointers array of pointers to suplement | |
| 1440 | - *@param Array $dismissed array of dismissed pointer ids. | |
| 1441 | - *@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. | |
| 1442 | 1269 | */ |
| 1443 | - public function edit_pointers($pointers, $dismissed){ | |
| 1270 | + public function edit_pointers($pointers){ | |
| 1444 | 1271 | ob_start(); |
| 1445 | - /* update forms */ | |
| 1446 | - if( !in_array( 'update_forms_pointer', $dismissed ) ) { | |
| 1447 | - include_once 'partials/pointers/cf7sg-pointer-update-forms.php'; | |
| 1448 | - $content =ob_get_contents(); | |
| 1449 | - $pointers['update_forms_pointer'] = array($content, 'left', 'center',''); | |
| 1450 | - ob_clean(); | |
| 1451 | - } | |
| 1272 | + include_once 'partials/pointers/cf7sg-pointer-update-forms.php'; | |
| 1273 | + $content =ob_get_contents(); | |
| 1274 | + $pointers['update_forms_pointer'] = array($content, 'left', 'center',''); | |
| 1452 | 1275 | /* tutorials */ |
| 1453 | - if( !in_array( 'tutorials_pointer', $dismissed ) ) { | |
| 1454 | - include_once 'partials/pointers/cf7sg-pointer-tutorials.php'; | |
| 1455 | - $content =ob_get_contents(); | |
| 1456 | - $pointers['tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]'); | |
| 1457 | - ob_clean(); | |
| 1458 | - }else if( !in_array( 'new_tutorials_pointer', $dismissed ) ) { /* new tutorials */ | |
| 1459 | - include_once 'partials/pointers/cf7sg-pointer-tutorial-advance.php'; | |
| 1460 | - $content =ob_get_contents(); | |
| 1461 | - $pointers['new_tutorials_pointer'] = array($content, 'left', 'center','a[href="admin.php?page=cf7sg_help"]'); | |
| 1462 | - ob_clean(); | |
| 1463 | - } | |
| 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"]'); | |
| 1464 | 1285 | /* shortcodes */ |
| 1465 | - if( !in_array( 'cf7sg_shortcodes', $dismissed ) ) { | |
| 1466 | - include_once 'partials/pointers/cf7sg-pointer-shortcodes.php'; | |
| 1467 | - $content = ob_get_contents(); | |
| 1468 | - $pointers['cf7sg_shortcodes'] = array($content, 'top', 'top',''); | |
| 1469 | - ob_clean(); | |
| 1470 | - } | |
| 1471 | - 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',''); | |
| 1472 | 1290 | return $pointers; |
| 1473 | 1291 | } |
| 1474 | 1292 | /** |
| 1475 | 1293 | * CF7 Edit pointer notices. |
| @@ -1474,83 +1292,56 @@ | ||
| 1474 | 1292 | /** |
| 1475 | 1293 | * CF7 Edit pointer notices. |
| 1476 | 1294 | * Hooked on 'cf7sg_plugin_pointers-wpcf7_contact_form' |
| 1477 | 1295 | *@since 2.6.0 |
| 1478 | - *@param Array $pointers array of pointers to suplement | |
| 1479 | - *@param Array $dismissed array of dismissed pointer ids. | |
| 1480 | - *@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. | |
| 1481 | 1298 | */ |
| 1482 | - public function post_pointers($pointers, $dismissed){ | |
| 1299 | + public function post_pointers($pointers){ | |
| 1483 | 1300 | ob_start(); |
| 1484 | - /* full screen button */ | |
| 1485 | - if( !in_array( 'full_screen', $dismissed ) ) { | |
| 1486 | - include_once 'partials/pointers/cf7sg-pointer-editor-full-screen.php'; | |
| 1487 | - $content =ob_get_contents(); | |
| 1488 | - //content / arrow [top,bottom,left,right] / box align [top,bottom,center] / css selector. | |
| 1489 | - $pointers['full_screen'] = array($content, 'left', 'center','#full-screen-cf7'); | |
| 1490 | - ob_clean(); | |
| 1491 | - } | |
| 1492 | - /* editor_tabs */ | |
| 1493 | - if( !in_array( 'editor_tabs', $dismissed ) ) { | |
| 1494 | - include_once 'partials/pointers/cf7sg-pointer-editor-tabs.php'; | |
| 1495 | - $content =ob_get_contents(); | |
| 1496 | - $pointers['editor_tabs'] = array($content, 'right', 'center','#form-editor-tabs>ul>li.ui-tabs-active'); | |
| 1497 | - ob_clean(); | |
| 1498 | - } | |
| 1499 | - /* row_controls */ | |
| 1500 | - if( !in_array( 'row_controls', $dismissed ) ) { | |
| 1501 | - include_once 'partials/pointers/cf7sg-pointer-editor-rows-control.php'; | |
| 1502 | - $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)){ | |
| 1503 | 1315 | $pointers['row_controls'] = array($content, 'right', 'center','#grid-form>.container>.row>.row-controls'); |
| 1504 | 1316 | ob_clean(); |
| 1505 | 1317 | } |
| 1506 | 1318 | /* preview form */ |
| 1507 | - if( !in_array( 'preview_form', $dismissed ) ) { | |
| 1508 | - include_once 'partials/pointers/cf7sg-pointer-editor-preview-form.php'; | |
| 1509 | - $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)){ | |
| 1510 | 1323 | $pointers['preview_form'] = array($content, 'right', 'center','#preview-form-link'); |
| 1511 | 1324 | ob_clean(); |
| 1512 | 1325 | } |
| 1513 | - /* column controls */ | |
| 1514 | - if( !in_array( 'column_controls', $dismissed ) ) { | |
| 1515 | - include_once 'partials/pointers/cf7sg-pointer-editor-column-control.php'; | |
| 1516 | - $content = ob_get_contents(); | |
| 1517 | - $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'); | |
| 1518 | 1330 | ob_clean(); |
| 1519 | 1331 | } |
| 1520 | - /*dynamic-dropdown pointer*/ | |
| 1521 | - if( !in_array( 'dynamic_dropdown', $dismissed ) ) { | |
| 1522 | - include_once 'partials/pointers/cf7sg-pointer-tag-dynamic-dropdown.php'; | |
| 1523 | - $content = ob_get_contents(); | |
| 1524 | - $pointers['dynamic_dropdown'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="dynamic-dropdown"]'); | |
| 1525 | - ob_clean(); | |
| 1526 | - } | |
| 1527 | - /*dynamic-checkbox pointer*/ | |
| 1528 | - if( !in_array( 'dynamic_checkbox', $dismissed ) ) { | |
| 1529 | - include_once 'partials/pointers/cf7sg-pointer-tag-dynamic-checkbox.php'; | |
| 1530 | - $content = ob_get_contents(); | |
| 1531 | - $pointers['dynamic_checkbox'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="dynamic-checkbox"]'); | |
| 1532 | - ob_clean(); | |
| 1533 | - } | |
| 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(); | |
| 1534 | 1336 | /* #optional-editors */ |
| 1535 | - if( !in_array( 'js_css_editors', $dismissed ) ) { | |
| 1536 | - include_once 'partials/pointers/cf7sg-pointers-editor-optional-js-css.php'; | |
| 1537 | - $content = ob_get_contents(); | |
| 1538 | - $pointers['js_css_editors'] = array($content, 'left', 'center','#optional-editors'); | |
| 1539 | - ob_clean(); | |
| 1540 | - } | |
| 1541 | - /*benchmark pointer*/ | |
| 1542 | - if( !in_array( 'benchmark', $dismissed ) ) { | |
| 1543 | - include_once 'partials/pointers/cf7sg-pointer-tag-benchmark.php'; | |
| 1544 | - $content = ob_get_contents(); | |
| 1545 | - $pointers['benchmark'] = array($content, 'left', 'center','#top-tags>#tag-generator-list > a[title*="benchmark"]'); | |
| 1546 | - ob_clean(); | |
| 1547 | - } | |
| 1548 | - /*UI tags pointer include always*/ | |
| 1549 | - include_once 'partials/pointers/cf7sg-pointer-tag-ui-editor-tags.php'; | |
| 1337 | + include_once 'partials/pointers/cf7sg-pointers-editor-optional-js-css.php'; | |
| 1550 | 1338 | $content = ob_get_contents(); |
| 1551 | - $pointers['ui_editor_tags'] = $content; //controlled within js script | |
| 1552 | - 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"]'); | |
| 1553 | 1344 | return $pointers; |
| 1554 | 1345 | } |
| 1555 | 1346 | /** |
| 1556 | 1347 | * Rest meta_caps for better fine tuning of user caps. |
| @@ -1581,14 +1372,14 @@ | ||
| 1581 | 1372 | *@since 3.0.0 |
| 1582 | 1373 | *@param array $data sanitised post data. |
| 1583 | 1374 | *@return array post data. |
| 1584 | 1375 | */ |
| 1585 | - public function pending_for_review($data, $post){ | |
| 1376 | + public function pending_for_review($data){ | |
| 1586 | 1377 | if($this->cf7_post_type() != $data['post_type']) return $data; |
| 1587 | 1378 | |
| 1588 | 1379 | $post_type_object = get_post_type_object( $this->cf7_post_type() ); |
| 1589 | 1380 | //check if user can publish. |
| 1590 | - 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'){ | |
| 1591 | 1382 | $data['post_status']='pending'; |
| 1592 | 1383 | } |
| 1593 | 1384 | // debug_msg('post status '.$data['post_status']); |
| 1594 | 1385 | return $data; |
| @@ -1613,9 +1404,8 @@ | ||
| 1613 | 1404 | } |
| 1614 | 1405 | |
| 1615 | 1406 | /** @since 3.1.3 redirect cf7 plugin pages*/ |
| 1616 | 1407 | global $pagenow; |
| 1617 | - // debug_msg("page: $pagenow"); | |
| 1618 | 1408 | if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) ) { |
| 1619 | 1409 | $url = ''; |
| 1620 | 1410 | switch($_GET['page']){ |
| 1621 | 1411 | case 'wpcf7-new': |
| @@ -1629,12 +1419,8 @@ | ||
| 1629 | 1419 | if(!empty($url)){ |
| 1630 | 1420 | wp_redirect( admin_url( $url )); |
| 1631 | 1421 | exit; |
| 1632 | 1422 | } |
| 1633 | - }else if( $pagenow == 'edit.php' && isset( $_GET['post_type']) && $this->cf7_post_type()==$_GET['post_type'] ){ /** @since 4.11.5 buld validate */ | |
| 1634 | - if(isset($_POST['action']) && 'validate'==$_POST['action'] && function_exists('wpcf7_load_bulk_validate_page')){ | |
| 1635 | - wpcf7_load_bulk_validate_page('wpcf7','validate'); | |
| 1636 | - } | |
| 1637 | 1423 | } |
| 1638 | 1424 | } |
| 1639 | 1425 | /** |
| 1640 | 1426 | * Add grid helper hooks for individual tags. |
| @@ -1676,107 +1462,64 @@ | ||
| 1676 | 1462 | * hooked on 'admin_init' |
| 1677 | 1463 | *@since 4.1.0 |
| 1678 | 1464 | */ |
| 1679 | 1465 | public function init_notices(){ |
| 1680 | - global $pagenow; | |
| 1681 | - switch($pagenow){ | |
| 1682 | - case 'edit.php': | |
| 1683 | - case 'post.php': | |
| 1684 | - case 'plugins.php': | |
| 1685 | - break; | |
| 1686 | - default: | |
| 1687 | - return; | |
| 1688 | - } | |
| 1689 | - $grid_settings = get_option( self::CF7SG_OPTION, array()); | |
| 1466 | + $grid_settings = get_option( 'cf7sg-plugin-version', array()); | |
| 1690 | 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; | |
| 1691 | 1471 | $notices = array(); |
| 1692 | - if( !empty($grid_settings) and isset($grid_settings['update']) ){ | |
| 1693 | - $warning = false; | |
| 1694 | 1472 | |
| 1695 | - if(isset($grid_settings['update']) and CF7SG_VERSION_FORM_UPDATE==CF7_GRID_VERSION){ | |
| 1696 | - $warning = true; | |
| 1697 | - }else if(isset($grid_settings['fv']) ) { | |
| 1698 | - if(version_compare($grid_settings['fv'], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true; | |
| 1699 | - }else{ //check the forms directly | |
| 1700 | - global $wpdb; | |
| 1701 | - $post_type = $this->cf7_post_type(); | |
| 1702 | - $result = $wpdb->get_col("SELECT pm.meta_value FROM {$wpdb->postmeta} as pm | |
| 1703 | - INNER JOIN {$wpdb->posts} as p on p.ID = pm.post_id LEFT JOIN {$wpdb->postmeta} as pmf on pmf.post_id = pm.post_id | |
| 1704 | - WHERE pmf.meta_key = '_cf7sg_managed_form' | |
| 1705 | - AND pmf.meta_value = 1 | |
| 1706 | - WHERE p.post_type = '{$post_type}' | |
| 1707 | - AND pm.meta_key = '_cf7sg_version' | |
| 1708 | - ORDER BY pm.meta_key | |
| 1709 | - "); | |
| 1710 | - if(!empty($result) and version_compare($result[0], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true; | |
| 1711 | - } | |
| 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 | + } | |
| 1712 | 1488 | |
| 1713 | - if($warning){ | |
| 1714 | - $link = admin_url('edit.php?post_type=wpcf7_contact_form'); | |
| 1715 | - /* translators: %s is the url to the forms admin table */ | |
| 1716 | - $msg = __('You need to <strong>update</strong> your <a href="%s">forms</a>','cf7-grid-layout'); | |
| 1717 | - $notices['cf7sg_notice-'.CF7_GRID_VERSION] = array( | |
| 1718 | - 'type'=>'notice-warning', //[notice-update|notice-error] | |
| 1719 | - 'msg'=>sprintf($msg , $link), | |
| 1720 | - 'pages'=>array('plugins.php','edit.php') | |
| 1721 | - ); | |
| 1722 | - } | |
| 1723 | - /** @since 4.2.0 new sliders tutorial */ | |
| 1724 | - if( isset($grid_settings['update']) ){ | |
| 1725 | - $notices['cf7sg_sliders_tutorial'] = array( | |
| 1726 | - 'type'=>'notice-update', //[notice-update|notice-error] | |
| 1727 | - /* translators: %s is the link to the tuorial page*/ | |
| 1728 | - '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')), | |
| 1729 | - '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>', | |
| 1730 | - 'pages'=>array('plugins.php','edit.php') | |
| 1731 | - ); | |
| 1732 | - $notices['cf7sg_modular_tutorial'] = array( | |
| 1733 | - 'type'=>'notice-update', //[notice-update|notice-error] | |
| 1734 | - /* translators: %s is the link to the tuorial page*/ | |
| 1735 | - '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')), | |
| 1736 | - '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>', | |
| 1737 | - 'pages'=>array('plugins.php','edit.php') | |
| 1738 | - ); | |
| 1739 | - } | |
| 1740 | - update_option(self::CF7SG_OPTION, array( | |
| 1741 | - 'gv'=>CF7_GRID_VERSION, | |
| 1742 | - 'fv'=>CF7SG_VERSION_FORM_UPDATE | |
| 1743 | - )); | |
| 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 | + ); | |
| 1744 | 1498 | } |
| 1745 | - /** @since 4.11.5 add admin notices for bulk cf7 validation */ | |
| 1746 | - //check if cf7 found issues: | |
| 1747 | - | |
| 1748 | - if(method_exists('WPCF7','get_option')){ | |
| 1749 | - $result = WPCF7::get_option( 'bulk_validate' ); | |
| 1750 | - if(!empty($result)){ | |
| 1751 | - $has_errors = ( isset($result['count_invalid']) and $result['count_invalid']>0); | |
| 1752 | - $is_old = (defined('WPCF7_ConfigValidator::last_important_update') && | |
| 1753 | - isset($result['version']) && | |
| 1754 | - version_compare( $result['version'], WPCF7_ConfigValidator::last_important_update, '<')); | |
| 1755 | - if( $is_old or $has_errors){ | |
| 1756 | - ob_start(); | |
| 1757 | - wpcf7_admin_bulk_validate_page(); | |
| 1758 | - $html = ob_get_contents(); | |
| 1759 | - ob_end_clean(); | |
| 1760 | - $msg = ''; | |
| 1761 | - if($is_old){ | |
| 1762 | - $msg = __('CF7 plugin udpate requires you to revalidate your forms.','cf7-grid-layout'); | |
| 1763 | - }else if($has_errors){ | |
| 1764 | - $msg = sprintf( /* translators : %s is number of forms */ | |
| 1765 | - __('You have %s form(s) with errors flagged below, fix those before attempting to revalidate your forms','cf7-grid-layout'), | |
| 1766 | - $result['count_invalid'] | |
| 1767 | - ); | |
| 1768 | - } | |
| 1769 | - $notices['cf7sg_notice-cf7_validate'] = array( | |
| 1770 | - 'type'=>'notice-error', | |
| 1771 | - 'msg' => $msg, | |
| 1772 | - 'html'=>$html, | |
| 1773 | - 'pages'=>array('edit.php') | |
| 1774 | - ); | |
| 1775 | - } | |
| 1776 | - } | |
| 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 | + ); | |
| 1777 | 1515 | } |
| 1778 | 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 | + )); | |
| 1779 | 1522 | } |
| 1780 | 1523 | /** |
| 1781 | 1524 | * Display admin notices |
| 1782 | 1525 | * Hooked on 'admin_notices' |
| @@ -1785,9 +1528,8 @@ | ||
| 1785 | 1528 | public function admin_notices(){ |
| 1786 | 1529 | //check if we have any notices. |
| 1787 | 1530 | global $pagenow; |
| 1788 | 1531 | $notices = get_option('cf7sg-admin-notices', array()); |
| 1789 | - | |
| 1790 | 1532 | if(empty($notices)) return; |
| 1791 | 1533 | |
| 1792 | 1534 | if(!isset(self::$admin_notice_pages[$pagenow])) return; |
| 1793 | 1535 | |
| @@ -1792,8 +1534,9 @@ | ||
| 1792 | 1534 | if(!isset(self::$admin_notice_pages[$pagenow])) return; |
| 1793 | 1535 | |
| 1794 | 1536 | $notify=false; |
| 1795 | 1537 | $rule = self::$admin_notice_pages[$pagenow]; |
| 1538 | + // debug_msg($rule, 'notice rules '); | |
| 1796 | 1539 | if($pagenow=='post.php'){ |
| 1797 | 1540 | $screen = get_current_screen(); |
| 1798 | 1541 | if($this->cf7_post_type() == $screen->post_type) $notify=true; |
| 1799 | 1542 | }else if( !empty($rule) and is_array($rule) ){ |
| @@ -1816,16 +1559,10 @@ | ||
| 1816 | 1559 | } |
| 1817 | 1560 | if(!isset($notice['html'])) $notice['html'] = ''; |
| 1818 | 1561 | ?> |
| 1819 | 1562 | <style>.notice .inline-top{display: inline-block;vertical-align: top;margin-right: 10px;max-width: 300px;}</style> |
| 1820 | - <div data-dismissible="<?=$dismiss?>" class="notice <?=$notice['type']?> is-dismissible cf7sg-notice"> | |
| 1821 | - <?= empty($notice['msg'])?'':'<p>'.$notice['msg'].'</p>'?> | |
| 1822 | - <?=$notice['html']?> | |
| 1823 | - </div> | |
| 1563 | + <div data-dismissible="<?=$dismiss?>" class="notice <?=$notice['type']?> is-dismissible"><p><?=$notice['msg']?></p><?=$notice['html']?></div> | |
| 1824 | 1564 | <?php |
| 1825 | - /** @since 4.7.1 dismiss notices once displayed */ | |
| 1826 | - unset($notices[$id]); | |
| 1827 | - update_option('cf7sg-admin-notices', $notices); | |
| 1828 | 1565 | } |
| 1829 | 1566 | } |
| 1830 | 1567 | /** |
| 1831 | 1568 | * ajax request to validate plugin update. |
| @@ -1836,9 +1573,9 @@ | ||
| 1836 | 1573 | if( !isset($_POST['nonce']) or !wp_verify_nonce($_POST['nonce'], 'cf7sg_udpate_plugin') ){ |
| 1837 | 1574 | echo 'error, nonce failed, try to reload the page.'; |
| 1838 | 1575 | wp_die(); |
| 1839 | 1576 | } |
| 1840 | - $grid_settings = get_option(self::CF7SG_OPTION, array()); | |
| 1577 | + $grid_settings = get_option('cf7sg-plugin-version', array()); | |
| 1841 | 1578 | $warning = false; |
| 1842 | 1579 | if(isset($grid_settings['fv']) ) { |
| 1843 | 1580 | if(version_compare($grid_settings['fv'], CF7SG_VERSION_FORM_UPDATE, '<') ) $warning = true; |
| 1844 | 1581 | } |
| @@ -1844,9 +1581,9 @@ | ||
| 1844 | 1581 | } |
| 1845 | 1582 | $grid_settings['fv'] = CF7SG_VERSION_FORM_UPDATE; |
| 1846 | 1583 | $grid_settings['gv'] = CF7_GRID_VERSION; |
| 1847 | 1584 | $grid_settings['update'] = true; |
| 1848 | - update_option(self::CF7SG_OPTION, $grid_settings); | |
| 1585 | + update_option('cf7sg-plugin-version', $grid_settings); | |
| 1849 | 1586 | $update_msg = __('Version validated, thank you!','cf7-grid-layout'); |
| 1850 | 1587 | if($warning){ |
| 1851 | 1588 | $link = admin_url('edit.php?post_type=wpcf7_contact_form'); |
| 1852 | 1589 | /* translators: %s link to form table */ |
| @@ -1855,9 +1592,8 @@ | ||
| 1855 | 1592 | } |
| 1856 | 1593 | echo $update_msg; |
| 1857 | 1594 | wp_die(); |
| 1858 | 1595 | } |
| 1859 | - | |
| 1860 | 1596 | /** |
| 1861 | 1597 | * Check if plugin is getting updated. |
| 1862 | 1598 | * Hooked to 'upgrader_post_install'. |
| 1863 | 1599 | *@since 4.1.0 |
| @@ -1868,11 +1604,11 @@ | ||
| 1868 | 1604 | */ |
| 1869 | 1605 | public function post_plugin_upgrade($response, $extras, $result){ |
| 1870 | 1606 | if( ( isset($response['destination_name']) and 'cf7-grid-layout' == $response['destination_name'] ) |
| 1871 | 1607 | or ( isset($extras['plugin']) and 'cf7-grid-layout/cf7-grid-layout.php' == $extras['plugin'] ) ){ |
| 1872 | - $grid_settings = get_option(self::CF7SG_OPTION, array()); | |
| 1608 | + $grid_settings = get_option('cf7sg-plugin-version', array()); | |
| 1873 | 1609 | $grid_settings['update'] = true; |
| 1874 | - update_option(self::CF7SG_OPTION, $grid_settings); | |
| 1610 | + update_option('cf7sg-plugin-version', $grid_settings); | |
| 1875 | 1611 | } |
| 1876 | 1612 | return $response; |
| 1877 | 1613 | } |
| 1878 | 1614 | /** |
