Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3352831

Timestamp:

08/29/2025 05:46:07 PM (7 months ago)

Author:

grzelkowski

Message:

version 1.8.0

Location:

quick-ajax-post-loader/trunk

Files:

: 18 edited

admin/admin-pages-config.php (modified) (13 diffs)
admin/pages/settings-page.php (modified) (7 diffs)
admin/pages/shortcode-page.php (modified) (6 diffs)
css/admin-style.css (modified) (2 diffs)
css/admin-style.min.css (modified) (1 diff)
inc/actions.php (modified) (8 diffs)
inc/class-activator.php (modified) (1 diff)
inc/class-ajax.php (modified) (26 diffs)
inc/class-deprecated-hooks-handler.php (modified) (1 diff)
inc/class-helper.php (modified) (13 diffs)
inc/class-shortcode.php (modified) (6 diffs)
inc/class-template-hooks.php (modified) (10 diffs)
inc/class-updater.php (modified) (12 diffs)
inc/functions.php (modified) (4 diffs)
js/admin-script.js (modified) (2 diffs)
js/admin-script.min.js (modified) (1 diff)
quick-ajax-post-loader.php (modified) (2 diffs)
readme.txt (modified) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

quick-ajax-post-loader/trunk/admin/admin-pages-config.php

-                      r3295741
+                      r3352831
                 'Quick AJAX',
                 'manage_options',
                 QAPL_Quick_Ajax_Helper::menu_slug(),
+                QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_MENU_SLUG,
                 array($this, 'options_page_content'),
                 'dashicons-editor-code',
 …
             // "Add New"
             add_submenu_page(
                 QAPL_Quick_Ajax_Helper::menu_slug(),
+                QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_MENU_SLUG,
                 __('Add New', 'quick-ajax-post-loader'),
                 __('Add New', 'quick-ajax-post-loader'),
                 'edit_posts',
                 'post-new.php?post_type=' . QAPL_Quick_Ajax_Helper::cpt_shortcode_slug()
+                'post-new.php?post_type=' . QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG
             );
+        }
 …
             // "settings"
             add_submenu_page(
                 QAPL_Quick_Ajax_Helper::menu_slug(),
+                QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_MENU_SLUG,
                 __('Settings & Features', 'quick-ajax-post-loader'),
                 __('Settings & Features', 'quick-ajax-post-loader'),
                 'manage_options',
                 QAPL_Quick_Ajax_Helper::settings_page_slug(),
+                QAPL_Quick_Ajax_Plugin_Constants::SETTINGS_PAGE_SLUG,
                 array($this, 'render_quick_ajax_settings_page')
             );
 …
+            }
             if (class_exists('QAPL_Quick_Ajax_Creator_Settings_Page')) {
                 $form = new QAPL_Quick_Ajax_Creator_Settings_Page(QAPL_Quick_Ajax_Helper::admin_page_settings_field_option_group(), QAPL_Quick_Ajax_Helper::admin_page_global_options_name());
+                $form = new QAPL_Quick_Ajax_Creator_Settings_Page(QAPL_Quick_Ajax_Plugin_Constants::ADMIN_PAGE_SETTINGS_GROUP, QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME);
                 $form->render_quick_ajax_page();
+            }
 …
             // Register the settings group
             register_setting(
                 QAPL_Quick_Ajax_Helper::admin_page_settings_field_option_group(),
                 QAPL_Quick_Ajax_Helper::admin_page_global_options_name(),
+                QAPL_Quick_Ajax_Plugin_Constants::ADMIN_PAGE_SETTINGS_GROUP,
+                QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME,
                 array($this, 'quick_ajax_sanitize_callback')
             );
 …
         public function __construct() {
             add_action('init', array($this, 'register_quick_ajax_post_type'));
             add_action('manage_' . QAPL_Quick_Ajax_Helper::cpt_shortcode_slug() . '_posts_columns', array($this, 'quick_ajax_shortcode_column'));
             add_action('manage_' . QAPL_Quick_Ajax_Helper::cpt_shortcode_slug() . '_posts_custom_column', array($this, 'quick_ajax_shortcode_column_content'), 10, 2);
             add_filter('manage_' . QAPL_Quick_Ajax_Helper::cpt_shortcode_slug() . '_posts_columns', array($this, 'quick_ajax_shortcode_column_sort'));
+            add_action('manage_' . QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG . '_posts_columns', array($this, 'quick_ajax_shortcode_column'));
+            add_action('manage_' . QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG . '_posts_custom_column', array($this, 'quick_ajax_shortcode_column_content'), 10, 2);
+            add_filter('manage_' . QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG . '_posts_columns', array($this, 'quick_ajax_shortcode_column_sort'));
+        }
 …
                 'publicly_queryable'  => false,
                 'show_ui'             => true,
                 'show_in_menu'        => QAPL_Quick_Ajax_Helper::menu_slug(),
+                'show_in_menu'        => QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_MENU_SLUG,
                 'query_var'           => true,
                 'rewrite'             => array( 'slug' => QAPL_Quick_Ajax_Helper::cpt_shortcode_slug() ),
+                'rewrite'             => array( 'slug' => QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG ),
                 'capability_type'     => 'post',
                 'has_archive'         => true,
 …
                 'menu_icon'            => 'dashicons-editor-code'
             );
             register_post_type( QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), $args );
+            register_post_type( QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, $args );
+        }
 …
             //add Shortcode Column Content
             if ($column_name === 'quick_ajax_shortcode_column') {
+                $excluded_post_ids = '';
+                $shortcode = QAPL_Quick_Ajax_Helper::generate_shortcode($post_id);
+                $shortcode = QAPL_Quick_Ajax_Shortcode_Generator::generate_shortcode($post_id);
                 echo '<div class="quick-ajax-shortcode">' . esc_html($shortcode)  . '</div>';
+            }
 …
     protected function get_taxonomy_options_for_post_type(?string $post_type = null): array{
         if (empty($post_type)) {
             $post_type = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type());
+            $post_type = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE);
             if (empty($post_type)) {
                 $post_type = QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type_default_value();
+                $post_type = QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE_DEFAULT;
+            }
+        }
 …
         if (empty($taxonomy)) {
             // try to get taxonomy from saved shortcode value
             $taxonomy = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy());
+            $taxonomy = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY);
+        }
         if (empty($taxonomy)) {
             // try to get first available taxonomy based on post type
             $post_type = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type());
+            $post_type = $this->get_the_value_if_exist(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE);
             if (empty($post_type)) {
                 // fallback to default post type
                 $post_type = QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type_default_value();
+                $post_type = QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE_DEFAULT;
+            }
             if (!empty($post_type)) {
 …
             echo '<div class="quick-ajax-form-wrap '.esc_attr($this->get_quick_ajax_form_class()).'" id="' . esc_attr($this->form_id) . '">';
             echo wp_kses($this->render_quick_ajax_form(), $this->wp_kses_allowed_tags());
             wp_nonce_field(QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_action(), QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_field());
+            wp_nonce_field(QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_ACTION, QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_FIELD);
             echo '</div>';
+        }
 …
             return;
+        }
         if (!isset($_POST[QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_field()]) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST[QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_field()])), QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_action())) {
+        if (!isset($_POST[QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_FIELD]) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST[QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_FIELD])), QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_ACTION)) {
             return;
+        }

quick-ajax-post-loader/trunk/admin/pages/settings-page.php

-                      r3321429
+                      r3352831
         private function init_global_options_fields() {
             //select loader icon
+            $field_properties = QAPL_Form_Fields_Helper::get_global_field_select_loader_icon();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_read_more_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_show_all_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_load_more_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_no_post_message();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_end_post_message();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_select_loader_icon();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_read_more_text_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_show_all_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_load_more_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_no_post_message_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_end_post_message_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Sorting Options
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_date_desc_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_date_asc_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_comment_count_desc_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_title_desc_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_title_asc_label();
+            $this->create_field($field_properties);
+            $field_properties = QAPL_Form_Fields_Helper::get_global_options_field_set_sort_option_rand_label();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_date_desc_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_date_asc_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_comment_count_desc_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_title_desc_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_title_asc_label_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_sort_option_rand_label_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
+        }
 …
         private function init_function_generator_fields() {
             //select post type
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_post_type();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_post_type_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //show taxonomy checkbox
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_taxonomy_filter();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_taxonomy_filter_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select taxonomy
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_taxonomy();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_taxonomy_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //manual term selection checkbox
+            $field_properties = QAPL_Form_Fields_Helper::get_field_manual_term_selection();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_manual_term_selection_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //manual selected terms multiselect
+            $field_properties = QAPL_Form_Fields_Helper::get_field_manual_selected_terms();
+            $this->create_field($field_properties);
+            //select post status
+            //$field_properties = QAPL_Form_Fields_Helper::get_field_select_post_status();
+            //$this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_manual_selected_terms_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
             //post per page number
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_posts_per_page();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_posts_per_page_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post order
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_order();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_order_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post orderby
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_orderby();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_orderby_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Sorting Settings
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_sort_button();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_sort_button_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select sort options
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_sort_button_options();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_sort_button_options_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Additional Settings
             //add Excluded Post IDs
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_post_not_in();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_excluded_post_ids_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //set ignore sticky
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ignore_sticky_posts();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ignore_sticky_posts_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //load posts via AJAX on initial load
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ajax_on_initial_load();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ajax_on_initial_load_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Infinite Scroll
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ajax_infinite_scroll();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ajax_infinite_scroll_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Show end message
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_show_end_message();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_end_message_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Additional Settings
             //apply quick ajax css style
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_quick_ajax_css_style();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_quick_ajax_css_style_field();
+            $field_properties = $field->get_field();
             $field_properties['default'] = 0;
             $this->create_field($field_properties);
             //select number of columns
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_select_columns_qty();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_columns_qty_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post item template
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_post_item_template();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_post_item_template_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //add custom class for taxonomy filter
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_taxonomy_filter_class();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_taxonomy_filter_class_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //add custom class for container
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_container_class();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_container_class_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //show custom load more post quantity
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_custom_load_more_post_quantity();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_custom_load_more_post_quantity_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select custom load more post quantity
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_custom_load_more_post_quantity();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_custom_load_more_post_quantity_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //override loader icon
+            $field_properties = QAPL_Form_Fields_Helper::get_field_override_global_loader_icon();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_override_global_loader_icon_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select loader icon
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_loader_icon();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_loader_icon();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
+        }
 …
         private function init_content_clear_old_data_fields() {
             //remove old data
+            $field_properties = QAPL_Form_Fields_Helper::get_global_field_remove_old_data();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_global_remove_old_data_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
+        }
 …
             $tab_title = esc_html__('Help', 'quick-ajax-post-loader');
             $this->add_quick_ajax_page_content($this->tabIndex++, $tab_title, $this->quick_ajax_content_help());
             $cleanup_flags = QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags();
+            $cleanup_flags = QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS;
             if (!empty(get_option($cleanup_flags))) {
                 $tab_title = esc_html__('Purge Old Data', 'quick-ajax-post-loader');
 …
             $content .= '<form method="post" action="options.php">';
             $content .= '<h3>'.__('Global Options', 'quick-ajax-post-loader').'</h3>';
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_select_loader_icon());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_read_more_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_show_all_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_load_more_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_no_post_message());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_end_post_message());
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_LOADER_ICON_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_READ_MORE_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SHOW_ALL_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_LOAD_MORE_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_NO_POST_MESSAGE_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_END_POST_MESSAGE_FIELD);
             $content .= '<h4>'.__('Sorting Option Labels', 'quick-ajax-post-loader').'</h4>';
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_date_desc_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_date_asc_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_comment_count_desc_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_title_asc_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_title_desc_label());
             $content .= $this->add_field(QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_rand_label());
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_DATE_DESC_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_DATE_ASC_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_COMMENT_COUNT_DESC_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_TITLE_ASC_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_TITLE_DESC_LABEL_FIELD);
+            $content .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_SORT_OPTION_RAND_LABEL_FIELD);
             $content .= $settings_fields_html;
             $content .= get_submit_button(esc_html__('Save Settings', 'quick-ajax-post-loader'), 'primary', 'save_settings_button', false);
 …
             $form_tab_function_generator = '<h3>'.esc_html__('Function Generator', 'quick-ajax-post-loader').'</h3>
             <div class="function-generator-wrap">
                 <div class="function-generator-options" id="'.QAPL_Quick_Ajax_Helper::settings_wrapper_id().'">';
+                <div class="function-generator-options" id="'.QAPL_Quick_Ajax_Plugin_Constants::SETTINGS_WRAPPER_ID.'">';
             $form_tab_function_generator .= '<div class="quick-ajax-layout-settings">';
             $form_tab_function_generator .= '<h4>'.__('General Settings', 'quick-ajax-post-loader').'</h4>';
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type());
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE);
             //show taxonomy checkbox
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter(), $field_options);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER, $field_options);
             //taxonomy select option
             $this->fields[QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy()]['options'] = $this->get_taxonomy_options_for_post_type();
+            $this->fields[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY]['options'] = $this->get_taxonomy_options_for_post_type();
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
+                    QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy(), $field_options);
+            //$form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_status());
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY, $field_options);
             // manual term selection checkbox
             $field_options = $this->field_options([
                 'is_trigger' => true,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_MANUAL_TERM_SELECTION, $field_options);
             // assign term options to field
             $this->fields[QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms()]['options'] = $this->get_term_options_for_taxonomy();
+            $this->fields[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECTED_TERMS]['options'] = $this->get_term_options_for_taxonomy();
             // render field with multiple conditions
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection() => '1',
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_MANUAL_TERM_SELECTION => '1',
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECTED_TERMS, $field_options);
             //end manual term selection checkbox
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_posts_per_page());
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POSTS_PER_PAGE);
             $form_tab_function_generator .= '</div>';
             //post settings
             $form_tab_function_generator .= '<div class="quick-ajax-layout-settings" style="margin-top:20px">';
             $form_tab_function_generator .= '<h4>'.__('Sorting Settings', 'quick-ajax-post-loader').'</h4>';
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_order());
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_orderby());
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDER);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDERBY);
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button(), $field_options);
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options(), $field_options);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON, $field_options);
+            $field_options = $this->field_options([
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS, $field_options);
             $form_tab_function_generator .= '</div>';
             $form_tab_function_generator .= '<div class="quick-ajax-layout-settings" style="margin-top:20px">';
             $form_tab_function_generator .= '<h4>'.esc_html__('Additional Settings', 'quick-ajax-post-loader').'</h4>';
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_set_post_not_in());
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ignore_sticky_posts());
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ajax_on_initial_load());
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ajax_infinite_scroll());
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_end_message());
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SET_POST_NOT_IN);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_IGNORE_STICKY_POSTS);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_ON_INITIAL_LOAD);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_INFINITE_SCROLL);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_END_MESSAGE);
             $form_tab_function_generator .= '</div>';
             $form_tab_function_generator .= '<div class="quick-ajax-layout-settings" style="margin-top:20px">';
 …
                 'is_trigger' => true,
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style(), $field_options);
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_select_columns_qty(), $field_options);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template());
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE, $field_options);
+            $field_options = $this->field_options([
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_COLUMNS_QTY, $field_options);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_POST_ITEM_TEMPLATE);
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_taxonomy_filter_class(), $field_options);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_container_class());
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_TAXONOMY_FILTER_CLASS, $field_options);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_CONTAINER_CLASS);
+            $field_options = $this->field_options([
+                'is_trigger' => true,
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY, $field_options);
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_custom_load_more_post_quantity(), $field_options);
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY, $field_options);
+            $field_options = $this->field_options([
+                'is_trigger' => true,
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON, $field_options);
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon() => '1'
+                ]
             ]);
             $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON => '1'
+                ]
+            ]);
+            $form_tab_function_generator .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_LOADER_ICON, $field_options);
             $form_tab_function_generator .= '</div>';
             $form_tab_function_generator .= '</div>';

quick-ajax-post-loader/trunk/admin/pages/shortcode-page.php

-                      r3287563
+                      r3352831
 function qapl_quick_ajax_display_shortcode_on_single_page($post) {
     //check the post type
     if ($post && $post->post_type === QAPL_Quick_Ajax_Helper::cpt_shortcode_slug()) {
         $shortcode = QAPL_Quick_Ajax_Helper::generate_shortcode($post->ID);
+    if ($post && $post->post_type === QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG) {
+        $shortcode = QAPL_Quick_Ajax_Shortcode_Generator::generate_shortcode($post->ID);
         echo '<div id="shortcode-box-wrap">';
         echo '<span class="shortcode-description">' . esc_html__('Copy and paste this shortcode on the page to display the posts list', 'quick-ajax-post-loader') . '</span>';
 …
         public function init_quick_ajax_creator_fields(){
             //select post type
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_post_type();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_post_type_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //show taxonomy checkbox
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_taxonomy_filter();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_taxonomy_filter_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select taxonomy
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_taxonomy();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_taxonomy_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //manual term selection checkbox
+            $field_properties = QAPL_Form_Fields_Helper::get_field_manual_term_selection();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_manual_term_selection_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //manual selected terms multiselect
+            $field_properties = QAPL_Form_Fields_Helper::get_field_manual_selected_terms();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_manual_selected_terms_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //post per page number
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_posts_per_page();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_posts_per_page_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post order
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_order();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_order_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post orderby
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_orderby();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_orderby_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //show sort button
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_sort_button();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_sort_button_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select sort options
             $field_properties = QAPL_Form_Fields_Helper::get_field_select_sort_button_options();
             $this->create_field($field_properties);
             $field_properties = QAPL_Form_Fields_Helper::get_field_show_inline_filter_sorting();
             $this->create_field($field_properties);
             //select post status
             //$field_properties = QAPL_Form_Fields_Helper::get_field_select_post_status();
+            //$this->create_field($field_properties);
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_sort_button_options_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
+            //inline Filter & Sorting
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_inline_filter_sorting_field();
+            $field_properties = $field->get_field();
+            $this->create_field($field_properties);
             //add Excluded Post IDs
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_post_not_in();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_excluded_post_ids_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //set ignore sticky
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ignore_sticky_posts();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ignore_sticky_posts_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //load posts via AJAX on initial load
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ajax_on_initial_load();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ajax_on_initial_load_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Infinite Scroll
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_ajax_infinite_scroll();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_ajax_infinite_scroll_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //Show end message
+            $field_properties = QAPL_Form_Fields_Helper::get_field_set_show_end_message();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_end_message_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //apply quick ajax css style
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_quick_ajax_css_style();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_quick_ajax_css_style_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select number of columns
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_select_columns_qty();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_columns_qty_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select post item template
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_post_item_template();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_post_item_template_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //add custom class for taxonomy filter
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_taxonomy_filter_class();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_taxonomy_filter_class_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //add custom class for container
+            $field_properties = QAPL_Form_Fields_Helper::get_field_layout_container_class();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_container_class_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //show custom load more post quantity
+            $field_properties = QAPL_Form_Fields_Helper::get_field_show_custom_load_more_post_quantity();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_show_custom_load_more_post_quantity_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select custom load more post quantity
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_custom_load_more_post_quantity();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_custom_load_more_post_quantity_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //override loader icon
+            $field_properties = QAPL_Form_Fields_Helper::get_field_override_global_loader_icon();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_override_global_loader_icon_field();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
             //select loader icon
+            $field_properties = QAPL_Form_Fields_Helper::get_field_select_loader_icon();
+            $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_loader_icon();
+            $field_properties = $field->get_field();
             $this->create_field($field_properties);
+        }
 …
             $shortcode_page .= '<h4>'.esc_html__('General Settings', 'quick-ajax-post-loader').'</h4>';
             //select post type
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type());
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE);
             //show taxonomy checkbox
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter(), $field_options);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER, $field_options);
             //select taxonomy
             $this->fields[QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy()]['options'] = $this->get_taxonomy_options_for_post_type();
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+            $this->fields[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY]['options'] = $this->get_taxonomy_options_for_post_type();
+            $field_options = $this->field_options([
+                'is_trigger' => false,
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
             ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy(), $field_options);
+            //$shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_post_status());
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY, $field_options);
             // manual term selection checkbox
 …
                 'is_trigger' => true,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_MANUAL_TERM_SELECTION, $field_options);
             // assign term options to field
             $this->fields[QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms()]['options'] = $this->get_term_options_for_taxonomy();
+            $this->fields[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECTED_TERMS]['options'] = $this->get_term_options_for_taxonomy();
             // render field with multiple conditions
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection() => '1',
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms(), $field_options);
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_MANUAL_TERM_SELECTION => '1',
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECTED_TERMS, $field_options);
             //end manual term selection checkbox
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_posts_per_page());
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POSTS_PER_PAGE);
             $shortcode_page .= '</div>';
             $shortcode_page .= '<div class="quick-ajax-layout-settings" style="margin-top:20px">';
             $shortcode_page .= '<h4>'.esc_html__('Sorting Settings', 'quick-ajax-post-loader').'</h4>';
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_order());
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_orderby());
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDER);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDERBY);
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button(), $field_options);
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options(), $field_options);
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_inline_filter_sorting(), $field_options);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON, $field_options);
+            $field_options = $this->field_options([
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS, $field_options);
+            $field_options = $this->field_options([
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_INLINE_FILTER_SORTING, $field_options);
             $shortcode_page .= '</div>';
             $shortcode_page .= '<div class="quick-ajax-layout-settings" style="margin-top:20px">';
             $shortcode_page .= '<h4>'.esc_html__('Additional Settings', 'quick-ajax-post-loader').'</h4>';
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_set_post_not_in());
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ignore_sticky_posts());
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ajax_on_initial_load());
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_ajax_infinite_scroll());
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_end_message());
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SET_POST_NOT_IN);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_IGNORE_STICKY_POSTS);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_ON_INITIAL_LOAD);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_INFINITE_SCROLL);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_END_MESSAGE);
             $shortcode_page .= '</div>';
 …
                 'is_trigger' => true,
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style(), $field_options);
             $field_options = $this->field_options([
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_select_columns_qty(), $field_options);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template());
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_taxonomy_filter_class(), $field_options);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_layout_container_class());
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity(),$field_options);
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_custom_load_more_post_quantity(), $field_options);
             $field_options = $this->field_options([
                 'is_trigger' => true,
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon(), $field_options);
             $field_options = $this->field_options([
                 'is_trigger' => false,
                 'visible_if' => [
                     QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon() => '1'
+                ]
             ]);
             $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon(), $field_options);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE, $field_options);
+            $field_options = $this->field_options([
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_COLUMNS_QTY, $field_options);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_POST_ITEM_TEMPLATE);
+            $field_options = $this->field_options([
+                'is_trigger' => false,
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_TAXONOMY_FILTER_CLASS, $field_options);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_CONTAINER_CLASS);
+            $field_options = $this->field_options([
+                'is_trigger' => true,
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY, $field_options);
+            $field_options = $this->field_options([
+                'is_trigger' => false,
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY, $field_options);
+            $field_options = $this->field_options([
+                'is_trigger' => true,
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON, $field_options);
+            $field_options = $this->field_options([
+                'is_trigger' => false,
+                'visible_if' => [
+                    QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON => '1'
+                ]
+            ]);
+            $shortcode_page .= $this->add_field(QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_LOADER_ICON, $field_options);
             $shortcode_page .= '</div>';
 …
+        }
+    }
     if ($post_type === QAPL_Quick_Ajax_Helper::cpt_shortcode_slug()) {
         $form = new QAPL_Quick_Ajax_Form_Creator(QAPL_Quick_Ajax_Helper::settings_wrapper_id(), QAPL_Quick_Ajax_Helper::quick_ajax_shortcode_settings(), $post_type);
+    if ($post_type === QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG) {
+        $form = new QAPL_Quick_Ajax_Form_Creator(QAPL_Quick_Ajax_Plugin_Constants::SETTINGS_WRAPPER_ID, QAPL_Quick_Ajax_Plugin_Constants::DB_POSTMETA_SHORTCODE_SETTINGS, $post_type);
+    }
+}

quick-ajax-post-loader/trunk/css/admin-style.css

-                      r3337932
+                      r3352831
             flex: 1 1 0;
+}
-.quick-ajax-form-wrap .quick-ajax-field-container select,
-.quick-ajax-form-wrap .quick-ajax-field-container input{
-    margin: 0;
+}
 .quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field > div,
 .quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field > select,
 …
     max-width: 100%;
     width: 100%;
+    margin: 0;
+}
 .quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options{

quick-ajax-post-loader/trunk/css/admin-style.min.css

r3337932	r3352831
1		#shortcode-box-wrap,.quick-ajax-form-wrap{--qapl-theme-color:#2271b1;--qapl-bg:#ffffff;--qapl-bg-muted:#f6f7f7;--qapl-border:#c3c4c7;--qapl-text-muted:#50575e;--qapl-switch-bg:#cccccc;--qapl-switch-shadow:rgba(0,0,0,0.5);--qapl-tab-bg:#dcdcdc;--qapl-code-bg:#fcfcfc}.light-style{--qapl-theme-color:#04a4cc}.modern-style{--qapl-theme-color:#3858e9}.blue-style{--qapl-theme-color:#e1a948}.coffee-style{--qapl-theme-color:#c7a589}.ectoplasm-style{--qapl-theme-color:#a3b745}.midnight-style{--qapl-theme-color:#e14d43}.ocean-style{--qapl-theme-color:#9ebaa0}.sunrise-style{--qapl-theme-color:#dd823b}#shortcode-box-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:16px}#shortcode-box-wrap .shortcode-description{padding:0 2px;margin-bottom:4px}#shortcode-box-wrap .click-and-select-all{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:auto}#shortcode-box-wrap pre{margin:0;padding:10px 10px 11px;border:1px solid #8c8f94;border-radius:3px;background:var(--qapl-code-bg)}#shortcode-box-wrap code{line-height:1;background:var(--qapl-code-bg);white-space:pre-wrap;word-break:break-word;cursor:pointer}.quick-ajax-form-wrap .switch-checkbox{display:inline-block;min-height:30px}.quick-ajax-form-wrap .switch-wrap{position:relative;width:40px;height:20px;margin-top:6px}.quick-ajax-form-wrap .switch-wrap input{opacity:0;width:0;height:0}.quick-ajax-form-wrap .switch{border-radius:12px}.quick-ajax-form-wrap .switch:before{border-radius:50%}.quick-ajax-form-wrap input+.switch{position:absolute;cursor:pointer;top:-1px;left:0;right:0;bottom:1px;background-color:var(--qapl-switch-bg);-webkit-box-shadow:inset 0 0 3px var(--qapl-switch-shadow);box-shadow:inset 0 0 3px var(--qapl-switch-shadow);-webkit-transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease}.quick-ajax-form-wrap .switch:before{position:absolute;content:"";height:14px;width:14px;left:3px;bottom:3px;background-color:var(--qapl-bg);-webkit-transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease}.quick-ajax-form-wrap input:checked+.switch{background-color:var(--qapl-theme-color);-webkit-box-shadow:inset 0 0 3px var(--qapl-switch-shadow);box-shadow:inset 0 0 3px var(--qapl-switch-shadow)}.quick-ajax-form-wrap input:checked+.switch:before{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px)}.quick-ajax-form-wrap{margin-top:2rem;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.quick-ajax-form-wrap select:focus{border-color:var(--qapl-theme-color);-webkit-box-shadow:0 0 0 1px var(--qapl-theme-color);box-shadow:0 0 0 1px var(--qapl-theme-color)}.quick-ajax-form-wrap .quick-ajax-field-container{position:relative;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;gap:16px;visibility:visible;opacity:1;margin-bottom:16px;-webkit-transition:opacity .15s ease,margin-bottom .15s ease;transition:opacity .15s ease,margin-bottom .15s ease}.quick-ajax-form-wrap .quick-ajax-field-container.inactive{visibility:hidden;height:0;opacity:0;margin-bottom:0}.quick-ajax-form-wrap .quick-ajax-field-container>label{-webkit-box-flex:0;-ms-flex:0 0 210px;flex:0 0 210px;margin-top:6px}.quick-ajax-form-wrap .quick-ajax-field-container>.quick-ajax-field{max-width:580px;-webkit-box-flex:1;-ms-flex:1 1 0px;flex:1 1 0}.quick-ajax-form-wrap .quick-ajax-field-container input,.quick-ajax-form-wrap .quick-ajax-field-container select{margin:0}.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>div,.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>input,.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>select{max-width:100%;width:100%}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option{-webkit-box-flex:0;-ms-flex:0 1 calc(100% / 3);flex:0 1 calc(100% / 3);min-width:180px;padding:6px 0;min-height:32px;-webkit-box-sizing:border-box;box-sizing:border-box}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option label{cursor:pointer}.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field-desc{margin-top:5px;margin-bottom:0;color:var(--qapl-text-muted);font-style:italic}@media (max-width:782px){.quick-ajax-form-wrap .quick-ajax-field-container>label{-ms-flex-preferred-size:100%;flex-basis:100%;margin-top:0;margin-right:0}.quick-ajax-form-wrap .quick-ajax-field-container>.quick-ajax-field{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}}.quick-ajax-tabs{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;overflow:hidden}.quick-ajax-tabs:before{content:'';position:absolute;width:100%;bottom:0;height:1px;background-color:var(--qapl-border)}.quick-ajax-tab-button{position:relative;padding:5px 10px;cursor:pointer;z-index:0;background:var(--qapl-tab-bg);border:1px solid var(--qapl-border);border-top-left-radius:3px;border-top-right-radius:3px;border-bottom-left-radius:0;border-bottom-right-radius:0;margin:0 5px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition:background-color .3s ease,border-color .3s ease;transition:background-color .3s ease,border-color .3s ease}.quick-ajax-tab-button:first-of-type{margin-left:0}.quick-ajax-tab-button:hover{background:var(--qapl-bg-mute)}.quick-ajax-tab-button.active{background:var(--qapl-bg);z-index:1;border-bottom:1px solid var(--qapl-bg)}.quick-ajax-tab-content,.quick-ajax-tab-content[hidden]{position:relative;background:var(--qapl-bg);padding:16px;border:1px solid var(--qapl-border);-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);display:none}.quick-ajax-tab-content.active{display:block}.quick-ajax-tab-content+.quick-ajax-tab-content,.quick-ajax-tabs+.quick-ajax-tab-content{border-top:none}.function-generator-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:start;-webkit-column-gap:100px;-moz-column-gap:100px;column-gap:100px}.function-generator-options{max-width:580px}.function-generator-options .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option{min-width:50%}.function-generator-result{width:auto;-webkit-box-flex:1;-ms-flex:1;flex:1;max-width:480px}.function-generator-result>pre{overflow:auto}@media (max-width:1200px){.function-generator-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.function-generator-options,function-generator-result{width:100%;max-width:unset}}.quick-ajax-form-wrap code.no-background{background:0 0;padding:3px 0 2px;font-size:14px}.quick-ajax-form-wrap code.code-tag{padding:2px 4px 3px;margin:0 1px;background:rgba(0,0,0,.07)}.quick-ajax-form-wrap pre{white-space:pre-wrap;word-wrap:break-word}.quick-ajax-form-wrap ul.ul-numbered{list-style-type:decimal;padding-left:13px}.quick-ajax-form-wrap li ul{margin-top:6px}.quick-ajax-accordion-wrapper{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;overflow:hidden;margin-bottom:16px}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 1.5em;min-height:44px;background:var(--qapl-bg);border:1px solid var(--qapl-border);cursor:pointer;outline:unset}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:hover{background:var(--qapl-bg-muted)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:active,.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:focus{outline-width:2px;outline-style:solid;outline-offset:-2px;outline-color:var(--qapl-theme-color);background-color:var(--qapl-bg-muted);z-index:1}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active{background:var(--qapl-bg)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active:hover{background:var(--qapl-bg-muted)}.quick-ajax-accordion-wrapper .accordion-title{max-width:calc(100% - 26px);font-size:13px;font-weight:600;line-height:1;margin:0}.quick-ajax-accordion-wrapper .accordion-icon{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transform:rotateX(0);transform:rotateX(0);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active .accordion-icon{-webkit-transform:rotateX(180deg);transform:rotateX(180deg)}.quick-ajax-accordion-wrapper .accordion-icon span{pointer-events:none;position:absolute;border:solid #50575e;border-width:0 2px 2px 0;height:.5rem;width:.5rem;top:50%;right:0;-webkit-transform:translateY(-70%) rotate(45deg);-ms-transform:translateY(-70%) rotate(45deg);transform:translateY(-70%) rotate(45deg)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-content{display:none;border:1px solid var(--qapl-border);border-top:none;padding:0 1.5em 1em 1.5em}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active+.quick-ajax-accordion-content:before{content:"";position:absolute;display:block;background:var(--qapl-bg);height:1px;left:1px;right:1px;margin-top:-1px}.qapl-admin-page-loader{position:relative;height:20px;width:40px;padding:6px 0;margin-left:0;vertical-align:middle}.qapl-admin-page-loader span{position:absolute;top:50%;left:0;width:6px;height:6px;background-color:#50575e;border-radius:50%;-webkit-transform:translate(0,-50%);-ms-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0;-webkit-animation:qapl-admin-loader-animation 1.8s linear infinite;animation:qapl-admin-loader-animation 1.8s linear infinite}.qapl-admin-page-loader span:nth-child(1){-webkit-animation-delay:0s;animation-delay:0s}.qapl-admin-page-loader span:nth-child(2){-webkit-animation-delay:.6s;animation-delay:.6s}.qapl-admin-page-loader span:nth-child(3){-webkit-animation-delay:1.2s;animation-delay:1.2s}@-webkit-keyframes qapl-admin-loader-animation{0%{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0}10%{opacity:1}50%{-webkit-transform:translate(20px,-50%);transform:translate(20px,-50%);opacity:1}90%{opacity:0}100%{-webkit-transform:translate(40px,-50%);transform:translate(40px,-50%);opacity:0}}@keyframes qapl-admin-loader-animation{0%{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0}10%{opacity:1}50%{-webkit-transform:translate(20px,-50%);transform:translate(20px,-50%);opacity:1}90%{opacity:0}100%{-webkit-transform:translate(40px,-50%);transform:translate(40px,-50%);opacity:0}}
	1	#shortcode-box-wrap,.quick-ajax-form-wrap{--qapl-theme-color:#2271b1;--qapl-bg:#ffffff;--qapl-bg-muted:#f6f7f7;--qapl-border:#c3c4c7;--qapl-text-muted:#50575e;--qapl-switch-bg:#cccccc;--qapl-switch-shadow:rgba(0,0,0,0.5);--qapl-tab-bg:#dcdcdc;--qapl-code-bg:#fcfcfc}.light-style{--qapl-theme-color:#04a4cc}.modern-style{--qapl-theme-color:#3858e9}.blue-style{--qapl-theme-color:#e1a948}.coffee-style{--qapl-theme-color:#c7a589}.ectoplasm-style{--qapl-theme-color:#a3b745}.midnight-style{--qapl-theme-color:#e14d43}.ocean-style{--qapl-theme-color:#9ebaa0}.sunrise-style{--qapl-theme-color:#dd823b}#shortcode-box-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-top:16px}#shortcode-box-wrap .shortcode-description{padding:0 2px;margin-bottom:4px}#shortcode-box-wrap .click-and-select-all{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:auto}#shortcode-box-wrap pre{margin:0;padding:10px 10px 11px;border:1px solid #8c8f94;border-radius:3px;background:var(--qapl-code-bg)}#shortcode-box-wrap code{line-height:1;background:var(--qapl-code-bg);white-space:pre-wrap;word-break:break-word;cursor:pointer}.quick-ajax-form-wrap .switch-checkbox{display:inline-block;min-height:30px}.quick-ajax-form-wrap .switch-wrap{position:relative;width:40px;height:20px;margin-top:6px}.quick-ajax-form-wrap .switch-wrap input{opacity:0;width:0;height:0}.quick-ajax-form-wrap .switch{border-radius:12px}.quick-ajax-form-wrap .switch:before{border-radius:50%}.quick-ajax-form-wrap input+.switch{position:absolute;cursor:pointer;top:-1px;left:0;right:0;bottom:1px;background-color:var(--qapl-switch-bg);-webkit-box-shadow:inset 0 0 3px var(--qapl-switch-shadow);box-shadow:inset 0 0 3px var(--qapl-switch-shadow);-webkit-transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease}.quick-ajax-form-wrap .switch:before{position:absolute;content:"";height:14px;width:14px;left:3px;bottom:3px;background-color:var(--qapl-bg);-webkit-transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease;transition:background-color .3s ease,box-shadow .3s ease,transform .3s ease,-webkit-box-shadow .3s ease,-webkit-transform .3s ease}.quick-ajax-form-wrap input:checked+.switch{background-color:var(--qapl-theme-color);-webkit-box-shadow:inset 0 0 3px var(--qapl-switch-shadow);box-shadow:inset 0 0 3px var(--qapl-switch-shadow)}.quick-ajax-form-wrap input:checked+.switch:before{-webkit-transform:translateX(20px);-ms-transform:translateX(20px);transform:translateX(20px)}.quick-ajax-form-wrap{margin-top:2rem;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.quick-ajax-form-wrap select:focus{border-color:var(--qapl-theme-color);-webkit-box-shadow:0 0 0 1px var(--qapl-theme-color);box-shadow:0 0 0 1px var(--qapl-theme-color)}.quick-ajax-form-wrap .quick-ajax-field-container{position:relative;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;gap:16px;visibility:visible;opacity:1;margin-bottom:16px;-webkit-transition:opacity .15s ease,margin-bottom .15s ease;transition:opacity .15s ease,margin-bottom .15s ease}.quick-ajax-form-wrap .quick-ajax-field-container.inactive{visibility:hidden;height:0;opacity:0;margin-bottom:0}.quick-ajax-form-wrap .quick-ajax-field-container>label{-webkit-box-flex:0;-ms-flex:0 0 210px;flex:0 0 210px;margin-top:6px}.quick-ajax-form-wrap .quick-ajax-field-container>.quick-ajax-field{max-width:580px;-webkit-box-flex:1;-ms-flex:1 1 0px;flex:1 1 0}.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>div,.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>input,.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field>select{max-width:100%;width:100%;margin:0}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option{-webkit-box-flex:0;-ms-flex:0 1 calc(100% / 3);flex:0 1 calc(100% / 3);min-width:180px;padding:6px 0;min-height:32px;-webkit-box-sizing:border-box;box-sizing:border-box}.quick-ajax-form-wrap .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option label{cursor:pointer}.quick-ajax-form-wrap .quick-ajax-field-container .quick-ajax-field-desc{margin-top:5px;margin-bottom:0;color:var(--qapl-text-muted);font-style:italic}@media (max-width:782px){.quick-ajax-form-wrap .quick-ajax-field-container>label{-ms-flex-preferred-size:100%;flex-basis:100%;margin-top:0;margin-right:0}.quick-ajax-form-wrap .quick-ajax-field-container>.quick-ajax-field{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}}.quick-ajax-tabs{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;overflow:hidden}.quick-ajax-tabs:before{content:'';position:absolute;width:100%;bottom:0;height:1px;background-color:var(--qapl-border)}.quick-ajax-tab-button{position:relative;padding:5px 10px;cursor:pointer;z-index:0;background:var(--qapl-tab-bg);border:1px solid var(--qapl-border);border-top-left-radius:3px;border-top-right-radius:3px;border-bottom-left-radius:0;border-bottom-right-radius:0;margin:0 5px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition:background-color .3s ease,border-color .3s ease;transition:background-color .3s ease,border-color .3s ease}.quick-ajax-tab-button:first-of-type{margin-left:0}.quick-ajax-tab-button:hover{background:var(--qapl-bg-mute)}.quick-ajax-tab-button.active{background:var(--qapl-bg);z-index:1;border-bottom:1px solid var(--qapl-bg)}.quick-ajax-tab-content,.quick-ajax-tab-content[hidden]{position:relative;background:var(--qapl-bg);padding:16px;border:1px solid var(--qapl-border);-webkit-box-shadow:0 1px 1px rgba(0,0,0,.04);box-shadow:0 1px 1px rgba(0,0,0,.04);display:none}.quick-ajax-tab-content.active{display:block}.quick-ajax-tab-content+.quick-ajax-tab-content,.quick-ajax-tabs+.quick-ajax-tab-content{border-top:none}.function-generator-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:start;-webkit-column-gap:100px;-moz-column-gap:100px;column-gap:100px}.function-generator-options{max-width:580px}.function-generator-options .quick-ajax-field-container.quick-ajax-multiselect-field .quick-ajax-field .quick-ajax-field-options>.quick-ajax-multiselect-option{min-width:50%}.function-generator-result{width:auto;-webkit-box-flex:1;-ms-flex:1;flex:1;max-width:480px}.function-generator-result>pre{overflow:auto}@media (max-width:1200px){.function-generator-wrap{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.function-generator-options,function-generator-result{width:100%;max-width:unset}}.quick-ajax-form-wrap code.no-background{background:0 0;padding:3px 0 2px;font-size:14px}.quick-ajax-form-wrap code.code-tag{padding:2px 4px 3px;margin:0 1px;background:rgba(0,0,0,.07)}.quick-ajax-form-wrap pre{white-space:pre-wrap;word-wrap:break-word}.quick-ajax-form-wrap ul.ul-numbered{list-style-type:decimal;padding-left:13px}.quick-ajax-form-wrap li ul{margin-top:6px}.quick-ajax-accordion-wrapper{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-ms-flex-wrap:wrap;flex-wrap:wrap;overflow:hidden;margin-bottom:16px}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 1.5em;min-height:44px;background:var(--qapl-bg);border:1px solid var(--qapl-border);cursor:pointer;outline:unset}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:hover{background:var(--qapl-bg-muted)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:active,.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle:focus{outline-width:2px;outline-style:solid;outline-offset:-2px;outline-color:var(--qapl-theme-color);background-color:var(--qapl-bg-muted);z-index:1}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active{background:var(--qapl-bg)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active:hover{background:var(--qapl-bg-muted)}.quick-ajax-accordion-wrapper .accordion-title{max-width:calc(100% - 26px);font-size:13px;font-weight:600;line-height:1;margin:0}.quick-ajax-accordion-wrapper .accordion-icon{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transform:rotateX(0);transform:rotateX(0);-webkit-transition:-webkit-transform .3s ease-in-out;transition:-webkit-transform .3s ease-in-out;transition:transform .3s ease-in-out;transition:transform .3s ease-in-out,-webkit-transform .3s ease-in-out}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active .accordion-icon{-webkit-transform:rotateX(180deg);transform:rotateX(180deg)}.quick-ajax-accordion-wrapper .accordion-icon span{pointer-events:none;position:absolute;border:solid #50575e;border-width:0 2px 2px 0;height:.5rem;width:.5rem;top:50%;right:0;-webkit-transform:translateY(-70%) rotate(45deg);-ms-transform:translateY(-70%) rotate(45deg);transform:translateY(-70%) rotate(45deg)}.quick-ajax-accordion-wrapper .quick-ajax-accordion-content{display:none;border:1px solid var(--qapl-border);border-top:none;padding:0 1.5em 1em 1.5em}.quick-ajax-accordion-wrapper .quick-ajax-accordion-toggle.active+.quick-ajax-accordion-content:before{content:"";position:absolute;display:block;background:var(--qapl-bg);height:1px;left:1px;right:1px;margin-top:-1px}.qapl-admin-page-loader{position:relative;height:20px;width:40px;padding:6px 0;margin-left:0;vertical-align:middle}.qapl-admin-page-loader span{position:absolute;top:50%;left:0;width:6px;height:6px;background-color:#50575e;border-radius:50%;-webkit-transform:translate(0,-50%);-ms-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0;-webkit-animation:qapl-admin-loader-animation 1.8s linear infinite;animation:qapl-admin-loader-animation 1.8s linear infinite}.qapl-admin-page-loader span:nth-child(1){-webkit-animation-delay:0s;animation-delay:0s}.qapl-admin-page-loader span:nth-child(2){-webkit-animation-delay:.6s;animation-delay:.6s}.qapl-admin-page-loader span:nth-child(3){-webkit-animation-delay:1.2s;animation-delay:1.2s}@-webkit-keyframes qapl-admin-loader-animation{0%{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0}10%{opacity:1}50%{-webkit-transform:translate(20px,-50%);transform:translate(20px,-50%);opacity:1}90%{opacity:0}100%{-webkit-transform:translate(40px,-50%);transform:translate(40px,-50%);opacity:0}}@keyframes qapl-admin-loader-animation{0%{-webkit-transform:translate(0,-50%);transform:translate(0,-50%);opacity:0}10%{opacity:1}50%{-webkit-transform:translate(20px,-50%);transform:translate(20px,-50%);opacity:1}90%{opacity:0}100%{-webkit-transform:translate(40px,-50%);transform:translate(40px,-50%);opacity:0}}

quick-ajax-post-loader/trunk/inc/actions.php

-                      r3321429
+                      r3352831
+    }
     // nonce verification
     if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_action())) {
+    if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_ACTION)) {
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Unauthorized request']);
+    }
 …
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Invalid request, Missing arguments.']);
     } else {
         $qapl_helper = QAPL_Quick_Ajax_Helper::get_instance();
         $ajax_class = new QAPL_Quick_Ajax_Handler;
+        $file_manager = new QAPL_Quick_Ajax_File_Manager();
+        $ajax_class = new QAPL_Quick_Ajax_Handler($file_manager);
         // Sanitize 'args'
 …
             while ($query->have_posts()) {
                 $query->the_post();
                 $template_path = $qapl_helper->plugin_templates_post_item_template(esc_attr($ajax_class->attributes[QAPL_Quick_Ajax_Helper::layout_post_item_template()]));
+                $template_path = $file_manager->get_post_item_template(esc_attr($ajax_class->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE]));
                 if (!$template_path || !file_exists($template_path)) {
                     wp_send_json_error(['message' => 'Quick Ajax Post Loader: Template file not found']);
 …
             $qapl_no_post_template = QAPL_Post_Template_Factory::get_template($container_settings);
             QAPL_Post_Template_Context::set_template($qapl_no_post_template);
             $no_posts_template = $qapl_helper->plugin_templates_no_posts();
+            $no_posts_template = $file_manager->get_no_posts_template();
             if (!$no_posts_template || !file_exists($no_posts_template)) {
                 wp_send_json_error(['message' => 'Quick Ajax Post Loader: Template file not found']);
 …
         $output = ob_get_clean();
         $load_more = $ajax_class->load_more_button(esc_attr($query->get('paged')), esc_attr($query->max_num_pages), esc_attr($query->found_posts), esc_attr($ajax_class->attributes['infinite_scroll']));
         $show_end_message = $ajax_class->render_end_of_posts_message($ajax_class->attributes['show_end_message'], $load_more, esc_attr($query->max_num_pages), esc_attr($ajax_class->attributes['quick_ajax_id']));
+        $show_end_message = $ajax_class->render_end_of_posts_message($load_more, esc_attr($query->max_num_pages), esc_attr($ajax_class->attributes['quick_ajax_id']), $ajax_class->attributes['show_end_message']);
 …
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Not an AJAX request']);
+    }
     if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_action())) {
+    if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_ACTION)) {
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Unauthorized request']);
+    }
 …
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Not an AJAX request']);
+    }
     if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Helper::wp_nonce_form_quick_ajax_action())) {
+    if (!isset($_POST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['nonce'])), QAPL_Quick_Ajax_Plugin_Constants::NONCE_FORM_QUICK_AJAX_ACTION)) {
         wp_send_json_error(['message' => 'Quick Ajax Post Loader: Unauthorized request']);
+    }
 …
     if ($post_id > 0) {
         // get saved terms from post meta
         $post_meta = get_post_meta($post_id, QAPL_Quick_Ajax_Helper::quick_ajax_shortcode_settings(), true);
+        $post_meta = get_post_meta($post_id, QAPL_Quick_Ajax_Plugin_Constants::DB_POSTMETA_SHORTCODE_SETTINGS, true);
         $post_meta_values = maybe_unserialize($post_meta);
         // if terms exist in post meta

quick-ajax-post-loader/trunk/inc/class-activator.php

-                      r3199656
+                      r3352831
         public static function activate() {
             require_once plugin_dir_path(__FILE__) . 'class-helper.php';
-            $qapl_helper = QAPL_Quick_Ajax_Helper::get_instance();
             $default_value = [
                 'loader_icon' => $qapl_helper::shortcode_page_select_loader_icon_default_value(),
+                'loader_icon' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT,
             ];
             $qapl_helper::add_or_update_option_autoload($qapl_helper::admin_page_global_options_name(), $default_value, 'off');
+            QAPL_Quick_Ajax_Utilities::add_or_update_option_autoload(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME, $default_value, 'off');
+        }
+    }

quick-ajax-post-loader/trunk/inc/class-ajax.php

-                      r3321429
+                      r3352831
 if (!class_exists('QAPL_Quick_Ajax_Handler')) {
     class QAPL_Quick_Ajax_Handler{
+        private static $instance = null;
+        private $helper;
+        private $file_manager;
         private $input_args = [];
         private $action_args = [];
 …
         //private $placeholder_replacer;
+        public function __construct(){
+            $this->helper = QAPL_Quick_Ajax_Helper::get_instance();
+        public function __construct(QAPL_Quick_Ajax_File_Manager $file_manager){
             $this->quick_ajax_id = 0;
+            $this->global_options = get_option($this->helper->admin_page_global_options_name(), []);
+            $this->global_options = get_option(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME, []);
+            $this->file_manager = $file_manager;
             //$this->placeholder_replacer = new QAPL_Placeholder_Replacer(); // not in use after removing placeholders
             // Filter hooks for filter wrapper
             /*
             add_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_BEFORE, array($this, 'action_filter_wrapper_pre'));
             add_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_START, array($this, 'action_filter_wrapper_open'));
             add_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_END, array($this, 'action_filter_wrapper_close'));
             add_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_AFTER, array($this, 'action_filter_wrapper_complete'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_BEFORE, array($this, 'action_filter_wrapper_pre'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_START, array($this, 'action_filter_wrapper_open'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_END, array($this, 'action_filter_wrapper_close'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_AFTER, array($this, 'action_filter_wrapper_complete'));
             // Filter hooks for posts wrapper
             add_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_BEFORE, array($this, 'action_posts_wrapper_pre'));
             add_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_START, array($this, 'action_posts_wrapper_open'));
             add_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_END, array($this, 'action_posts_wrapper_close'));
             add_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_AFTER, array($this, 'action_posts_wrapper_complete'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_BEFORE, array($this, 'action_posts_wrapper_pre'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_START, array($this, 'action_posts_wrapper_open'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_END, array($this, 'action_posts_wrapper_close'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_AFTER, array($this, 'action_posts_wrapper_complete'));
             // Filter hooks for load more button
             add_action(QAPL_Hooks::HOOK_LOAD_MORE_BEFORE, array($this, 'action_load_more_button_pre'));
             add_action(QAPL_Hooks::HOOK_LOAD_MORE_AFTER, array($this, 'action_load_more_button_complete'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_BEFORE, array($this, 'action_load_more_button_pre'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_AFTER, array($this, 'action_load_more_button_complete'));
             // Filter hooks for loader icon
             add_action(QAPL_Hooks::HOOK_LOADER_BEFORE, array($this, 'action_loader_icon_pre'));
             add_action(QAPL_Hooks::HOOK_LOADER_AFTER, array($this, 'action_loader_icon_complete'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_BEFORE, array($this, 'action_loader_icon_pre'));
+            add_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_AFTER, array($this, 'action_loader_icon_complete'));
             */
             // Filters with arguments (query and taxonomy buttons)
+            //add_filter(QAPL_Hooks::HOOK_MODIFY_POSTS_QUERY_ARGS, array($this, 'filter_modify_query_args'), 10, 2);
+            //add_filter(QAPL_Hooks::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS, array($this, 'filter_modify_taxonomy_filter_buttons'), 10, 2);
+        }
+        public static function get_instance() {
+            if (null === self::$instance) {
+                self::$instance = new self();
+            }
+            return self::$instance;
+        }
+            //add_filter(QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_POSTS_QUERY_ARGS, array($this, 'filter_modify_query_args'), 10, 2);
+            //add_filter(QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS, array($this, 'filter_modify_taxonomy_filter_buttons'), 10, 2);
+        }
         public function get_quick_ajax_id() {
 …
         private function generate_block_id($attributes = false) {
             if (!is_array($attributes)) {
                 $attributes = [$this->helper->layout_quick_ajax_id() => sanitize_text_field($attributes)];
+            }
             if (isset($attributes[$this->helper->layout_quick_ajax_id()])) {
+                $attributes = [QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID => sanitize_text_field($attributes)];
+            }
+            if (isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID])) {
                 // Prefix 'p' for 'shortcode' equal to true, otherwise 'c'
                 $prefix = (isset($attributes['shortcode']) && $attributes['shortcode'] === true) ? 'p' : 'c';
                 $this->quick_ajax_id = esc_attr($prefix . $attributes[$this->helper->layout_quick_ajax_id()]);
+                $this->quick_ajax_id = esc_attr($prefix . $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID]);
             } else {
                 // Increment qapl_id if 'quick_ajax_id' is not set
 …
             $quick_ajax_args = $this->initialize_query_args($this->input_args);
             $this->args['post_status'] = $this->helper->shortcode_page_select_post_status_default_value();
+            $this->args['post_status'] = QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_STATUS_DEFAULT;
             if (isset($quick_ajax_args['post_type']) && !empty($quick_ajax_args['post_type'])) {
 …
             */
             $this->args = apply_filters(QAPL_Hooks::HOOK_MODIFY_POSTS_QUERY_ARGS, $this->args, $this->quick_ajax_id);
+            $this->args = apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_POSTS_QUERY_ARGS, $this->args, $this->quick_ajax_id);
             if (empty($this->args)) {
 …
             return [
                 'post_type' => isset($args['post_type']) ? sanitize_text_field($args['post_type']) : null,
                 'posts_per_page' => isset($args['posts_per_page']) ? intval($args['posts_per_page']) : $this->helper->shortcode_page_select_posts_per_page_default_value(),
                 'orderby' => isset($args['orderby']) ? sanitize_text_field($args['orderby']) : $this->helper->shortcode_page_select_orderby_default_value(),
                 'order' => isset($args['order']) ? sanitize_text_field($args['order']) : $this->helper->shortcode_page_select_order_default_value(),
+                'posts_per_page' => isset($args['posts_per_page']) ? intval($args['posts_per_page']) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POSTS_PER_PAGE_DEFAULT,
+                'orderby' => isset($args['orderby']) ? sanitize_text_field($args['orderby']) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDERBY_DEFAULT,
+                'order' => isset($args['order']) ? sanitize_text_field($args['order']) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDER_DEFAULT,
                 'post__not_in' => $args['post__not_in'] ?? [],
                 'ignore_sticky_posts' => isset($args['ignore_sticky_posts']) ? intval($args['ignore_sticky_posts']) : $this->helper->shortcode_page_ignore_sticky_posts_default_value(),
+                'ignore_sticky_posts' => isset($args['ignore_sticky_posts']) ? intval($args['ignore_sticky_posts']) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_IGNORE_STICKY_POSTS_DEFAULT,
                 'paged' => isset($args['paged']) ? intval($args['paged']) : 1,
             ];
 …
             $block_id = 'quick-ajax-filter-'.$this->quick_ajax_id;
             $class_container = 'quick-ajax-filter-container';
             if (isset($this->layout[$this->helper->layout_quick_ajax_css_style()]) && $this->layout[$this->helper->layout_quick_ajax_css_style()] != 0) {
+            if (isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE]) && $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE] != 0) {
                 $class_container .= ' quick-ajax-theme';
+            }
             if(isset($this->layout[$this->helper->layout_taxonomy_filter_class()]) && !empty(trim($this->layout[$this->helper->layout_taxonomy_filter_class()]))){
                 $class_container .= ' '.$this->layout[$this->helper->layout_taxonomy_filter_class()];
+            if(isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS]) && !empty(trim($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS]))){
+                $class_container .= ' '.$this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS];
+            }
             $container_class = $this->extract_classes_from_string($class_container);
 …
             ob_start(); // Start output buffering
             do_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_BEFORE, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_BEFORE, $this->quick_ajax_id);
             echo '<div id="'.esc_attr($block_id).'" class="'.esc_attr($container_class).'">';
             do_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_START, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_START, $this->quick_ajax_id);
             if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
                 $this->attributes[$this->helper->layout_quick_ajax_id()] = $this->quick_ajax_id;
+                $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID] = $this->quick_ajax_id;
                 $navigation_buttons = [];
                 $button_base = [
                     'data-button' => $this->helper->taxonomy_filter_button_data_button(),
                     'template' => $this->helper->plugin_templates_taxonomy_filter_button(),
+                    'data-button' => QAPL_Quick_Ajax_Plugin_Constants::TERM_FILTER_BUTTON_DATA_BUTTON,
+                    'template' => $this->file_manager->get_taxonomy_filter_button_template(),
                     'data-attributes' => $this->attributes,
                 ];
 …
+                }
                 $navigation_buttons = apply_filters(QAPL_Hooks::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS, $navigation_buttons, $this->quick_ajax_id);
+                $navigation_buttons = apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS, $navigation_buttons, $this->quick_ajax_id);
                 $filter_buttons='';
                 foreach ( $navigation_buttons as $button ) {
 …
                 echo wp_kses_post($filter_buttons);
+            }
             do_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_END, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_END, $this->quick_ajax_id);
             echo '</div>';
             do_action(QAPL_Hooks::HOOK_FILTER_CONTAINER_AFTER, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_AFTER, $this->quick_ajax_id);
             $output = ob_get_clean(); // Get the buffered content into a variable
 …
             $block_id = 'quick-ajax-sort-options-'.$this->quick_ajax_id;
             $class_container = 'quick-ajax-sort-options-container';
             if (isset($this->layout[$this->helper->layout_quick_ajax_css_style()]) && $this->layout[$this->helper->layout_quick_ajax_css_style()] != 0) {
+            if (isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE]) && $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE] != 0) {
                 $class_container .= ' quick-ajax-theme';
+            }
 …
             echo '<div id="'.esc_attr($block_id).'" class="'.esc_attr($container_class).'">';
             if(isset($sort_options) && is_array($sort_options)){
+                $default_sort_options = $this->helper->shortcode_page_select_sort_button_options_values();
+                $field = QAPL_Quick_Ajax_Form_Field_Factory::build_select_sort_button_options_field();
+                $default_sort_options = $field->get_options();
                 $label_map = [];
                 foreach ($default_sort_options as $option) {
 …
                     ];
+                }
                 $sorted_options = apply_filters(QAPL_Hooks::HOOK_MODIFY_SORTING_OPTIONS_VARIANTS, $sorted_options, $this->quick_ajax_id);
+                $sorted_options = apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_SORTING_OPTIONS_VARIANTS, $sorted_options, $this->quick_ajax_id);
                 $filtered_orderby_options = [];
                 foreach ($sorted_options as $option) {
 …
+        }
         private function create_sort_button($button_data) {
             $this->attributes[$this->helper->layout_quick_ajax_id()] = $this->quick_ajax_id;
+            $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID] = $this->quick_ajax_id;
             $sort_option = '<div class="quick-ajax-sort-option-wrapper">';
             $default_option = strtolower($this->args['orderby']).'-'.strtolower($this->args['order']);
 …
+            }
             $sort_option .= '</select>';
             $sort_option .= '<span class="quick-ajax-settings" data-button="'.$this->helper->sort_option_button_data_button().'" data-attributes="' . esc_attr(wp_json_encode($this->attributes)) . '" data-action="' . esc_attr(wp_json_encode($this->action_args)) . '"></span>';
+            $sort_option .= '<span class="quick-ajax-settings" data-button="'.QAPL_Quick_Ajax_Plugin_Constants::SORT_OPTION_BUTTON_DATA_BUTTON.'" data-attributes="' . esc_attr(wp_json_encode($this->attributes)) . '" data-action="' . esc_attr(wp_json_encode($this->action_args)) . '"></span>';
             $sort_option .= '</div>';
             return $sort_option;
 …
                 return '';
+            }
             if($button_data['data-button'] == $this->helper->load_more_button_data_button()){
+            if($button_data['data-button'] == QAPL_Quick_Ajax_Plugin_Constants::LOAD_MORE_BUTTON_DATA_BUTTON){
                 $load_more_settings = [
                     'quick_ajax_id' => $this->quick_ajax_id,
 …
             $this->layout = [];
             //Apply quick AJAX CSS Style
             $this->layout[$this->helper->layout_quick_ajax_css_style()] = (isset($attributes[$this->helper->layout_quick_ajax_css_style()])) ? esc_attr($attributes[$this->helper->layout_quick_ajax_css_style()]) : 0;
+            $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE] = (isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE])) ? esc_attr($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE]) : 0;
             //Number of columns
             $this->layout[$this->helper->layout_container_num_columns()] = (isset($attributes[$this->helper->layout_container_num_columns()])) ? esc_attr($attributes[$this->helper->layout_container_num_columns()]) : 0;
+            $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS] = (isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS])) ? esc_attr($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS]) : 0;
             //add custom class for taxonomy filter
             if(isset($attributes[$this->helper->layout_taxonomy_filter_class()])){
                 $this->layout[$this->helper->layout_taxonomy_filter_class()] = $this->extract_classes_from_string($attributes[$this->helper->layout_taxonomy_filter_class()]);
+            if(isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS])){
+                $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS] = $this->extract_classes_from_string($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS]);
+            }
             //Add class to post container
             if(isset($attributes[$this->helper->layout_container_class()])){
                 $this->layout[$this->helper->layout_container_class()] = $this->extract_classes_from_string($attributes[$this->helper->layout_container_class()]);
+            if(isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS])){
+                $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS] = $this->extract_classes_from_string($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS]);
+            }
             //Post Item Template
             $post_item_template = isset($attributes[$this->helper->layout_post_item_template()]) ? $attributes[$this->helper->layout_post_item_template()] : false;
             $this->layout[$this->helper->layout_post_item_template()] = $this->helper->plugin_templates_post_item_template($post_item_template);
             $this->attributes[$this->helper->layout_post_item_template()] = $post_item_template;
+            $post_item_template = isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE]) ? $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE] : false;
+            $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE] = $this->file_manager->get_post_item_template($post_item_template);
+            $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE] = $post_item_template;
             //Custom Load More Post Quantity
             if(isset($attributes[$this->helper->layout_load_more_posts()])){
                 $this->attributes[$this->helper->layout_load_more_posts()] = intval($attributes[$this->helper->layout_load_more_posts()]);
+            if(isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS])){
+                $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS] = intval($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS]);
+            }
             //Select Loader Icon
             if (isset($attributes[$this->helper->layout_select_loader_icon()]) && !empty($attributes[$this->helper->layout_select_loader_icon()])) {
                 $loader_icon = $attributes[$this->helper->layout_select_loader_icon()];
+            if (isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON]) && !empty($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON])) {
+                $loader_icon = $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON];
             } elseif (isset($this->global_options['loader_icon']) && !empty($this->global_options['loader_icon'])) {
                 // fallback to global option if attributes value is invalid
 …
             } else {
                 // final fallback to default value
                 $loader_icon = $this->helper->shortcode_page_select_loader_icon_default_value();
+            }
             $this->layout[$this->helper->layout_select_loader_icon()] = $this->helper->plugin_templates_loader_icon_template($loader_icon);
             $this->attributes[$this->helper->layout_select_loader_icon()] = $loader_icon;
+                $loader_icon = QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT;
+            }
+            $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON] = $this->file_manager->get_loader_icon_template($loader_icon);
+            $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON] = $loader_icon;
             // infinite_scroll
             if(isset($attributes[$this->helper->layout_ajax_infinite_scroll()])){
                 $this->attributes[$this->helper->layout_ajax_infinite_scroll()] = intval($attributes[$this->helper->layout_ajax_infinite_scroll()]);
+            if(isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL])){
+                $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL] = intval($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL]);
+            }
             // show_end_message
             if(isset($attributes[$this->helper->layout_show_end_message()])){
                 $this->attributes[$this->helper->layout_show_end_message()] = intval($attributes[$this->helper->layout_show_end_message()]);
+            }
             $this->ajax_initial_load = isset($attributes[$this->helper->query_settings_ajax_on_initial_load()]) ? intval($attributes[$this->helper->query_settings_ajax_on_initial_load()]) : $this->helper->shortcode_page_ajax_on_initial_load_default_value();
+            if(isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_SHOW_END_MESSAGE])){
+                $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_SHOW_END_MESSAGE] = intval($attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_SHOW_END_MESSAGE]);
+            }
+            $this->ajax_initial_load = isset($attributes[QAPL_Quick_Ajax_Plugin_Constants::AJAX_SETTING_AJAX_INITIAL_LOAD]) ? intval($attributes[QAPL_Quick_Ajax_Plugin_Constants::AJAX_SETTING_AJAX_INITIAL_LOAD]) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_ON_INITIAL_LOAD_DEFAULT;
+        }
 …
             $args['selected_terms'] = isset($this->input_args['selected_terms']) && is_array($this->input_args['selected_terms']) ? array_map('absint', $this->input_args['selected_terms']) : [];
             $query = new WP_Query($args);
             $this->attributes[$this->helper->layout_quick_ajax_id()] = $this->quick_ajax_id;
             $layout_quick_ajax_id = esc_attr($this->attributes[$this->helper->layout_quick_ajax_id()]);
+            $this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID] = $this->quick_ajax_id;
+            $layout_quick_ajax_id = esc_attr($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID]);
             $class_container = $class_inner_container = '';
             if (isset($this->layout[$this->helper->layout_quick_ajax_css_style()]) && $this->layout[$this->helper->layout_quick_ajax_css_style()] != 0) {
+            if (isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE]) && $this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE] != 0) {
                 $class_container .= 'quick-ajax-theme';
+            }
             if(isset($this->layout[$this->helper->layout_container_num_columns()]) && (!empty($this->layout[$this->helper->layout_container_num_columns()]))){
                 $class_inner_container .= 'col-qty-'.$this->layout[$this->helper->layout_container_num_columns()];
+            }
             if(isset($this->layout[$this->helper->layout_container_class()]) && !empty(trim($this->layout[$this->helper->layout_container_class()]))){
                 $class_inner_container .= ' '.$this->layout[$this->helper->layout_container_class()];
+            if(isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS]) && (!empty($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS]))){
+                $class_inner_container .= 'col-qty-'.$this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS];
+            }
+            if(isset($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS]) && !empty(trim($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS]))){
+                $class_inner_container .= ' '.$this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS];
+            }
             $container_class = $this->extract_classes_from_string($class_container);
 …
             ob_start();
             // Start output buffering
             do_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_BEFORE, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_BEFORE, $this->quick_ajax_id);
             echo '<div id="quick-ajax-'.esc_attr($layout_quick_ajax_id).'" class="quick-ajax-posts-container '.esc_attr($container_class).'">';
             do_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_START, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_START, $this->quick_ajax_id);
             echo '<div class="quick-ajax-posts-wrapper '.esc_attr($container_inner_class).'">';
 …
                     while ($query->have_posts()) {
                         $query->the_post();
                         include($this->layout[$this->helper->layout_post_item_template()]);
+                        include($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE]);
+                    }
+                }
 …
                 $qapl_no_post_template = QAPL_Post_Template_Factory::get_template($container_settings);
                 QAPL_Post_Template_Context::set_template($qapl_no_post_template);
                 include($this->helper->plugin_templates_no_posts());
+                include($this->file_manager->get_no_posts_template());
                 QAPL_Post_Template_Context::clear_template();
+            }
             echo '</div>';
             do_action(QAPL_Hooks::HOOK_LOADER_BEFORE, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_BEFORE, $this->quick_ajax_id);
             echo '<div class="quick-ajax-loader-container">';
             include($this->layout[$this->helper->layout_select_loader_icon()]);
+            include($this->layout[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON]);
             echo '</div>';
             do_action(QAPL_Hooks::HOOK_LOADER_AFTER, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_AFTER, $this->quick_ajax_id);
             if (!$this->ajax_initial_load) {
                 $infinite_scroll = isset($this->attributes[$this->helper->layout_ajax_infinite_scroll()]) ? intval($this->attributes[$this->helper->layout_ajax_infinite_scroll()]) : $this->helper->shortcode_page_ajax_on_initial_load_default_value();
+                $infinite_scroll = isset($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL]) ? intval($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL]) : QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_ON_INITIAL_LOAD_DEFAULT;
                 echo wp_kses_post($this->load_more_button(intval($query->get('paged')), intval($query->max_num_pages), intval($query->found_posts), $infinite_scroll));
+            }
             do_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_END, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_END, $this->quick_ajax_id);
             echo '</div>';
             do_action(QAPL_Hooks::HOOK_POSTS_CONTAINER_AFTER, $this->quick_ajax_id);
+            do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_AFTER, $this->quick_ajax_id);
             wp_reset_postdata();
 …
             $load_more_args = $this->action_args;
             $load_more_args['paged'] = isset($this->args['paged']) ? intval($this->args['paged']) : 1;
             if (isset($this->attributes[$this->helper->layout_load_more_posts()]) && !empty($this->attributes[$this->helper->layout_load_more_posts()])) {
+            if (isset($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS]) && !empty($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS])) {
             // Check if load_more_posts attribute is set
             // if we want to add a different number of posts than displayed at the start
             // use 'offset' not 'paged'
                 $load_more_posts = intval($this->attributes[$this->helper->layout_load_more_posts()]);
+                $load_more_posts = intval($this->attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS]);
                 $offset = isset($load_more_args['offset']) ? $load_more_args['offset'] + $load_more_posts : + $load_more_posts;
 …
                $class = ' infinite-scroll';
+            }
             //do_action(QAPL_Hooks::HOOK_LOAD_MORE_BEFORE);
             $button_data['template'] = $this->helper->plugin_templates_load_more_button();
+            //do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_BEFORE);
+            $button_data['template'] = $this->file_manager->get_load_more_button_template();
             $button_data['button_label'] = __('Load More', 'quick-ajax-post-loader');
             $button_data['data-button'] = $this->helper->load_more_button_data_button();
+            $button_data['data-button'] = QAPL_Quick_Ajax_Plugin_Constants::LOAD_MORE_BUTTON_DATA_BUTTON;
             $button_data['data-action'] = $load_more_args;
             $button_data['data-attributes'] = $this->attributes;
 …
             $load_more_button .= '</div>';
             return $load_more_button;
             //do_action(QAPL_Hooks::HOOK_LOAD_MORE_AFTER);
+            //do_action(QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_AFTER);
+        }
         public function render_end_of_posts_message($load_more, $max_num_pages, $quick_ajax_id, $show_end_post_message = false) {
 …
             ob_start();
             echo '<div class="quick-ajax-end-message-container">';
             include($this->helper->plugin_templates_end_posts());
+            include($this->file_manager->get_end_posts_template());
             echo '</div>';
             $content = ob_get_clean();

quick-ajax-post-loader/trunk/inc/class-deprecated-hooks-handler.php

-                      r3238174
+                      r3352831
 $deprecated_hooks = [
     // Filter Wrapper Hooks
     'qapl_filter_wrapper_pre' => QAPL_Hooks::HOOK_FILTER_CONTAINER_BEFORE,
     'qapl_filter_wrapper_open' => QAPL_Hooks::HOOK_FILTER_CONTAINER_START,
     'qapl_filter_wrapper_close' => QAPL_Hooks::HOOK_FILTER_CONTAINER_END,
     'qapl_filter_wrapper_complete' => QAPL_Hooks::HOOK_FILTER_CONTAINER_AFTER,
+    'qapl_filter_wrapper_pre' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_BEFORE,
+    'qapl_filter_wrapper_open' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_START,
+    'qapl_filter_wrapper_close' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_END,
+    'qapl_filter_wrapper_complete' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_FILTER_CONTAINER_AFTER,
     // Posts Wrapper Hooks
     'qapl_posts_wrapper_pre' => QAPL_Hooks::HOOK_POSTS_CONTAINER_BEFORE,
     'qapl_posts_wrapper_open' => QAPL_Hooks::HOOK_POSTS_CONTAINER_START,
     'qapl_posts_wrapper_close' => QAPL_Hooks::HOOK_POSTS_CONTAINER_END,
     'qapl_posts_wrapper_complete' => QAPL_Hooks::HOOK_POSTS_CONTAINER_AFTER,
+    'qapl_posts_wrapper_pre' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_BEFORE,
+    'qapl_posts_wrapper_open' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_START,
+    'qapl_posts_wrapper_close' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_END,
+    'qapl_posts_wrapper_complete' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_POSTS_CONTAINER_AFTER,
     // Load More Button Hooks
     //'qapl_load_more_button_pre' => QAPL_Hooks::HOOK_LOAD_MORE_BEFORE,
     //'qapl_load_more_button_complete' => QAPL_Hooks::HOOK_LOAD_MORE_AFTER,
+    //'qapl_load_more_button_pre' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_BEFORE,
+    //'qapl_load_more_button_complete' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOAD_MORE_AFTER,
     // Loader Icon Hooks
     'qapl_loader_icon_pre' => QAPL_Hooks::HOOK_LOADER_BEFORE,
     'qapl_loader_icon_complete' => QAPL_Hooks::HOOK_LOADER_AFTER,
+    'qapl_loader_icon_pre' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_BEFORE,
+    'qapl_loader_icon_complete' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_LOADER_AFTER,
     // Filters
     'qapl_modify_query' => QAPL_Hooks::HOOK_MODIFY_POSTS_QUERY_ARGS,
     'qapl_modify_term_buttons' => QAPL_Hooks::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS
+    'qapl_modify_query' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_POSTS_QUERY_ARGS,
+    'qapl_modify_term_buttons' => QAPL_Quick_Ajax_Plugin_Constants::HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS
 ];

quick-ajax-post-loader/trunk/inc/class-helper.php

-                      r3337932
+                      r3352831
     exit;
+}
+class QAPL_Quick_Ajax_Helper{
+    private static $instance = null;
+use QAPL_Quick_Ajax_Plugin_Constants as QAPLC;
+class QAPL_Quick_Ajax_Plugin_Starter{
+    private $initializer;
+    private $enqueue_handler;
+    public function __construct(QAPL_Quick_Ajax_Plugin_Bootstrap_Interface $initializer, QAPL_Quick_Ajax_Enqueue_Handler_Interface $enqueue_handler) {
+        $this->initializer = $initializer;
+        $this->enqueue_handler = $enqueue_handler;
+    }
+    public function run(): void {
+        $this->initializer->initialize_plugin_components();
+        $this->initializer->initialize_plugin_pages();
+        $this->enqueue_handler->register_hooks();
+    }
+}
+interface QAPL_Quick_Ajax_Plugin_Bootstrap_Interface {
+    public function initialize_plugin_pages();
+    public function initialize_plugin_components();
+}
+class QAPL_Quick_Ajax_Plugin_Bootstrap implements QAPL_Quick_Ajax_Plugin_Bootstrap_Interface {
+    //private $file_helper;
+    private $pages_helper;
+    public function __construct(QAPL_Quick_Ajax_Resource_Manager_Interface $pages_helper) {
+        //$this->file_helper = $file_helper;
+        $this->pages_helper = $pages_helper;
+    }
+    public function initialize_plugin_pages(): void {
+        // initialize file and page helpers or any other required helpers
+        $this->pages_helper->initialize_pages();
+    }
+    public function initialize_plugin_components(): void {
+        // initialize other plugin components like AJAX handlers, shortcode classes, etc.
+        $this->pages_helper->initialize_components();
+    }
+}
+interface QAPL_Quick_Ajax_Enqueue_Handler_Interface {
+    public function enqueue_frontend_styles_and_scripts();
+    public function enqueue_admin_styles_and_scripts();
+    public function register_hooks();
+}
+class QAPL_Quick_Ajax_Enqueue_Handler implements QAPL_Quick_Ajax_Enqueue_Handler_Interface {
     private $file_helper;
+    private $pages_helper;
+    private function __construct() {
+        $this->initialize_helpers();
+        $this->initialize_components();
+    }
+    public static function get_plugin_info() {
+        return [
+            'version' => '1.7.7',
+            'name' => 'Quick Ajax Post Loader',
+            'text_domain' => 'quick-ajax-post-loader',
+            'slug' => 'quick-ajax-post-loader',
+            'minimum_php_version' => '7.4',
+            'minimum_wp_version' => '5.6',
+            'tested_wp_version' => '6.8'
+        ];
+    }
+    public static function get_instance() {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+    private function initialize_helpers() {
+        $this->file_helper = QAPL_File_Helper::get_instance();
+        $this->pages_helper = new QAPL_Pages_Helper($this->file_helper);
+    }
+    // initialize plugin components
+    private function initialize_components() {
+        $initialize_list = [
+            $this->pages_helper->plugin_admin_pages_config(),
+            $this->pages_helper->plugin_settings_page(),
+            $this->pages_helper->plugin_shortcode_page(),
+            $this->pages_helper->plugin_ajax_class(),
+            $this->pages_helper->plugin_ajax_actions(),
+            $this->pages_helper->plugin_functions(),
+            $this->pages_helper->plugin_updater(),
+            $this->pages_helper->plugin_shortcode_class(),
+            $this->pages_helper->plugin_template_hooks(),
+            $this->pages_helper->plugin_deprecated_hooks_handler(),
+            $this->pages_helper->plugin_register_dev_hooks(),
+        ];
+        foreach ($initialize_list as $initialize) {
+            if (($initialize !== false)) {
+                require_once($initialize);
+            }
+        }
+    public function __construct(QAPL_Quick_Ajax_File_Manager_Interface $file_helper) {
+        $this->file_helper = $file_helper;
+    }
+    public function register_hooks(): void {
+        add_action('wp_enqueue_scripts', [$this, 'enqueue_frontend_styles_and_scripts']);
+        add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_styles_and_scripts']);
+    }
     public function enqueue_frontend_styles_and_scripts() {
 …
             $style_suffix = $this->get_file_suffix('/css/', 'style.css');
             $script_suffix = $this->get_file_suffix('/js/', 'script.js');
             $version = $this->is_dev_mode() ? time() : self::get_plugin_info()['version'];
+            $version = $this->get_version();
             wp_enqueue_style('qapl-quick-ajax-style', $this->file_helper->get_plugin_css_directory() . 'style' . $style_suffix . '.css', [], $version);
             wp_enqueue_script('qapl-quick-ajax-script', $this->file_helper->get_plugin_js_directory() . 'script' . $script_suffix . '.js', ['jquery'], $version, true);
 …
         if (is_admin()) {
             // Check if the current page matches the plugin-related pages
             $plugin_pages = [self::cpt_shortcode_slug(), self::settings_page_slug()];
+            $plugin_pages = [QAPLC::CPT_SHORTCODE_SLUG, QAPLC::SETTINGS_PAGE_SLUG];
             if (qapl_quick_ajax_check_page_type($plugin_pages)) {
                 $style_suffix = $this->get_file_suffix('/css/', 'admin-style.css');
                 $script_suffix = $this->get_file_suffix('/js/', 'admin-script.js');
                 $version = $this->is_dev_mode() ? time() : self::get_plugin_info()['version'];
+                $version = $this->get_version();
                 wp_enqueue_style('qapl-quick-ajax-admin-style', $this->file_helper->get_plugin_css_directory() . 'admin-style' . $style_suffix . '.css', [], $version);
                 wp_register_script('qapl-quick-ajax-admin-script', $this->file_helper->get_plugin_js_directory() . 'admin-script' . $script_suffix . '.js', ['jquery'], $version, true);
 …
         return false;
+    }
+    private function get_version(): string {
+        return $this->is_dev_mode() ? (string) time() : QAPLC::PLUGIN_VERSION;
+    }
     private function get_file_suffix($base_path, $file_name) {
         // Set the default suffix to '.min' if WP_DEBUG is disabled
 …
     private function get_localized_data() {
         $nonce = wp_create_nonce(self::wp_nonce_form_quick_ajax_action());
+        $nonce = wp_create_nonce(QAPLC::NONCE_FORM_QUICK_AJAX_ACTION);
         if (!$nonce) {
             if (defined('WP_DEBUG') && WP_DEBUG) {
 …
             'nonce' =>  $nonce,
             'helper' => [
                 'block_id' => self::layout_quick_ajax_id(),
                 'filter_data_button' => self::taxonomy_filter_button_data_button(),
                 'sort_button' => self::sort_option_button_data_button(),
                 'load_more_data_button' => self::load_more_button_data_button(),
+                'block_id' => QAPLC::ATTRIBUTE_QUICK_AJAX_ID,
+                'filter_data_button' => QAPLC::TERM_FILTER_BUTTON_DATA_BUTTON,
+                'sort_button' => QAPLC::SORT_OPTION_BUTTON_DATA_BUTTON,
+                'load_more_data_button' => QAPLC::LOAD_MORE_BUTTON_DATA_BUTTON,
+            ]
         ];
 …
         return [
             'ajax_url' => admin_url('admin-ajax.php'),
             'nonce' => wp_create_nonce(self::wp_nonce_form_quick_ajax_action()),
             'quick_ajax_settings_wrapper' => self::settings_wrapper_id(),
             'quick_ajax_post_type' => self::shortcode_page_select_post_type(),
             'quick_ajax_taxonomy' => self::shortcode_page_select_taxonomy(),
             'quick_ajax_manual_selected_terms' => self::shortcode_page_manual_selected_terms(),
             'quick_ajax_css_style' => self::layout_quick_ajax_css_style(),
             'grid_num_columns' => self::layout_container_num_columns(),
             'post_item_template' => self::layout_post_item_template(),
             'post_item_template_default' => self::shortcode_page_layout_post_item_template_default_value(),
             'taxonomy_filter_class' => self::layout_taxonomy_filter_class(),
             'container_class' => self::layout_container_class(),
             'load_more_posts' => self::layout_load_more_posts(),
             'loader_icon' => self::layout_select_loader_icon(),
             'loader_icon_default' => self::shortcode_page_select_loader_icon_default_value(),
             'ajax_initial_load' => self::query_settings_ajax_on_initial_load(),
             'infinite_scroll' => self::layout_ajax_infinite_scroll(),
             'show_end_message' => self::layout_show_end_message(),
             'quick_ajax_id' => self::layout_quick_ajax_id(),
+            'nonce' => wp_create_nonce(QAPLC::NONCE_FORM_QUICK_AJAX_ACTION),
+            'quick_ajax_settings_wrapper' => QAPLC::SETTINGS_WRAPPER_ID,
+            'quick_ajax_post_type' => QAPLC::QUERY_SETTING_SELECT_POST_TYPE,
+            'quick_ajax_taxonomy' => QAPLC::QUERY_SETTING_SELECT_TAXONOMY,
+            'quick_ajax_manual_selected_terms' => QAPLC::QUERY_SETTING_SELECTED_TERMS,
+            'quick_ajax_css_style' => QAPLC::ATTRIBUTE_QUICK_AJAX_CSS_STYLE,
+            'grid_num_columns' => QAPLC::ATTRIBUTE_GRID_NUM_COLUMNS,
+            'post_item_template' => QAPLC::ATTRIBUTE_POST_ITEM_TEMPLATE,
+            'post_item_template_default' => QAPLC::LAYOUT_SETTING_POST_ITEM_TEMPLATE_DEFAULT,
+            'taxonomy_filter_class' => QAPLC::ATTRIBUTE_TAXONOMY_FILTER_CLASS,
+            'container_class' => QAPLC::ATTRIBUTE_CONTAINER_CLASS,
+            'load_more_posts' => QAPLC::ATTRIBUTE_LOAD_MORE_POSTS,
+            'loader_icon' => QAPLC::ATTRIBUTE_LOADER_ICON,
+            'loader_icon_default' => QAPLC::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT,
+            'ajax_initial_load' => QAPLC::AJAX_SETTING_AJAX_INITIAL_LOAD,
+            'infinite_scroll' => QAPLC::ATTRIBUTE_AJAX_INFINITE_SCROLL,
+            'show_end_message' => QAPLC::ATTRIBUTE_SHOW_END_MESSAGE,
+            'quick_ajax_id' => QAPLC::ATTRIBUTE_QUICK_AJAX_ID,
         ];
+    }
+    /*
+        public function load_admin_pages() {
+        $admin_pages = [
+            'admin_config' => $this->pages_helper->plugin_admin_pages_config(),
+            'settings_page' => $this->pages_helper->plugin_settings_page(),
+            'shortcode_page' => $this->pages_helper->plugin_shortcode_page(),
+        ];
+        foreach ($admin_pages as $page) {
+            if ($page && $this->file_helper->file_exists($page)) {
+                require_once($page);
+}
+interface QAPL_Quick_Ajax_Resource_Manager_Interface {
+    public function initialize_components();
+    public function initialize_pages();
+}
+class QAPL_Quick_Ajax_Resource_Manager implements QAPL_Quick_Ajax_Resource_Manager_Interface {
+    private QAPL_Quick_Ajax_File_Manager_Interface $file_helper;
+    // constants for page files
+    private const PAGE_FILES = [
+        'admin_pages_config' => 'admin/admin-pages-config.php',
+        'settings_page'      => 'admin/pages/settings-page.php',
+        'shortcode_page'     => 'admin/pages/shortcode-page.php',
+    ];
+    // constants for component files
+    private const COMPONENT_FILES = [
+        'ajax_class'                => 'inc/class-ajax.php',
+        'shortcode_class'           => 'inc/class-shortcode.php',
+        'ajax_actions'              => 'inc/actions.php',
+        'functions'                 => 'inc/functions.php',
+        'updater'                   => 'inc/class-updater.php',
+        'template_hooks'            => 'inc/class-template-hooks.php',
+        'deprecated_hooks_handler'  => 'inc/class-deprecated-hooks-handler.php',
+        'dev-hooks'                 => 'dev-tools/dev-hooks.php',
+    ];
+    //construct expects instance of QAPL_File_Helper
+    public function __construct(QAPL_Quick_Ajax_File_Manager_Interface $file_helper) {
+        $this->file_helper = $file_helper;
+    }
+    public function initialize_pages(): void{
+        $this->load_files(self::PAGE_FILES);
+    }
+    public function initialize_components(): void{
+        $this->load_files(self::COMPONENT_FILES);
+    }
+    private function load_files(array $files): void{
+        foreach ($files as $file) {
+            // start: refactoring class
+            if (class_exists('QAPL_Refactoring_Helper')) {
+                $resolver = new QAPL_Refactoring_Helper($this->file_helper);
+                $new_file = $resolver->get_new_file($file);
+                if($new_file){
+                    $file = $new_file;
+                }
+            }
+        }
+    }
+    //facade method to load AJAX classes
+    public function load_ajax_classes() {
+        $ajax_classes = [
+            'ajax_class' => $this->pages_helper->plugin_ajax_class(),
+            'ajax_actions' => $this->pages_helper->plugin_ajax_actions(),
+        ];
+        foreach ($ajax_classes as $class) {
+            if ($class && $this->file_helper->file_exists($class)) {
+                require_once($class);
+            // end: refactoring class
+            $path = $this->file_helper->file_exists($file);
+            if ($path !== false) {
+                require_once $path;
+            }
+        }
+    }
+    //facade method for templates
+    public function get_template_path($template_name, $type = 'post_items') {
+        $base_path = $type === 'loader_icon' ? '/loader-icon/' : '/post-items/';
+        return $this->file_helper->get_templates_file_path($template_name, $this->get_default_template($type), $base_path);
+    }
+    private function get_default_template($type) {
+        return $type === 'loader_icon' ? 'loader-icon' : 'post-item';
+    }
+    }
+    */
+}
+interface QAPL_Quick_Ajax_File_Manager_Interface {
+    public function file_exists($file_path);
+    public function get_plugin_directory();
+    public function get_plugin_js_directory();
+    public function get_plugin_css_directory();
+    public function get_templates_dir_path($file);
+}
+class QAPL_Quick_Ajax_File_Manager implements QAPL_Quick_Ajax_File_Manager_Interface {
+    private $plugin_dir_path;
+    private $plugin_dir_url;
+    public function __construct() {
+        $this->plugin_dir_path = plugin_dir_path(__DIR__);
+        $this->plugin_dir_url = plugin_dir_url(__DIR__);
+    }
+    public function file_exists($file_path) {
+        $full_path = $this->plugin_dir_path . ltrim($file_path, '/');
+        return file_exists($full_path) ? $full_path : false;
+    }
+    public function get_plugin_directory() {
+        return $this->plugin_dir_url;
+    }
+    public function get_plugin_js_directory() {
+        return $this->plugin_dir_url . 'js/';
+    }
+    public function get_plugin_css_directory() {
+        return $this->plugin_dir_url . 'css/';
+    }
+    public static function add_or_update_option_autoload($option_name, $default_value = '', $autoload = 'auto') {
+    //template dir path
+    public function get_templates_dir_path($file) {
+        // Path to the template in the child theme (or the theme itself if not using a child theme)
+        $child_theme_template_path = get_stylesheet_directory() . '/quick-ajax-post-loader/templates' . $file;
+        // Check if the template exists in the child theme
+        if (file_exists($child_theme_template_path)) {
+            return $child_theme_template_path;
+        }
+        // Path to the template in the parent theme
+        $theme_template_path = get_template_directory() . '/quick-ajax-post-loader/templates' . $file;
+        // Check if the template exists in the parent theme
+        if (file_exists($theme_template_path)) {
+            return $theme_template_path;
+        }
+        // Path to the template in the plugin
+        $plugin_template_path = $this->plugin_dir_path . 'templates' . $file;
+        // Check if the template exists in the plugin
+        if (file_exists($plugin_template_path)) {
+            return $plugin_template_path;
+        }
+        // Template was not found
+        return false;
+    }
+    //template file path
+    public function get_templates_file_path($template_name, $default_name, $base_path) {
+        // Use the provided template name if given; otherwise, use the default name.
+        $template_name = sanitize_file_name(empty($template_name) ? $default_name : $template_name);
+        $file_path = $this->get_templates_dir_path($base_path . $template_name . '.php');
+        // Check if the template file exists. If not, use the default file.
+        if (!file_exists($file_path)) {
+            $file_path = $this->get_templates_dir_path($base_path . $default_name . '.php');
+        }
+        return $file_path;
+    }
+    private static function find_template_files($path) {
+        $files = [];
+        foreach (glob($path) as $file) {
+            if (is_file($file)) {
+                $files[] = $file;
+            }
+        }
+        return $files;
+    }
+    private static function get_template_name_from_file($file_path, $template_name) {
+        require_once(ABSPATH . 'wp-admin/includes/file.php');
+        WP_Filesystem();
+        global $wp_filesystem;
+        if (!$wp_filesystem || !$wp_filesystem->exists($file_path)) {
+            return basename(sanitize_file_name($file_path), '.php');
+        }
+        $file_contents = $wp_filesystem->get_contents($file_path);
+        $lines = explode("\n", $file_contents);
+        foreach ($lines as $line) {
+            if (stripos($line, $template_name) !== false) {
+                $line = str_replace(['/* ', $template_name, '*/'], '', $line);
+                $line = trim($line);
+                return !empty($line) ? $line : basename($file_path, '.php');
+            }
+        }
+        return basename($file_path, '.php');
+    }
+    public function get_templates_items_array($template_file_location, $template_name, $default_file = false) {
+        $plugin_template_files = self::find_template_files($this->plugin_dir_path . 'templates/' . $template_file_location);
+        // Attempt to get templates from the parent theme directory
+        $parent_template_files = self::find_template_files(get_template_directory() . '/quick-ajax-post-loader/templates/' . $template_file_location);
+        // Attempt to get templates from the child theme directory
+        $child_template_files = [];
+        if (get_template_directory() !== get_stylesheet_directory()) {
+            $child_template_files = self::find_template_files(get_stylesheet_directory() . '/quick-ajax-post-loader/templates/' . $template_file_location);
+        }
+        $template_files_map = [];
+        foreach ([$plugin_template_files, $parent_template_files, $child_template_files] as $files) {
+            foreach ($files as $file_path) {
+                $file_name = sanitize_file_name(basename($file_path, '.php'));
+                $template_files_map[$file_name] = sanitize_text_field($file_path);
+            }
+        }
+        $file_names = [];
+        foreach ($template_files_map as $file_name => $file_path) {
+            $file_names[] = [
+                'file_name' => $file_name,
+                'template_name' => self::get_template_name_from_file($file_path, $template_name)
+            ];
+        }
+        if (!empty($default_file)) {
+            // Iterate over the array to find the default file
+            foreach ($file_names as $index => $file) {
+                if ($file['file_name'] == $default_file) {
+                    // Remove the item from its current position
+                    $item = array_splice($file_names, $index, 1)[0];
+                    // Add the item at the beginning of the array
+                    array_unshift($file_names, $item);
+                    break;
+                }
+            }
+        }
+        return $file_names;
+    }
+    //template post item
+     public function get_post_item_template(string $template_name = ''): string {
+        $default_name = QAPLC::LAYOUT_SETTING_POST_ITEM_TEMPLATE_DEFAULT;
+        return $this->get_templates_file_path($template_name, $default_name, '/post-items/');
+    }
+    //template loader icon
+    public function get_loader_icon_template(string $template_name = ''): string {
+        $default_name = QAPLC::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT;
+        return $this->get_templates_file_path($template_name, $default_name, '/loader-icon/');
+    }
+    //template for no posts found message
+    public function get_no_posts_template(): string {
+        return $this->get_templates_dir_path('/post-items/no-posts.php');
+    }
+    //template for end of posts message
+    public function get_end_posts_template(): string {
+        return $this->get_templates_dir_path('/post-items/end-posts.php');
+    }
+    //template for taxonomy filter button
+    public function get_taxonomy_filter_button_template(): string {
+        return $this->get_templates_dir_path('/taxonomy-filter/taxonomy-filter-button.php');
+    }
+    //template for load more button
+    public function get_load_more_button_template(): string {
+        return $this->get_templates_dir_path('/load-more-button.php');
+    }
+}
+class QAPL_Quick_Ajax_Utilities {
+    public static function element_exists(string $type, string $name) {
+        $exists = false;
+        $type_formatted = '';
+        $plugin_name = QAPLC::PLUGIN_NAME;
+        if ($type === 'class' && class_exists($name)) {
+            $exists = true;
+            $type_formatted = 'class';
+        } else if ($type === 'function' && function_exists($name)) {
+            $exists = true;
+            $type_formatted = 'function';
+        }
+        if ($exists) {
+            add_action('admin_notices', function() use ($name, $type_formatted, $plugin_name) {
+                echo '<div class="notice notice-error"><p><strong>' . esc_html($plugin_name) . '</strong> is not working properly. Error: A ' . esc_html($type_formatted) . ' named <strong>' . esc_html($name) . '</strong> already exists, which may have been declared by another plugin.</p></div>';
+            });
+            return false;
+        }
+        return true;
+    }
+    public static function add_or_update_option_autoload(string $option_name, $default_value = '', string $autoload = 'auto'): void {
+        global $wpdb;
         // Check if the option exists
         $existing_option = get_option($option_name, false);
         if ($existing_option !== false) {
+            // Update autoload value if the option exists
+            global $wpdb;
+            // Update autoload value if the option exists
             $updated = $wpdb->update(
                 $wpdb->options,
 …
         } else {
             // Add the option with specified autoload value
+            add_option($option_name, $default_value, '', $autoload);
+            add_option($option_name, $default_value, '', $autoload);
             //clear cache after adding
             wp_cache_delete($option_name, 'options');
+        }
+    }
+    public static function element_exists($type, $name) {
+        $exists = false;
+        $type_formatted = '';
+        $plugin_info = self::get_plugin_info();
+        $plugin_name = $plugin_info['name'];
+        if ($type === 'class' && class_exists($name)) {
+            $exists = true;
+            $type_formatted = 'class';
+        } else if ($type === 'function' && function_exists($name)) {
+            $exists = true;
+            $type_formatted = 'function';
+        }
+        if ($exists) {
+            add_action('admin_notices', function() use ($name, $type_formatted, $plugin_name) {
+                echo '<div class="notice notice-error"><p><strong>' . esc_html($plugin_name) . '</strong> is not working properly. Error: A ' . esc_html($type_formatted) . ' named <strong>' . esc_html($name) . '</strong> already exists, which may have been declared by another plugin.</p></div>';
+            });
+            return false;
+        }
+        return true;
+    }
+    //template post item
+    public function plugin_templates_post_item_template($template_name = false) {
+        $default_name = self::shortcode_page_layout_post_item_template_default_value();
+        return $this->file_helper->get_templates_file_path($template_name, $default_name, '/post-items/');
+    }
+    //template loader icon
+    public function plugin_templates_loader_icon_template($template_name = false) {
+        $default_name = self::shortcode_page_select_loader_icon_default_value();
+        return $this->file_helper->get_templates_file_path($template_name, $default_name, '/loader-icon/');
+    }
+    public function plugin_templates_no_posts() {
+        return $this->file_helper->get_templates_dir_path('/post-items/no-posts.php');
+    }
+    public function plugin_templates_end_posts() {
+        return $this->file_helper->get_templates_dir_path('/post-items/end-posts.php');
+    }
+    public static function taxonomy_filter_button_data_button(){
+        return 'quick-ajax-filter-button';
+    }
+    public static function sort_option_button_data_button(){
+        return 'quick-ajax-sort-option-button';
+    }
+    public function plugin_templates_taxonomy_filter_button() {
+        return $this->file_helper->get_templates_dir_path('/taxonomy-filter/taxonomy-filter-button.php');
+    }
+    public static function load_more_button_data_button(){
+        return 'quick-ajax-load-more-button';
+    }
+    public function plugin_templates_load_more_button() {
+        return $this->file_helper->get_templates_dir_path('/load-more-button.php');
+    }
+    public static function generate_shortcode($post_id) {
+    }
+}
+class QAPL_Quick_Ajax_Shortcode_Generator {
+    public static function generate_shortcode(int $post_id): string {
         // guard clause to check if $post_id is valid
-        $post_id = intval($post_id);
         if ($post_id <= 0) {
             return '';
 …
         $excluded_post_ids = '';
         // get serialized meta data from the post
         $serialized_data = get_post_meta($post_id, self::quick_ajax_shortcode_settings(), true);
+        $serialized_data = get_post_meta($post_id, QAPLC::DB_POSTMETA_SHORTCODE_SETTINGS, true);
         // check if serialized data exists and process it
         if ($serialized_data) {
 …
             // ensure that the unserialized data is a valid array
             if (is_array($form_data)) {
+                foreach ($form_data as $field_name => $field_value) {
+                    // check for specific field and set excluded post ids
+                    if ($field_name === self::shortcode_page_set_post_not_in() && !empty($field_value)) {
+                        $excluded_post_ids = ' excluded_post_ids="' . esc_attr($field_value) . '"';
+                    }
+                $excluded_key = QAPLC::QUERY_SETTING_SET_POST_NOT_IN;
+                if (isset($form_data[$excluded_key]) && !empty($form_data[$excluded_key])) {
+                    $excluded_post_ids = ' excluded_post_ids="' . esc_attr($form_data[$excluded_key]) . '"';
+                }
+            }
 …
         // generate the shortcode with post ID and title, include excluded post ids if available
         $shortcode = '[qapl-quick-ajax id="' . $post_id . '" title="' . esc_attr($post_title) . '"' . $excluded_post_ids . ']';
-        //apply filters for extendability
-        //$shortcode = apply_filters('generate_shortcode', $shortcode, $post_id)
         return $shortcode;
+    }
+    public static function menu_slug() {
+        return 'qapl-menu';
+    }
+    public static function cpt_shortcode_slug() {
+        return 'qapl-creator';
+    }
+    public static function settings_page_slug() {
+        return 'qapl-settings';
+    }
+    /* quick-ajax-creator shortcode field names */
+    public static function quick_ajax_shortcode_settings() {
+        return '_qapl_quick_ajax_shortcode_settings';
+    }
+    /* old value, not in use from 1.3.3
+    public static function quick_ajax_shortcode_code() {
+        return 'qapl_quick_ajax_shortcode_code';
+    }
+    */
+    public static function quick_ajax_plugin_version() {
+        return 'qapl_quick_ajax_plugin_version';
+    }
+    public static function quick_ajax_plugin_cleanup_flags() {
+        return 'qapl_quick_ajax_cleanup_flags';
+    }
+    public static function settings_wrapper_id() {
+        return 'qapl_settings_wrapper';
+    }
+    public static function wp_nonce_form_quick_ajax_field() {
+        return 'qapl_quick_ajax_nonce';
+    }
+    public static function wp_nonce_form_quick_ajax_action() {
+        return 'qapl_quick_ajax_nonce_action';
+    }
+    public static function shortcode_page_select_post_type() {
+        return 'qapl_select_post_type';
+    }
+    public static function shortcode_page_select_post_type_default_value(){
+        return 'post';
+    }
+    public static function shortcode_page_show_taxonomy_filter(){
+        return 'qapl_show_select_taxonomy';
+    }
+    public static function shortcode_page_show_taxonomy_filter_default_value(){
+        return 0;
+    }
+    public static function shortcode_page_select_taxonomy(){
+        return 'qapl_select_taxonomy';
+    }
+    public static function shortcode_page_manual_term_selection(){
+        return 'qapl_manual_term_selection';
+    }
+    public static function shortcode_page_manual_term_selection_default_value(){
+        return 0;
+    }
+    public static function shortcode_page_manual_selected_terms(){
+        return 'qapl_manual_selected_terms';
+    }
+    public static function shortcode_page_select_posts_per_page(){
+        return 'qapl_select_posts_per_page';
+    }
+    public static function shortcode_page_select_posts_per_page_default_value() {
+        return 6;
+    }
+    public static function shortcode_page_select_order(){
+        return 'qapl_select_order';
+    }
+    public static function shortcode_page_select_order_default_value() {
+        return 'DESC';
+    }
+    public static function shortcode_page_select_orderby(){
+        return 'qapl_select_orderby';
+    }
+    public static function shortcode_page_select_orderby_default_value() {
+        return 'date';
+    }
+    public static function shortcode_page_show_sort_button(){
+        return 'qapl_show_order_button';
+    }
+    public static function shortcode_page_show_sort_button_default_value(){
+        return 0;
+    }
+    public static function shortcode_page_select_sort_button_options(){
+        return 'qapl_select_orderby_button_options';
+    }
+    public static function shortcode_page_select_sort_button_options_values() {
+        $global_sort_labels = get_option(self::admin_page_global_options_name(), []);
+        // Define sort options array with dynamic labels from global settings
+}
+///////////////////////
+// Fields
+//interface for form field data
+//it defines the methods that must exist in any field class
+interface QAPL_Quick_Ajax_Form_Field_Interface {
+    public function get_name(): string;
+    public function get_label(): string;
+    public function get_type(): string;
+    public function get_options(): array;
+    public function get_default();
+    public function get_description(): string;
+    public function get_placeholder(): string;
+    public function get_field(): array;
+}
+//this class holds all field data,
+//it is the final field object
+class QAPL_Quick_Ajax_Form_Field implements QAPL_Quick_Ajax_Form_Field_Interface {
+    private string $name;
+    private string $label;
+    private string $type;
+    private array $options;
+    private $default;
+    private string $description;
+    private string $placeholder;
+    //this constructor sets all properties for the field
+    public function __construct(string $name, string $label, string $type, array $options, $default, string $description, string $placeholder) {
+        $this->name = $name;
+        $this->label = $label;
+        $this->type = $type;
+        $this->options = $options;
+        $this->default = $default;
+        $this->description = $description;
+        $this->placeholder = $placeholder;
+    }
+    //simple get methods to return each property
+    public function get_name(): string {
+        return $this->name;
+    }
+    public function get_label(): string {
+        return $this->label;
+    }
+    public function get_type(): string {
+        return $this->type;
+    }
+    public function get_options(): array {
+        return $this->options;
+    }
+    public function get_default() {
+        return $this->default;
+    }
+    public function get_description(): string {
+        return $this->description;
+    }
+    public function get_placeholder(): string {
+        return $this->placeholder;
+    }
+    //returns all field data in array format
+    public function get_field(): array {
+        return [
+            'name' => $this->name,
+            'label' => $this->label,
+            'type' => $this->type,
+            'options' => $this->options,
+            'default' => $this->default,
+            'description' => $this->description,
+            'placeholder' => $this->placeholder,
+        ];
+    }
+}
+//this class helps build the field object step by step
+//it is useful if you don't want to pass all parameters in constructor
+class QAPL_Quick_Ajax_Form_Field_Builder {
+    private string $name = '';
+    private string $label = '';
+    private string $type = 'text';
+    private array $options = [];
+    private $default = '';
+    private string $description = '';
+    private string $placeholder = '';
+    public function set_name(string $name): self {
+        $this->name = $name;
+        return $this;
+    }
+    public function set_label(string $label): self {
+        $this->label = $label;
+        return $this;
+    }
+    public function set_type(string $type): self {
+        $this->type = $type;
+        return $this;
+    }
+    public function set_options(array $options): self {
+        $this->options = $options;
+        return $this;
+    }
+    public function set_default($default): self {
+        $this->default = $default;
+        return $this;
+    }
+    public function set_description(string $description): self {
+        $this->description = $description;
+        return $this;
+    }
+    public function set_placeholder(string $placeholder): self {
+        $this->placeholder = $placeholder;
+        return $this;
+    }
+    //finally this method creates the final field object
+    //using all the properties you set before
+    public function build(): QAPL_Quick_Ajax_Form_Field_Interface {
+        return new QAPL_Quick_Ajax_Form_Field(
+            $this->name,
+            $this->label,
+            $this->type,
+            $this->options,
+            $this->default,
+            $this->description,
+            $this->placeholder
+        );
+    }
+}
+class QAPL_Quick_Ajax_Form_Field_Factory {
+    //select post type
+    public static function build_select_post_type_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $post_types = get_post_types(['public' => true], 'objects');
+        $options = [];
+        foreach ($post_types as $post_type) {
+            if (isset($post_type->labels->name) && $post_type->labels->name !== 'Media') {
+                $options[] = [
+                    'label' => $post_type->labels->name,
+                    'value' => $post_type->name
+                ];
+            }
+        }
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_POST_TYPE);
+        $builder->set_label(__('Select Post Type', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($options);
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_POST_TYPE_DEFAULT);
+        $builder->set_description(__('Choose the post type you want to display using AJAX.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //show taxonomy checkbox
+    public static function build_show_taxonomy_filter_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SHOW_TAXONOMY_FILTER);
+        $builder->set_label(__('Show Taxonomy Filter', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_SHOW_TAXONOMY_FILTER_DEFAULT);
+        $builder->set_description(__('Enable filtering by taxonomy/category.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select taxonomy
+    public static function build_select_taxonomy_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $options = [];
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_TAXONOMY);
+        $builder->set_label(__('Select Taxonomy', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($options);
+        $builder->set_default('');
+        $builder->set_description(__('Select the taxonomy to be used for filtering posts.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //manual term selection checkbox
+    public static function build_manual_term_selection_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_MANUAL_TERM_SELECTION);
+        $builder->set_label(__('Select Specific Terms', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_MANUAL_TERM_SELECTION_DEFAULT);
+        $builder->set_description(__('Enable manual selection of taxonomy terms to be used for filtering.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //manual selected terms multiselect
+    public static function build_manual_selected_terms_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECTED_TERMS);
+        $builder->set_label(__('Choose Terms', 'quick-ajax-post-loader'));
+        $builder->set_type('multiselect');
+        $builder->set_options([]);
+        $builder->set_default([]);
+        $builder->set_description(__('Select the specific terms to be used for filtering posts. If left empty, no results will be shown.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //post per page number
+    public static function build_posts_per_page_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_POSTS_PER_PAGE);
+        $builder->set_label(__('Posts Per Page', 'quick-ajax-post-loader'));
+        $builder->set_type('number');
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_POSTS_PER_PAGE_DEFAULT);
+        $builder->set_description(__('Determine the number of posts to be loaded per AJAX request.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select post order
+    public static function build_select_order_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $order_options = [
+            [
+                'label' => __('Descending - order from highest to lowest', 'quick-ajax-post-loader'),
+                'value' => 'DESC'
+            ],
+            [
+                'label' => __('Ascending - order from lowest to highest', 'quick-ajax-post-loader'),
+                'value' => 'ASC'
+            ],
+        ];
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_ORDER);
+        $builder->set_label(__('Default Sort Order', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($order_options);
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_ORDER_DEFAULT);
+        $builder->set_description(__('Specify the order of posts.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select post orderby
+    public static function build_select_orderby_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $orderby_options = [
+            [
+                'label' => __('Date: Sort by publication date', 'quick-ajax-post-loader'),
+                'value' => 'date'
+            ],
+            [
+                'label' => __('Title: Sort by post title', 'quick-ajax-post-loader'),
+                'value' => 'title'
+            ],
+            [
+                'label' => __('Comments: Sort by comment count', 'quick-ajax-post-loader'),
+                'value' => 'comment_count'
+            ],
+            [
+                'label' => __('Random: Random order', 'quick-ajax-post-loader'),
+                'value' => 'rand'
+            ],
+        ];
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_ORDERBY);
+        $builder->set_label(__('Default Sort By', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($orderby_options);
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_ORDERBY_DEFAULT);
+        $builder->set_description(__('Choose the sorting criteria for posts.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //show sort button
+    public static function build_show_sort_button_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SHOW_SORT_BUTTON);
+        $builder->set_label(__('Show Sorting Button', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_SHOW_SORT_BUTTON_DEFAULT);
+        $builder->set_description(__('Enable a button that allows users to switch between ascending and descending order.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select sort button
+    public static function build_select_sort_button_options_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $global_sort_labels = get_option(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME, []);
         $sort_options = [
+            [
 …
+            [
                 'value' => 'title-asc',
+                'label' => isset($global_sort_labels['sort_option_title_desc_label'])
+                    ? $global_sort_labels['sort_option_title_desc_label']
+                    : __('A → Z', 'quick-ajax-post-loader')
+            ],
+            [
+                'value' => 'title-desc',
                 'label' => isset($global_sort_labels['sort_option_title_asc_label'])
                     ? $global_sort_labels['sort_option_title_asc_label']
-                    : __('A → Z', 'quick-ajax-post-loader')
-            ],
+            [
-                'value' => 'title-desc',
-                'label' => isset($global_sort_labels['sort_option_title_desc_label'])
-                    ? $global_sort_labels['sort_option_title_desc_label']
                     : __('Z → A', 'quick-ajax-post-loader')
             ],
 …
             ],
         ];
+        return $sort_options;
+    }
+    public static function shortcode_page_select_sort_button_options_default_value(){
+        return 1;
+    }
+    public static function shortcode_page_show_inline_filter_sorting(){
+        return 'qapl_show_inline_filter_sorting';
+    }
+    public static function shortcode_page_show_inline_filter_sorting_default_value(){
+        return 1;
+    }
+    //public static function shortcode_page_select_post_status(){
+    //    return 'qapl_select_post_status';
+    //}
+    public static function shortcode_page_select_post_status_default_value(){
+        return 'publish';
+    }
+    public static function shortcode_page_ignore_sticky_posts(){
+        return 'qapl_ignore_sticky_posts';
+    }
+    public static function shortcode_page_ignore_sticky_posts_default_value() {
+        return false;
+    }
+    public static function shortcode_page_ajax_on_initial_load(){
+        return 'qapl_ajax_on_initial_load';
+    }
+    public static function shortcode_page_ajax_on_initial_load_default_value(){
+        return false;
+    }
+    public static function shortcode_page_ajax_infinite_scroll(){
+        return 'qapl_ajax_infinite_scroll';
+    }
+    public static function shortcode_page_ajax_infinite_scroll_default_value(){
+        return false;
+    }
+    public static function shortcode_page_show_end_message(){
+        return 'qapl_show_end_post_message';
+    }
+    public static function shortcode_page_show_end_message_default_value(){
+        return false;
+    }
+    public static function shortcode_page_set_post_not_in(){
+        return 'qapl_select_post_not_in';
+    }
+    public static function shortcode_page_layout_select_columns_qty(){
+        return 'qapl_layout_select_columns_qty';
+    }
+    public static function shortcode_page_layout_select_columns_qty_default_value(){
+        return 3;
+    }
+    public static function shortcode_page_layout_taxonomy_filter_class(){
+        return 'qapl_layout_add_taxonomy_filter_class';
+    }
+    public static function shortcode_page_layout_container_class(){
+        return 'qapl_layout_add_container_class';
+    }
+    public static function shortcode_page_layout_quick_ajax_css_style(){
+        return 'qapl_layout_quick_ajax_css_style';
+    }
+    public static function shortcode_page_layout_quick_ajax_css_style_default_value(){
+        return 1;
+    }
+    public static function shortcode_page_layout_post_item_template(){
+        return 'qapl_layout_quick_ajax_post_item_template';
+    }
+    public static function shortcode_page_layout_post_item_template_default_value(){
+        return 'post-item';
+    }
+    public static function shortcode_page_show_custom_load_more_post_quantity(){
+        return 'qapl_show_custom_load_more_post_quantity';
+    }
+    public static function shortcode_page_show_custom_load_more_post_quantity_default_value(){
+        return 0;
+    }
+    public static function shortcode_page_select_custom_load_more_post_quantity(){
+        return 'qapl_select_custom_load_more_post_quantity';
+    }
+    public static function shortcode_page_select_custom_load_more_post_quantity_default_value(){
+        return 4;
+    }
+    public static function shortcode_page_override_global_loader_icon(){
+        return 'qapl_override_global_loader_icon';
+    }
+    public static function shortcode_page_override_global_loader_icon_default_value(){
+        return 0;
+    }
+    public static function shortcode_page_select_loader_icon(){
+        return 'qapl_loader_icon';
+    }
+    public static function shortcode_page_select_loader_icon_default_value(){
+        return 'loader-icon';
+    }
+    // attributes query names
+    public static function query_settings_ajax_on_initial_load(){
+       return 'ajax_initial_load';
+    }
+    public static function layout_quick_ajax_id(){
+        return 'quick_ajax_id';
+    }
+    public static function layout_quick_ajax_css_style(){
+        return 'quick_ajax_css_style';
+    }
+    public static function layout_container_num_columns(){
+        return 'grid_num_columns';
+    }
+    public static function layout_post_item_template(){
+        return 'post_item_template';
+    }
+    public static function layout_taxonomy_filter_class(){
+        return 'taxonomy_filter_class';
+    }
+    public static function layout_container_class(){
+        return 'container_class';
+    }
+    public static function layout_load_more_posts(){
+        return 'load_more_posts';
+    }
+    public static function layout_select_loader_icon(){
+        return 'loader_icon';
+    }
+    public static function layout_ajax_infinite_scroll(){
+        return 'infinite_scroll';
+    }
+    public static function layout_show_end_message(){
+        return 'show_end_message';
+    }
+    /* Quick AJAX Settings */
+    public static function admin_page_settings_field_option_group(){
+        return 'qapl_settings_group';
+    }
+    public static function admin_page_global_options_name(){
+        return 'qapl_quick_ajax_global_options';
+    }
+    /* Quick AJAX Global Options */
+    public static function global_options_field_select_loader_icon(){
+        return self::admin_page_global_options_name().'[loader_icon]';
+    }
+    public static function global_options_field_set_read_more_label(){
+        return self::admin_page_global_options_name().'[read_more_label]';
+    }
+    public static function global_options_field_set_post_date_format(){
+        return self::admin_page_global_options_name().'[post_date_format]';
+    }
+    public static function global_options_field_set_show_all_label(){
+        return self::admin_page_global_options_name().'[show_all_label]';
+    }
+    public static function global_options_field_set_load_more_label(){
+        return self::admin_page_global_options_name().'[load_more_label]';
+    }
+    public static function global_options_field_set_no_post_message(){
+        return self::admin_page_global_options_name().'[no_post_message]';
+    }
+    public static function global_options_field_set_end_post_message(){
+        return self::admin_page_global_options_name().'[end_post_message]';
+    }
+    //Sorting Options Labels
+    public static function global_options_field_set_sort_option_date_desc_label(){
+        return self::admin_page_global_options_name().'[sort_option_date_desc_label]';
+    }
+    public static function global_options_field_set_sort_option_date_asc_label(){
+        return self::admin_page_global_options_name().'[sort_option_date_asc_label]';
+    }
+    public static function global_options_field_set_sort_option_comment_count_desc_label(){
+        return self::admin_page_global_options_name().'[sort_option_comment_count_desc_label]';
+    }
+    public static function global_options_field_set_sort_option_title_desc_label(){
+        return self::admin_page_global_options_name().'[sort_option_title_desc_label]';
+    }
+    public static function global_options_field_set_sort_option_title_asc_label(){
+        return self::admin_page_global_options_name().'[sort_option_title_asc_label]';
+    }
+    public static function global_options_field_set_sort_option_rand_label(){
+        return self::admin_page_global_options_name().'[sort_option_rand_label]';
+    }
+    /* Quick AJAX placeholders */
+    /* not in use after removing placeholders
+    public static function placeholder_read_more_label() {
+        return [
+            'placeholder' => '[[QAPL::READ_MORE_LABEL]]',
+            'option_key' => 'read_more_label',
+            'default' => __('Read More', 'quick-ajax-post-loader'),
+        ];
+    }
+    public static function placeholder_show_all_label() {
+        return [
+            'placeholder' => '[[QAPL::SHOW_ALL_LABEL]]',
+            'option_key' => 'show_all_label',
+            'default' => __('Show All', 'quick-ajax-post-loader'),
+        ];
+    }
+    public static function placeholder_load_more_label() {
+        return [
+            'placeholder' => '[[QAPL::LOAD_MORE_LABEL]]',
+            'option_key' => 'load_more_label',
+            'default' => __('Load More', 'quick-ajax-post-loader'),
+        ];
+    }
+    public static function get_all_placeholders() {
+        return [
+            self::placeholder_read_more_label(),
+            self::placeholder_load_more_label(),
+            self::placeholder_show_all_label(),
+        ];
+    }
+        */
+}
+class QAPL_File_Helper {
+    private static $instance = null;
+    private $plugin_dir_path;
+    private $plugin_dir_url;
+    private function __construct($plugin_dir_path, $plugin_dir_url) {
+        $this->plugin_dir_path = $plugin_dir_path;
+        $this->plugin_dir_url = $plugin_dir_url;
+    }
+    public static function get_instance() {
+        if (self::$instance === null) {
+            // set base plugin directory paths
+            $plugin_dir_path = plugin_dir_path(__DIR__);
+            $plugin_dir_url = plugin_dir_url(__DIR__);
+            self::$instance = new self($plugin_dir_path, $plugin_dir_url);
+        }
+        return self::$instance;
+    }
+    public function file_exists($file_path) {
+        //print_r($file_path);
+        $full_path = $this->plugin_dir_path . ltrim($file_path, '/');
+        return file_exists($full_path) ? $full_path : false;
+    }
+    public function get_plugin_directory() {
+        return $this->plugin_dir_url;
+    }
+    public function get_plugin_js_directory() {
+        return $this->plugin_dir_url . 'js/';
+    }
+    public function get_plugin_css_directory() {
+        return $this->plugin_dir_url . 'css/';
+    }
+    //template dir path
+    public function get_templates_dir_path($file) {
+        // Path to the template in the child theme (or the theme itself if not using a child theme)
+        $child_theme_template_path = get_stylesheet_directory() . '/quick-ajax-post-loader/templates' . $file;
+        // Check if the template exists in the child theme
+        if (file_exists($child_theme_template_path)) {
+            return $child_theme_template_path;
+        }
+        // Path to the template in the parent theme
+        $theme_template_path = get_template_directory() . '/quick-ajax-post-loader/templates' . $file;
+        // Check if the template exists in the parent theme
+        if (file_exists($theme_template_path)) {
+            return $theme_template_path;
+        }
+        // Path to the template in the plugin
+        $plugin_template_path = $this->plugin_dir_path . 'templates' . $file;
+        // Check if the template exists in the plugin
+        if (file_exists($plugin_template_path)) {
+            return $plugin_template_path;
+        }
+        // Template was not found
+        return false;
+    }
+    //template file path
+    public function get_templates_file_path($template_name, $default_name, $base_path) {
+        // Use the provided template name if given; otherwise, use the default name.
+        $template_name = sanitize_file_name(empty($template_name) ? $default_name : $template_name);
+        $file_path = $this->get_templates_dir_path($base_path . $template_name . '.php');
+        // Check if the template file exists. If not, use the default file.
+        if (!file_exists($file_path)) {
+            $file_path = $this->get_templates_dir_path($base_path . $default_name . '.php');
+        }
+        return $file_path;
+    }
+    private static function find_template_files($path) {
+        $files = [];
+        foreach (glob($path) as $file) {
+            if (is_file($file)) {
+                $files[] = $file;
+            }
+        }
+        return $files;
+    }
+    private static function get_template_name_from_file($file_path, $template_name) {
+        require_once(ABSPATH . 'wp-admin/includes/file.php');
+        WP_Filesystem();
+        global $wp_filesystem;
+        if (!$wp_filesystem || !$wp_filesystem->exists($file_path)) {
+            return basename(sanitize_file_name($file_path), '.php');
+        }
+        $file_contents = $wp_filesystem->get_contents($file_path);
+        $lines = explode("\n", $file_contents);
+        foreach ($lines as $line) {
+            if (stripos($line, $template_name) !== false) {
+                $line = str_replace(['/* ', $template_name, '*/'], '', $line);
+                $line = trim($line);
+                return !empty($line) ? $line : basename($file_path, '.php');
+            }
+        }
+        return basename($file_path, '.php');
+    }
+    public function plugin_get_templates_items_array($template_file_location, $template_name, $default_file = false) {
+        $plugin_template_files = self::find_template_files($this->plugin_dir_path . 'templates/' . $template_file_location);
+        // Attempt to get templates from the parent theme directory
+        $parent_template_files = self::find_template_files(get_template_directory() . '/quick-ajax-post-loader/templates/' . $template_file_location);
+        // Attempt to get templates from the child theme directory
+        $child_template_files = [];
+        if (get_template_directory() !== get_stylesheet_directory()) {
+            $child_template_files = self::find_template_files(get_stylesheet_directory() . '/quick-ajax-post-loader/templates/' . $template_file_location);
+        }
+        $template_files_map = [];
+        foreach ([$plugin_template_files, $parent_template_files, $child_template_files] as $files) {
+            foreach ($files as $file_path) {
+                $file_name = sanitize_file_name(basename($file_path, '.php'));
+                $template_files_map[$file_name] = sanitize_text_field($file_path);
+            }
+        }
+        $file_names = [];
+        foreach ($template_files_map as $file_name => $file_path) {
+            $file_names[] = [
+                'file_name' => $file_name,
+                'template_name' => self::get_template_name_from_file($file_path, $template_name)
+            ];
+        }
+        if (!empty($default_file)) {
+            // Iterate over the array to find the default file
+            foreach ($file_names as $index => $file) {
+                if ($file['file_name'] == $default_file) {
+                    // Remove the item from its current position
+                    $item = array_splice($file_names, $index, 1)[0];
+                    // Add the item at the beginning of the array
+                    array_unshift($file_names, $item);
+                    break;
+                }
+            }
+        }
+        return $file_names;
+    }
+}
+class QAPL_Pages_Helper{
+    private $file_helper;
+     //construct expects instance of QAPL_File_Helper
+    public function __construct(QAPL_File_Helper $file_helper) {
+        $this->file_helper = $file_helper;
+    }
+    public function plugin_admin_pages_config() {
+        return $this->file_helper->file_exists('admin/admin-pages-config.php');
+    }
+    public function plugin_settings_page() {
+        return $this->file_helper->file_exists('admin/pages/settings-page.php');
+    }
+    public function plugin_shortcode_page() {
+        return $this->file_helper->file_exists('admin/pages/shortcode-page.php');
+    }
+    public function plugin_ajax_class() {
+        return $this->file_helper->file_exists('inc/class-ajax.php');
+    }
+    public function plugin_shortcode_class() {
+        return $this->file_helper->file_exists('inc/class-shortcode.php');
+    }
+    public function plugin_ajax_actions() {
+        return $this->file_helper->file_exists('inc/actions.php');
+    }
+    public function plugin_functions() {
+        return $this->file_helper->file_exists('inc/functions.php');
+    }
+    public function plugin_updater() {
+        return $this->file_helper->file_exists('inc/class-updater.php');
+    }
+    public function plugin_template_hooks() {
+        return $this->file_helper->file_exists('inc/class-template-hooks.php');
+    }
+    public function plugin_deprecated_hooks_handler() {
+        return $this->file_helper->file_exists('inc/class-deprecated-hooks-handler.php');
+    }
+    public function plugin_register_dev_hooks() {
+        return $this->file_helper->file_exists('dev-tools/dev-hooks.php');
+    }
+}
+class QAPL_Form_Fields_Helper{
+    private static $file_helper;
+    //set the QAPL_File_Helper instance if not already done
+    private static function get_file_helper() {
+        if (!self::$file_helper) {
+            self::$file_helper = QAPL_File_Helper::get_instance();
+        }
+        return self::$file_helper;
+    }
+    //select post type
+    public static function get_field_select_post_type(){
+        $post_types = get_post_types(array('public' => true, 'publicly_queryable' => true), 'objects');
+        $post_type_options = array();
+        foreach ($post_types as $post_type) {
+            if (isset($post_type->labels->name) && $post_type->labels->name !== 'Media') {
+                $post_type_options[] = array(
+                    'label' => $post_type->labels->name,
+                    'value' => $post_type->name,
+                );
+            }
+        }
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type(),
+            'label' => __('Select Post Type', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $post_type_options,
+            'description' => __('Choose the post type you want to display using AJAX.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //show taxonomy checkbox
+    public static function get_field_show_taxonomy_filter(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter(),
+            'label' => __('Show Taxonomy Filter', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter_default_value(),
+            'description' => __('Enable filtering by taxonomy/category.', 'quick-ajax-post-loader')
+        );
+    }
+    //select taxonomy
+    public static function get_field_select_taxonomy(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy(),
+            'label' => __('Select Taxonomy', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => '',
+            'default' => '',
+            'description' => __('Select the taxonomy to be used for filtering posts.', 'quick-ajax-post-loader')
+        );
+    }
+    //manual term selection checkbox
+    public static function get_field_manual_term_selection(){
+        return array(
+            'name'        => QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection(),
+            'label'       => __('Select Specific Terms', 'quick-ajax-post-loader'),
+            'type'        => 'checkbox',
+            'default'     => QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection_default_value(),
+            'description' => __('Enable manual selection of taxonomy terms to be used for filtering.', 'quick-ajax-post-loader')
+        );
+    }
+    //manual selected terms multiselect
+    public static function get_field_manual_selected_terms(){
+        return array(
+            'name'        => QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms(),
+            'label'       => __('Choose Terms', 'quick-ajax-post-loader'),
+            'type'        => 'multiselect',
+            'options'     => '',
+            'default'     => array(),
+            'description' => __('Select the specific terms to be used for filtering posts. If left empty, no results will be shown.', 'quick-ajax-post-loader')
+        );
+    }
+    //post per page number
+    public static function get_field_select_posts_per_page(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_posts_per_page(),
+            'label' => __('Posts Per Page', 'quick-ajax-post-loader'),
+            'type' => 'number',
+            'options' => '',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_posts_per_page_default_value(),
+            'description' => __('Determine the number of posts to be loaded per AJAX request.', 'quick-ajax-post-loader')
+        );
+    }
+    //select post order
+    public static function get_field_select_order(){
+        $order_options = array(
+            array(
+                'label' => __('Descending - order from highest to lowest', 'quick-ajax-post-loader'),
+                'value' => 'DESC'
+            ),
+            array(
+                'label' => __('Ascending - order from lowest to highest', 'quick-ajax-post-loader'),
+                'value' => 'ASC'
+            )
+        );
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_order(),
+            'label' => __('Default Sort Order', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $order_options,
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_order_default_value(),
+            'description' => __('Specify the order of posts.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //select post orderby
+    public static function get_field_select_orderby(){
+        $orderby_options = [
+            ['value' => 'date', 'label' => __('Date: Sort by publication date', 'quick-ajax-post-loader')],
+            ['value' => 'title', 'label' => __('Title: Sort by post title', 'quick-ajax-post-loader')],
+            ['value' => 'comment_count', 'label' => __('Comments: Sort by comment count', 'quick-ajax-post-loader')],
+            ['value' => 'rand', 'label' => __('Random: Random order', 'quick-ajax-post-loader')],
+            //['value' => 'menu_order', 'label' => __('Menu Order: Sort by custom menu order', 'quick-ajax-post-loader')],
+        ];
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_orderby(),
+            'label' => __('Default Sort By', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $orderby_options,
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_orderby_default_value(),
+            'description' => __('Choose the sorting criteria for posts.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //show sort button
+    public static function get_field_show_sort_button(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button(),
+            'label' => __('Show Sorting Button', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button_default_value(),
+            'description' => __('Enable a button that allows users to switch between ascending and descending order.', 'quick-ajax-post-loader')
+        );
+    }
+    //select sort button
+    public static function get_field_select_sort_button_options(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options(),
+            'label' => __('Available Sorting Options', 'quick-ajax-post-loader'),
+            'type' => 'multiselect',
+            'options' => QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options_values(),
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options_default_value(),
+            'description' => __('Select which sorting options will be available to users.', 'quick-ajax-post-loader')
+        );
+    }
+    public static function get_field_show_inline_filter_sorting(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_show_inline_filter_sorting(),
+            'label' => __('Inline Filter & Sorting', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_show_inline_filter_sorting_default_value(),
+            'description' => __('Display taxonomy filter and sorting options in a single row to save space and improve layout', 'quick-ajax-post-loader')
+        );
+    }
+    //select post status
+    /*public static function get_field_select_post_status(){
+        $post_status_options = array(
+            array(
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS);
+        $builder->set_label(__('Available Sorting Options', 'quick-ajax-post-loader'));
+        $builder->set_type('multiselect');
+        $builder->set_options($sort_options);
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS_DEFAULT);
+        $builder->set_description(__('Select which sorting options will be available to users.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //Inline Filter & Sorting
+    public static function build_show_inline_filter_sorting_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SHOW_INLINE_FILTER_SORTING);
+        $builder->set_label(__('Inline Filter & Sorting', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_SHOW_INLINE_FILTER_SORTING_DEFAULT);
+        $builder->set_description(__('Display taxonomy filter and sorting options in a single row to save space and improve layout.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    /*
+    public static function create_post_status_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $post_status_options = [
+            [
                 'label' => __('Publish: Published posts', 'quick-ajax-post-loader'),
                 'value' => 'publish'
             ),
             array(
+            ],
+            [
                 'label' => __('Draft: Draft posts', 'quick-ajax-post-loader'),
                 'value' => 'draft'
             ),
             array(
+            ],
+            [
                 'label' => __('Pending: Pending review posts', 'quick-ajax-post-loader'),
                 'value' => 'pending'
             ),
             array(
+            ],
+            [
                 'label' => __('Private: Private posts', 'quick-ajax-post-loader'),
                 'value' => 'private'
             ),
             array(
+            ],
+            [
                 'label' => __('Trash: Trashed posts', 'quick-ajax-post-loader'),
                 'value' => 'trash'
             ),
             array(
+            ],
+            [
                 'label' => __('Auto-Draft: Auto-draft posts', 'quick-ajax-post-loader'),
                 'value' => 'auto-draft'
             ),
             array(
+            ],
+            [
                 'label' => __('Inherit: Inherited posts', 'quick-ajax-post-loader'),
                 'value' => 'inherit'
+            ),
+        );
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_post_status(),
+            'label' => __('Post Status', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $post_status_options,
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_post_status_default_value(),
+            'description' => __('Select the post status to be used by AJAX.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+            ],
+        ];
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_POST_STATUS);
+        $builder->set_label(__('Post Status', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($post_status_options);
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_POST_STATUS_DEFAULT);
+        $builder->set_description(__('Select the post status to be used by AJAX.', 'quick-ajax-post-loader'));
+        return $builder->build();
     }*/
     //add Excluded Post IDs
+    public static function get_field_set_post_not_in(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_set_post_not_in(),
+            'label' => __('Excluded Post IDs', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '',
+            'default' => '',
+            'placeholder' => '3, 66, 999',
+            'description' => __('Enter a list of post IDs to exclude from the query.', 'quick-ajax-post-loader'),
+        );
+        return $field_properties;
+    public static function build_excluded_post_ids_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SET_POST_NOT_IN);
+        $builder->set_label(__('Excluded Post IDs', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default('');
+        $builder->set_placeholder('3, 66, 999');
+        $builder->set_description(__('Enter a list of post IDs to exclude from the query.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     //set Ignore Sticky Posts
+    public static function get_field_set_ignore_sticky_posts(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_ignore_sticky_posts(),
+            'label' => __('Ignore Sticky Posts', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'options' => '',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_ignore_sticky_posts_default_value(),
+            'description' => __('Specify to ignore sticky posts, treating them as regular posts in the query.', 'quick-ajax-post-loader')
+        );
+    public static function build_ignore_sticky_posts_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_IGNORE_STICKY_POSTS);
+        $builder->set_label(__('Ignore Sticky Posts', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_IGNORE_STICKY_POSTS_DEFAULT);
+        $builder->set_description(__('Specify to ignore sticky posts, treating them as regular posts in the query.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     //add Load Posts via AJAX on Initial Load
+    public static function get_field_set_ajax_on_initial_load(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_on_initial_load(),
+            'label' => __('Load Initial Posts via AJAX', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'options' => '',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_on_initial_load_default_value(),
+            'description' => __('Enable this option to load the initial set of posts via AJAX on page load. This can help in cases where caching might cause outdated content to be displayed.', 'quick-ajax-post-loader')
+        );
+    public static function build_ajax_on_initial_load_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_AJAX_ON_INITIAL_LOAD);
+        $builder->set_label(__('Load Initial Posts via AJAX', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_AJAX_ON_INITIAL_LOAD_DEFAULT);
+        $builder->set_description(__('Enable this option to load the initial set of posts via AJAX on page load. This can help in cases where caching might cause outdated content to be displayed.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     // add Infinite Scroll via AJAX
+    public static function get_field_set_ajax_infinite_scroll(){
+        return array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_infinite_scroll(),
+            'label' => __('Enable Infinite Scroll', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'options' => '',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_infinite_scroll_default_value(),
+            'description' => __('Enable this option to automatically load more posts via AJAX as the user scrolls down the page.', 'quick-ajax-post-loader')
+        );
+    public static function build_ajax_infinite_scroll_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_AJAX_INFINITE_SCROLL);
+        $builder->set_label(__('Enable Infinite Scroll', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_AJAX_INFINITE_SCROLL_DEFAULT);
+        $builder->set_description(__('Enable this option to automatically load more posts via AJAX as the user scrolls down the page.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     // show end message
+    public static function get_field_set_show_end_message() {
+        return array(
+            'name'        => QAPL_Quick_Ajax_Helper::shortcode_page_show_end_message(),
+            'label'       => __('Show End Message', 'quick-ajax-post-loader'),
+            'type'        => 'checkbox',
+            'options'     => '',
+            'default'     => QAPL_Quick_Ajax_Helper::shortcode_page_show_end_message_default_value(),
+            'description' => __('Display a message when there are no more posts to load via AJAX.', 'quick-ajax-post-loader')
+        );
+    }
+    public static function build_show_end_message_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SHOW_END_MESSAGE);
+        $builder->set_label(__('Show End Message', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_SHOW_END_MESSAGE_DEFAULT);
+        $builder->set_description(__('Display a message when there are no more posts to load via AJAX.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     //apply quick ajax css style
+    public static function get_field_layout_quick_ajax_css_style(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style(),
+            'label' => __('Apply Quick AJAX CSS Style', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'options' => '',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style_default_value(),
+            'description' => __('Apply Quick AJAX CSS styles and column layout.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    public static function build_quick_ajax_css_style_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE);
+        $builder->set_label(__('Apply Quick AJAX CSS Style', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE_DEFAULT);
+        $builder->set_description(__('Apply Quick AJAX CSS styles and column layout.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
     //select number of columns
     public static function get_field_layout_select_columns_qty(){
         $columns_qty_options = array();
         for ($i = 1; $i <= 12; $i++) {
             $columns_qty_options[] = array(
+    public static function build_select_columns_qty_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $columns_options = [];
+                for ($i = 1; $i <= 12; $i++) {
+            $columns_options[] = array(
                 'label' =>  strval($i),
                 'value' => $i
             );
+        }
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_select_columns_qty(),
+            'label' => __('Number of Columns', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $columns_qty_options,
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_select_columns_qty_default_value(),
+            'description' => __('Specify the quantity of columns.', 'quick-ajax-post-loader')
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_SELECT_COLUMNS_QTY);
+        $builder->set_label(__('Number of Columns', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($columns_options);
+        $builder->set_default(QAPLC::LAYOUT_SETTING_SELECT_COLUMNS_QTY_DEFAULT);
+        $builder->set_description(__('Specify the quantity of columns.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select post item template
+    public static function build_post_item_template_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $file_manager = new QAPL_Quick_Ajax_File_Manager();
+        $templates = $file_manager->get_templates_items_array('post-items/post-item*.php', 'Post Item Name:', QAPLC::LAYOUT_SETTING_POST_ITEM_TEMPLATE_DEFAULT);
+        $options = [];
+        foreach ($templates as $template) {
+            $options[] = [
+                'label' => $template['template_name'],
+                'value' => $template['file_name']
+            ];
+        }
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_POST_ITEM_TEMPLATE);
+        $builder->set_label(__('Select Post Item Template', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($options);
+        $builder->set_default(QAPLC::LAYOUT_SETTING_POST_ITEM_TEMPLATE_DEFAULT);
+        $builder->set_description(__('Choose a template for displaying post items.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //add custom class for taxonomy filter
+    public static function build_taxonomy_filter_class_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_TAXONOMY_FILTER_CLASS);
+        $builder->set_label(__('Add Class to Taxonomy Filter', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(QAPLC::LAYOUT_SETTING_TAXONOMY_FILTER_CLASS_DEFAULT);
+        $builder->set_placeholder(__('class-name, another-class-name', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Add classes to the filter: class-one, class-two, class-three', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //add custom class for container
+    public static function build_container_class_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_CONTAINER_CLASS);
+        $builder->set_label(__('Add Class to Post Container', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(QAPLC::LAYOUT_SETTING_CONTAINER_CLASS_DEFAULT);
+        $builder->set_placeholder(__('class-name, another-class-name', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Add classes to the post container: class-one, class-two, class-three', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //show custom load more post quantity
+    public static function build_show_custom_load_more_post_quantity_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY);
+        $builder->set_label(__('Load More Post Quantity', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY_DEFAULT);
+        $builder->set_description(__('Load a different number of posts after the initial display.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select custom load more post quantity
+    public static function build_select_custom_load_more_post_quantity_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY);
+        $builder->set_label(__('Posts Per Load (After Initial)', 'quick-ajax-post-loader'));
+        $builder->set_type('number');
+        $builder->set_default(QAPLC::QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY_DEFAULT);
+        $builder->set_description(__('Set how many posts to load each time the "Load More" button is clicked.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //override global loader icon
+    public static function build_override_global_loader_icon_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON);
+        $builder->set_label(__('Override Global Loader Icon', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON_DEFAULT);
+        $builder->set_description(__('Set a different loader icon than the one specified in global options.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //select loader icon
+    public static function build_select_loader_icon(): QAPL_Quick_Ajax_Form_Field_Interface {
+        return self::loader_icon_get_field(
+            QAPLC::LAYOUT_SETTING_SELECT_LOADER_ICON,
+            QAPLC::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT
         );
+        return $field_properties;
+    }
+    //select post item template
+    public static function get_field_layout_post_item_template(){
+        $post_item_template_options = array();
+        $file_helper = self::get_file_helper();
+        $post_item_templates = $file_helper->plugin_get_templates_items_array('post-items/post-item*.php', 'Post Item Name:', QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template_default_value());
+        foreach($post_item_templates as $item){
+            $post_item_template_options[] = array(
+    }
+    //select loader icon global
+    public static function build_global_select_loader_icon(): QAPL_Quick_Ajax_Form_Field_Interface {
+        return self::loader_icon_get_field(
+            QAPLC::GLOBAL_LOADER_ICON_FIELD,
+            QAPLC::LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT
+        );
+    }
+    //build loader icon select field
+    private static function loader_icon_get_field(string $name, string $default): QAPL_Quick_Ajax_Form_Field_Interface {
+        $file_helper = new QAPL_Quick_Ajax_File_Manager();
+        $templates = $file_helper->get_templates_items_array('loader-icon/*.php','Loader Icon Name:',$default);
+        $options = [];
+        foreach ($templates as $item) {
+            $options[] = [
                 'label' => $item['template_name'],
                 'value' => $item['file_name']
+            );
+        }
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template(),
+            'label' => __('Select Post Item Template', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $post_item_template_options,
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template_default_value(),
+            'description' => __('Choose a template for displaying post items.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //add custom class for taxonomy filter
+    public static function get_field_layout_taxonomy_filter_class(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_taxonomy_filter_class(),
+            'label' => __('Add Class to Taxonomy Filter', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '',
+            'default' => '',
+            'placeholder' => __('class-name, another-class-name', 'quick-ajax-post-loader'),
+            'description' => __('Add classes to the filter: class-one, class-two, class-three', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //add custom class for container
+    public static function get_field_layout_container_class(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_container_class(),
+            'label' => __('Add Class to Post Container', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '',
+            'default' => '',
+            'placeholder' => __('class-name, another-class-name', 'quick-ajax-post-loader'),
+            'description' => __('Add classes to the post container: class-one, class-two, class-three', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //show custom load more post quantity
+    public static function get_field_show_custom_load_more_post_quantity(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity(),
+            'label' => __('Load More Post Quantity', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity_default_value(),
+            'description' => __('Load a different number of posts after the initial display.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //select custom load more post quantity
+    public static function get_field_select_custom_load_more_post_quantity(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_select_custom_load_more_post_quantity(),
+            'label' => __('Posts Per Load (After Initial)', 'quick-ajax-post-loader'),
+            'type' => 'number',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_select_custom_load_more_post_quantity_default_value(),
+            'description' => __('Set how many posts to load each time the "Load More" button is clicked.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //override global loader icon
+    public static function get_field_override_global_loader_icon(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon(),
+            'label' => __('Override Global Loader Icon', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'default' => QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon_default_value(),
+            'description' => __('Set a different loader icon than the one specified in global options.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    //select loader icon
+    public static function get_field_select_loader_icon(){
+        $field_properties = self::select_loader_icon_properties(QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon(), QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon_default_value());
+        return $field_properties;
+    }
+    //select loader icon global
+    public static function get_global_field_select_loader_icon(){
+        $field_properties = self::select_loader_icon_properties(QAPL_Quick_Ajax_Helper::global_options_field_select_loader_icon(), QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon_default_value());
+        return $field_properties;
+    }
+    private static function select_loader_icon_properties($field_name, $field_default_value) {
+        $loader_icon_options = array();
+        $file_helper = self::get_file_helper();
+        $loader_icon_templates = $file_helper->plugin_get_templates_items_array('loader-icon/*.php', 'Loader Icon Name:', QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon_default_value());
+        foreach($loader_icon_templates as $item){
+            $loader_icon_options[] = array(
+                'label' => $item['template_name'],
+                'value' => $item['file_name']
+            );
+        }
+        $field_properties = array(
+            'name' => $field_name,
+            'label' => __('Select Loader Icon', 'quick-ajax-post-loader'),
+            'type' => 'select',
+            'options' => $loader_icon_options,
+            'default' => $field_default_value,
+            'description' => __('Choose an icon to display as the loading indicator when the "Load More" button is clicked.', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_read_more_label(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_read_more_label(),
+            'label' => __('Set "Read More" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Read More', 'quick-ajax-post-loader'),
+            'placeholder' => __('Enter custom label for Read More', 'quick-ajax-post-loader'),
+            'description' => __('Customize the "Read More" text for your templates. This label will appear as a link or button for each post item. Examples: "Read More", "Continue Reading", or "Learn More".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_show_all_label(){
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_show_all_label(),
+            'label' => __('Set "Show All" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Show All', 'quick-ajax-post-loader'),
+            'placeholder' => __('Enter custom label for Show All', 'quick-ajax-post-loader'),
+            'description' => __('Customize the "Show All" text label for the filter. This label will appear as an option to display all posts without filtering. Examples: "Show All", "View All", or "Display All".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_load_more_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_load_more_label(),
+            'label' => __('Set "Load More" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Load More', 'quick-ajax-post-loader'),
+            'placeholder' => __('Enter custom label for Load More', 'quick-ajax-post-loader'),
+            'description' => __('Customize the "Load More" button text. This label will appear on the button used to load additional posts dynamically. Examples: "Load More", "Show More", or "View More".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_no_post_message() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_no_post_message(),
+            'label' => __('Set "No Posts Found" Message', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('No posts found', 'quick-ajax-post-loader'),
+            'placeholder' => __('Enter message for no posts found', 'quick-ajax-post-loader'),
+            'description' => __('Customize the message shown when no posts match the selected filters. Examples: "No posts found", "Nothing to display", or "Try adjusting your filters".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_end_post_message() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_end_post_message(),
+            'label' => __('Set "End of Posts" Message', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('No more posts to load', 'quick-ajax-post-loader'),
+            'placeholder' => __('Enter message for end of posts', 'quick-ajax-post-loader'),
+            'description' => __('Customize the message that appears when there are no more posts to load. Examples: "No more posts", "You have reached the end", or "That\'s all for now".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_post_date_format() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_post_date_format(),
+            'label' => __('Set Date Format', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => 'F j, Y',
+            'placeholder' => __('Enter date format (e.g., F j, Y)', 'quick-ajax-post-loader'),
+        'description' => __('Customize the format for displaying post dates. This text will replace the default date format. For example: "F j, Y" (January 1, 2023) or "Y-m-d" (2023-01-01). Refer to the PHP date format documentation for more options.', 'quick-ajax-post-loader'),
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_date_desc_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_date_desc_label(),
+            'label' => __('Set "Newest" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Newest', 'quick-ajax-post-loader'),
+            'placeholder' => __('Newest', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts from newest to oldest (based on publication date). Examples: "Newest", "Latest", "Recent".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_date_asc_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_date_asc_label(),
+            'label' => __('Set "Oldest" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Oldest', 'quick-ajax-post-loader'),
+            'placeholder' => __('Oldest', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts from oldest to newest (based on publication date). Examples: "Oldest", "First", "Earliest".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_comment_count_desc_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_comment_count_desc_label(),
+            'label' => __('Set "Popular" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Popular', 'quick-ajax-post-loader'),
+            'placeholder' => __('Popular', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts by the highest number of comments. Examples: "Popular", "Trending", "Most Discussed".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_title_asc_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_title_asc_label(),
+            'label' => __('Set "A → Z" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('A → Z', 'quick-ajax-post-loader'),
+            'placeholder' => __('A → Z', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts alphabetically (A to Z) based on the post title. Examples: "Alphabetical", "A → Z", "Sort by Name".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_title_desc_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_title_desc_label(),
+            'label' => __('Set "Z → A" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Z → A', 'quick-ajax-post-loader'),
+            'placeholder' => __('Z → A', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts alphabetically (Z to A) based on the post title. Examples: "Reverse Alphabetical", "Z → A", "Sort by Name Descending".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_options_field_set_sort_option_rand_label() {
+        $field_properties = array(
+            'name' => QAPL_Quick_Ajax_Helper::global_options_field_set_sort_option_rand_label(),
+            'label' => __('Set "Random" Label', 'quick-ajax-post-loader'),
+            'type' => 'text',
+            'options' => '', // Not required for text field
+            'default' => __('Random', 'quick-ajax-post-loader'),
+            'placeholder' => __('Random', 'quick-ajax-post-loader'),
+            'description' => __('Set the label for sorting posts in a random order. Examples: "Shuffle", "Random", "Surprise Me".', 'quick-ajax-post-loader')
+        );
+        return $field_properties;
+    }
+    public static function get_global_field_remove_old_data(){
+        return array(
+            'name' => 'qapl_remove_old_meta',
+            'label' => __('Confirm Purge of Old Data', 'quick-ajax-post-loader'),
+            'type' => 'checkbox',
+            'options' => '',
+            'default' => 0,
+            'description' => __('Choose this option to remove old, unused data from the database. This will help keep your site clean and efficient. Be aware that if you switch back to an older version of the plugin, it might not work as expected.', 'quick-ajax-post-loader'),
+        );
+    }
+}
+class QAPL_Hooks {
+            ];
+        }
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name($name);
+        $builder->set_label(__('Select Loader Icon', 'quick-ajax-post-loader'));
+        $builder->set_type('select');
+        $builder->set_options($options);
+        $builder->set_default($default);
+        $builder->set_description(__('Choose an icon to display as the loading indicator when the "Load More" button is clicked.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set read more
+    public static function build_global_read_more_text_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_READ_MORE_LABEL_FIELD);
+        $builder->set_label(__('Set "Read More" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Read More', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Enter custom label for Read More', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the "Read More" text for your templates. This label will appear as a link or button for each post item. Examples: "Read More", "Continue Reading", or "Learn More".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set show all label
+    public static function build_global_show_all_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SHOW_ALL_LABEL_FIELD);
+        $builder->set_label(__('Set "Show All" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Show All', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Enter custom label for Show All', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the "Show All" text label for the filter. This label will appear as an option to display all posts without filtering. Examples: "Show All", "View All", or "Display All".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set load more label
+    public static function build_global_load_more_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_LOAD_MORE_LABEL_FIELD);
+        $builder->set_label(__('Set "Load More" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Load More', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Enter custom label for Load More', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the "Load More" button text. This label will appear on the button used to load additional posts dynamically. Examples: "Load More", "Show More", or "View More".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set no post message
+    public static function build_global_no_post_message_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_NO_POST_MESSAGE_FIELD);
+        $builder->set_label(__('Set "No Posts Found" Message', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('No posts found', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Enter message for no posts found', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the message shown when no posts match the selected filters. Examples: "No posts found", "Nothing to display", or "Try adjusting your filters".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set end post message
+    public static function build_global_end_post_message_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_END_POST_MESSAGE_FIELD);
+        $builder->set_label(__('Set "End of Posts" Message', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('No more posts to load', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Enter message for end of posts', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the message that appears when there are no more posts to load. Examples: "No more posts", "You have reached the end", or "That\'s all for now".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set post date format
+    /*
+    public static function build_global_post_date_format_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_POST_DATE_FORMAT_FIELD);
+        $builder->set_label(__('Set Date Format', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default('F j, Y');
+        $builder->set_placeholder(__('Enter date format (e.g., F j, Y)', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Customize the format for displaying post dates. This text will replace the default date format. For example: "F j, Y" (January 1, 2023) or "Y-m-d" (2023-01-01). Refer to the PHP date format documentation for more options.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    */
+    //build global options set sort option date desc label
+    public static function build_global_sort_option_date_desc_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_DATE_DESC_LABEL_FIELD);
+        $builder->set_label(__('Set "Newest" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Newest', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Newest', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts from newest to oldest (based on publication date). Examples: "Newest", "Latest", "Recent".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set sort option date asc label
+    public static function build_global_sort_option_date_asc_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_DATE_ASC_LABEL_FIELD);
+        $builder->set_label(__('Set "Oldest" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Oldest', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Oldest', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts from oldest to newest (based on publication date). Examples: "Oldest", "First", "Earliest".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set sort option comment count desc label
+    public static function build_global_sort_option_comment_count_desc_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_COMMENT_COUNT_DESC_LABEL_FIELD);
+        $builder->set_label(__('Set "Popular" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Popular', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Popular', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts by the highest number of comments. Examples: "Popular", "Trending", "Most Discussed".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set sort option title asc label
+    public static function build_global_sort_option_title_asc_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_TITLE_ASC_LABEL_FIELD);
+        $builder->set_label(__('Set "A → Z" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('A → Z', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('A → Z', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts alphabetically (A to Z) based on the post title. Examples: "Alphabetical", "A → Z", "Sort by Name".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set sort option title desc label
+    public static function build_global_sort_option_title_desc_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_TITLE_DESC_LABEL_FIELD);
+        $builder->set_label(__('Set "Z → A" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Z → A', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Z → A', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts alphabetically (Z to A) based on the post title. Examples: "Reverse Alphabetical", "Z → A", "Sort by Name Descending".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global options set sort option rand label
+    public static function build_global_sort_option_rand_label_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::GLOBAL_SORT_OPTION_RAND_LABEL_FIELD);
+        $builder->set_label(__('Set "Random" Label', 'quick-ajax-post-loader'));
+        $builder->set_type('text');
+        $builder->set_default(__('Random', 'quick-ajax-post-loader'));
+        $builder->set_placeholder(__('Random', 'quick-ajax-post-loader'));
+        $builder->set_description(__('Set the label for sorting posts in a random order. Examples: "Shuffle", "Random", "Surprise Me".', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+    //build global field remove old data
+    public static function build_global_remove_old_data_field(): QAPL_Quick_Ajax_Form_Field_Interface {
+        $builder = new QAPL_Quick_Ajax_Form_Field_Builder();
+        $builder->set_name(QAPLC::REMOVE_OLD_DATA_FIELD);
+        $builder->set_label(__('Confirm Purge of Old Data', 'quick-ajax-post-loader'));
+        $builder->set_type('checkbox');
+        $builder->set_default(QAPLC::REMOVE_OLD_DATA_FIELD_DEFAULT);
+        $builder->set_description(__('Choose this option to remove old, unused data from the database. This will help keep your site clean and efficient. Be aware that if you switch back to an older version of the plugin, it might not work as expected.', 'quick-ajax-post-loader'));
+        return $builder->build();
+    }
+}
+////////////////////////////////
+class QAPL_Quick_Ajax_Plugin_Constants{
+    // Plugin info
+    public const PLUGIN_VERSION = '1.8.0';
+    public const PLUGIN_NAME = 'Quick Ajax Post Loader';
+    public const PLUGIN_TEXT_DOMAIN = 'quick-ajax-post-loader';
+    public const PLUGIN_SLUG = 'quick-ajax-post-loader';
+    public const PLUGIN_MINIMUM_PHP_VERSION = '7.4';
+    public const PLUGIN_MINIMUM_WP_VERSION = '5.6';
+    public const PLUGIN_TESTED_WP_VERSION = '6.8';
+    // Menu and page slugs
+    public const PLUGIN_MENU_SLUG = 'qapl-menu';
+    public const CPT_SHORTCODE_SLUG = 'qapl-creator';
+    public const SETTINGS_PAGE_SLUG = 'qapl-settings';
+    // Quick AJAX Creator shortcode field names
+    public const DB_POSTMETA_SHORTCODE_SETTINGS = '_qapl_quick_ajax_shortcode_settings';
+    // Old value, not in use since 1.3.3
+    // public const DB_SHORTCODE_CODE = 'qapl_quick_ajax_shortcode_code'; // Uncomment if needed later
+    // Plugin metadata
+    public const DB_OPTION_PLUGIN_VERSION = 'qapl_quick_ajax_plugin_version';
+    public const DB_OPTION_PLUGIN_CLEANUP_FLAGS = 'qapl_quick_ajax_cleanup_flags';
+    // Settings
+    public const SETTINGS_WRAPPER_ID = 'qapl_settings_wrapper';
+    // Nonce fields
+    public const NONCE_FORM_QUICK_AJAX_FIELD = 'qapl_quick_ajax_nonce';
+    public const NONCE_FORM_QUICK_AJAX_ACTION = 'qapl_quick_ajax_nonce_action';
+    // Query settings field names
+    public const QUERY_SETTING_SELECT_POST_TYPE = 'qapl_select_post_type';
+    public const QUERY_SETTING_SELECT_POST_TYPE_DEFAULT = 'post';
+    public const QUERY_SETTING_SHOW_TAXONOMY_FILTER = 'qapl_show_select_taxonomy';
+    public const QUERY_SETTING_SHOW_TAXONOMY_FILTER_DEFAULT = 0;
+    public const QUERY_SETTING_SELECT_TAXONOMY = 'qapl_select_taxonomy';
+    public const QUERY_SETTING_MANUAL_TERM_SELECTION = 'qapl_manual_term_selection';
+    public const QUERY_SETTING_MANUAL_TERM_SELECTION_DEFAULT = 0;
+    public const QUERY_SETTING_SELECTED_TERMS = 'qapl_manual_selected_terms';
+    public const QUERY_SETTING_SELECT_POSTS_PER_PAGE = 'qapl_select_posts_per_page';
+    public const QUERY_SETTING_SELECT_POSTS_PER_PAGE_DEFAULT = 6;
+    public const QUERY_SETTING_SELECT_ORDER = 'qapl_select_order';
+    public const QUERY_SETTING_SELECT_ORDER_DEFAULT = 'DESC';
+    public const QUERY_SETTING_SELECT_ORDERBY = 'qapl_select_orderby';
+    public const QUERY_SETTING_SELECT_ORDERBY_DEFAULT = 'date';
+    public const QUERY_SETTING_SHOW_SORT_BUTTON = 'qapl_show_order_button';
+    public const QUERY_SETTING_SHOW_SORT_BUTTON_DEFAULT = 0;
+    public const QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS = 'qapl_select_orderby_button_options';
+    public const QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS_DEFAULT = 1;
+    public const QUERY_SETTING_SHOW_INLINE_FILTER_SORTING = 'qapl_show_inline_filter_sorting';
+    public const QUERY_SETTING_SHOW_INLINE_FILTER_SORTING_DEFAULT = 1;
+    public const QUERY_SETTING_SELECT_POST_STATUS = 'qapl_select_post_status';
+    public const QUERY_SETTING_SELECT_POST_STATUS_DEFAULT = 'publish';
+    public const QUERY_SETTING_IGNORE_STICKY_POSTS = 'qapl_ignore_sticky_posts';
+    public const QUERY_SETTING_IGNORE_STICKY_POSTS_DEFAULT = false;
+    public const QUERY_SETTING_AJAX_ON_INITIAL_LOAD = 'qapl_ajax_on_initial_load';
+    public const QUERY_SETTING_AJAX_ON_INITIAL_LOAD_DEFAULT = false;
+    public const QUERY_SETTING_AJAX_INFINITE_SCROLL = 'qapl_ajax_infinite_scroll';
+    public const QUERY_SETTING_AJAX_INFINITE_SCROLL_DEFAULT = false;
+    public const QUERY_SETTING_SHOW_END_MESSAGE = 'qapl_show_end_post_message';
+    public const QUERY_SETTING_SHOW_END_MESSAGE_DEFAULT = false;
+    public const QUERY_SETTING_SET_POST_NOT_IN = 'qapl_select_post_not_in';
+    public const QUERY_SETTING_SET_POST_NOT_IN_DEFAULT = false;
+    public const QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY = 'qapl_show_custom_load_more_post_quantity';
+    public const QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY_DEFAULT = 0;
+    public const QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY = 'qapl_select_custom_load_more_post_quantity';
+    public const QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY_DEFAULT = 4;
+    // Layout settings field names
+    public const LAYOUT_SETTING_SELECT_COLUMNS_QTY = 'qapl_layout_select_columns_qty';
+    public const LAYOUT_SETTING_SELECT_COLUMNS_QTY_DEFAULT = 3;
+    public const LAYOUT_SETTING_TAXONOMY_FILTER_CLASS = 'qapl_layout_add_taxonomy_filter_class';
+    public const LAYOUT_SETTING_TAXONOMY_FILTER_CLASS_DEFAULT = false;
+    public const LAYOUT_SETTING_CONTAINER_CLASS = 'qapl_layout_add_container_class';
+    public const LAYOUT_SETTING_CONTAINER_CLASS_DEFAULT = false;
+    public const LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE = 'qapl_layout_quick_ajax_css_style';
+    public const LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE_DEFAULT = 1;
+    public const LAYOUT_SETTING_POST_ITEM_TEMPLATE = 'qapl_layout_quick_ajax_post_item_template';
+    public const LAYOUT_SETTING_POST_ITEM_TEMPLATE_DEFAULT = 'post-item';
+    public const LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON = 'qapl_override_global_loader_icon';
+    public const LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON_DEFAULT = 0;
+    public const LAYOUT_SETTING_SELECT_LOADER_ICON = 'qapl_loader_icon';
+    public const LAYOUT_SETTING_SELECT_LOADER_ICON_DEFAULT = 'loader-icon';
+    // Ajax settings
+    public const AJAX_SETTING_AJAX_INITIAL_LOAD = 'ajax_initial_load';
+    // Attributes query names
+    public const ATTRIBUTE_QUICK_AJAX_ID = 'quick_ajax_id';
+    public const ATTRIBUTE_QUICK_AJAX_CSS_STYLE = 'quick_ajax_css_style';
+    public const ATTRIBUTE_GRID_NUM_COLUMNS = 'grid_num_columns';
+    public const ATTRIBUTE_POST_ITEM_TEMPLATE = 'post_item_template';
+    public const ATTRIBUTE_TAXONOMY_FILTER_CLASS = 'taxonomy_filter_class';
+    public const ATTRIBUTE_CONTAINER_CLASS = 'container_class';
+    public const ATTRIBUTE_LOAD_MORE_POSTS = 'load_more_posts';
+    public const ATTRIBUTE_LOADER_ICON = 'loader_icon';
+    public const ATTRIBUTE_AJAX_INFINITE_SCROLL = 'infinite_scroll';
+    public const ATTRIBUTE_SHOW_END_MESSAGE = 'show_end_message';
+    // Quick AJAX settings
+    public const ADMIN_PAGE_SETTINGS_GROUP = 'qapl_settings_group'; // used by register_setting to group fields for shared validation and security in admin forms
+    public const GLOBAL_OPTIONS_NAME = 'qapl_quick_ajax_global_options';
+    // Global options
+    public const GLOBAL_LOADER_ICON_FIELD = self::GLOBAL_OPTIONS_NAME . '[loader_icon]';
+    public const GLOBAL_READ_MORE_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[read_more_label]';
+    //public const GLOBAL_POST_DATE_FORMAT_FIELD = self::GLOBAL_OPTIONS_NAME . '[post_date_format]';
+    public const GLOBAL_SHOW_ALL_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[show_all_label]';
+    public const GLOBAL_LOAD_MORE_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[load_more_label]';
+    public const GLOBAL_NO_POST_MESSAGE_FIELD = self::GLOBAL_OPTIONS_NAME . '[no_post_message]';
+    public const GLOBAL_END_POST_MESSAGE_FIELD = self::GLOBAL_OPTIONS_NAME . '[end_post_message]';
+    public const GLOBAL_SORT_OPTION_DATE_DESC_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_date_desc_label]';
+    public const GLOBAL_SORT_OPTION_DATE_ASC_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_date_asc_label]';
+    public const GLOBAL_SORT_OPTION_COMMENT_COUNT_DESC_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_comment_count_desc_label]';
+    public const GLOBAL_SORT_OPTION_TITLE_ASC_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_title_asc_label]';
+    public const GLOBAL_SORT_OPTION_TITLE_DESC_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_title_desc_label]';
+    public const GLOBAL_SORT_OPTION_RAND_LABEL_FIELD = self::GLOBAL_OPTIONS_NAME . '[sort_option_rand_label]';
+    //Settings Page
+    public const REMOVE_OLD_DATA_FIELD = 'qapl_remove_old_meta';
+    public const REMOVE_OLD_DATA_FIELD_DEFAULT = 0;
+    // Buttons
+    public const TERM_FILTER_BUTTON_DATA_BUTTON = 'quick-ajax-filter-button';
+    public const SORT_OPTION_BUTTON_DATA_BUTTON = 'quick-ajax-sort-option-button';
+    public const LOAD_MORE_BUTTON_DATA_BUTTON = 'quick-ajax-load-more-button';
+    // Hooks
     // Filter Container Hooks
     const HOOK_FILTER_CONTAINER_BEFORE = 'qapl_filter_container_before';
     const HOOK_FILTER_CONTAINER_START = 'qapl_filter_container_start';
     const HOOK_FILTER_CONTAINER_END = 'qapl_filter_container_end';
     const HOOK_FILTER_CONTAINER_AFTER = 'qapl_filter_container_after';
+    public const HOOK_FILTER_CONTAINER_BEFORE = 'qapl_filter_container_before';
+    public const HOOK_FILTER_CONTAINER_START = 'qapl_filter_container_start';
+    public const HOOK_FILTER_CONTAINER_END = 'qapl_filter_container_end';
+    public const HOOK_FILTER_CONTAINER_AFTER = 'qapl_filter_container_after';
     // Posts Container Hooks
     const HOOK_POSTS_CONTAINER_BEFORE = 'qapl_posts_container_before';
     const HOOK_POSTS_CONTAINER_START = 'qapl_posts_container_start';
     const HOOK_POSTS_CONTAINER_END = 'qapl_posts_container_end';
     const HOOK_POSTS_CONTAINER_AFTER = 'qapl_posts_container_after';
+    public const HOOK_POSTS_CONTAINER_BEFORE = 'qapl_posts_container_before';
+    public const HOOK_POSTS_CONTAINER_START = 'qapl_posts_container_start';
+    public const HOOK_POSTS_CONTAINER_END = 'qapl_posts_container_end';
+    public const HOOK_POSTS_CONTAINER_AFTER = 'qapl_posts_container_after';
     // Load More Button Hooks
     //const HOOK_LOAD_MORE_BEFORE = 'qapl_load_more_before';
     //const HOOK_LOAD_MORE_AFTER = 'qapl_load_more_after';
+    //public const HOOK_LOAD_MORE_BEFORE = 'qapl_load_more_before';
+    //public const HOOK_LOAD_MORE_AFTER = 'qapl_load_more_after';
     // Loader Hooks
     const HOOK_LOADER_BEFORE = 'qapl_loader_before';
     const HOOK_LOADER_AFTER = 'qapl_loader_after';
+    public const HOOK_LOADER_BEFORE = 'qapl_loader_before';
+    public const HOOK_LOADER_AFTER = 'qapl_loader_after';
     // Filters
     const HOOK_MODIFY_POSTS_QUERY_ARGS = 'qapl_modify_posts_query_args';
     const HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS = 'qapl_modify_taxonomy_filter_buttons';
     const HOOK_MODIFY_SORTING_OPTIONS_VARIANTS = 'qapl_modify_sorting_options_variants';
+    public const HOOK_MODIFY_POSTS_QUERY_ARGS = 'qapl_modify_posts_query_args';
+    public const HOOK_MODIFY_TAXONOMY_FILTER_BUTTONS = 'qapl_modify_taxonomy_filter_buttons';
+    public const HOOK_MODIFY_SORTING_OPTIONS_VARIANTS = 'qapl_modify_sorting_options_variants';
     // Template Hooks
+    const HOOK_TEMPLATE_POST_ITEM_DATE = 'qapl_template_post_item_date';
+    const HOOK_TEMPLATE_POST_ITEM_IMAGE = 'qapl_template_post_item_image';
+    const HOOK_TEMPLATE_POST_ITEM_TITLE = 'qapl_template_post_item_title';
+    const HOOK_TEMPLATE_POST_ITEM_EXCERPT = 'qapl_template_post_item_excerpt';
+    const HOOK_TEMPLATE_POST_ITEM_READ_MORE = 'qapl_template_post_item_read_more';
+    const HOOK_TEMPLATE_LOAD_MORE_BUTTON = 'qapl_template_load_more_button';
+    const HOOK_TEMPLATE_NO_POST_MESSAGE = 'qapl_template_no_post_message';
+    const HOOK_TEMPLATE_END_POST_MESSAGE = 'qapl_template_end_post_message';
+}
+/*
+class QAPL_Logger {
+    private static $instance = null;
+    private $file_helper;
+    private $logs = [];
+    private function __construct() {
+        $this->file_helper = QAPL_File_Helper::get_instance();
+    }
+    public static function getInstance() {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+    public function addLog($message, $level = 'info') {
+        $this->logs[] = '[' . strtoupper($level) . '] ' . $message;
+    }
+    public function getLogs() {
+        return $this->logs;
+    }
+    public function saveLogs() {
+        $log_file = $this->file_helper->get_plugin_directory() . '/app.log';
+        file_put_contents($log_file, implode(PHP_EOL, $this->logs) . PHP_EOL, FILE_APPEND);
+        $this->logs = [];
+    }
+}
+*/
+/* not in use after removing placeholders
+class QAPL_Placeholder_Replacer{
+    private static $instance = null;
+    private $placeholders = [];
+    private $helper;
+    private $global_options;
+    public function __construct() {
+        // Initialize helper instance
+        $this->helper = QAPL_Quick_Ajax_Helper::get_instance();
+        // Fetch global options once and store them
+        $this->global_options = get_option($this->helper->admin_page_global_options_name(), []);
+        // Initialize placeholders
+        $this->initialize_placeholders();
+    }
+    public static function get_instance() {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+    // Initialize placeholders from global options.
+    private function initialize_placeholders() {
+        $all_placeholders = QAPL_Quick_Ajax_Helper::get_all_placeholders();
+        foreach ($all_placeholders as $placeholder_config) {
+            $option_key = $placeholder_config['option_key'];
+            $default_value = $placeholder_config['default'];
+            $placeholder = $placeholder_config['placeholder'];
+            // Use global option value or fallback to default
+            $this->placeholders[$placeholder] = $this->global_options[$option_key] ?? $default_value;
+        }
+    }
+    public function replace_placeholders($content) {
+        // replace placeholders in content
+        foreach ($this->placeholders as $placeholder => $value) {
+            $content = str_replace($placeholder, $value, $content);
+        }
+        return $content;
+    }
+    public function get_placeholders() {
+        // return all placeholders
+        return $this->placeholders;
+    }
+}
+    */
+    public const HOOK_TEMPLATE_POST_ITEM_DATE = 'qapl_template_post_item_date';
+    public const HOOK_TEMPLATE_POST_ITEM_IMAGE = 'qapl_template_post_item_image';
+    public const HOOK_TEMPLATE_POST_ITEM_TITLE = 'qapl_template_post_item_title';
+    public const HOOK_TEMPLATE_POST_ITEM_EXCERPT = 'qapl_template_post_item_excerpt';
+    public const HOOK_TEMPLATE_POST_ITEM_READ_MORE = 'qapl_template_post_item_read_more';
+    public const HOOK_TEMPLATE_LOAD_MORE_BUTTON = 'qapl_template_load_more_button';
+    public const HOOK_TEMPLATE_NO_POST_MESSAGE = 'qapl_template_no_post_message';
+    public const HOOK_TEMPLATE_END_POST_MESSAGE = 'qapl_template_end_post_message';
+}
+$file_helper = new QAPL_Quick_Ajax_File_Manager();
+$enqueue_handler = new QAPL_Quick_Ajax_Enqueue_Handler($file_helper);
+$pages_helper = new QAPL_Quick_Ajax_Resource_Manager($file_helper);
+$plugin_bootstrap = new QAPL_Quick_Ajax_Plugin_Bootstrap($pages_helper);
+$plugin_starter = new QAPL_Quick_Ajax_Plugin_Starter($plugin_bootstrap, $enqueue_handler);
+$plugin_starter->run();

quick-ajax-post-loader/trunk/inc/class-shortcode.php

-                      r3295741
+                      r3352831
 class QAPL_Shortcode_Post_Meta_Handler {
     public static function load_and_sanitize($id) {
         $serialized_data = get_post_meta($id, QAPL_Quick_Ajax_Helper::quick_ajax_shortcode_settings(), true);
+        $serialized_data = get_post_meta($id, QAPL_Quick_Ajax_Plugin_Constants::DB_POSTMETA_SHORTCODE_SETTINGS, true);
         if (!$serialized_data) {
             return array();
 …
         if (!empty($this->shortcode_params['id'])) {
             $attributes['shortcode'] = true;
             $attributes[QAPL_Quick_Ajax_Helper::layout_quick_ajax_id()] = absint($this->shortcode_params['id']);
+            $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID] = absint($this->shortcode_params['id']);
         } else {
             $attributes[QAPL_Quick_Ajax_Helper::layout_quick_ajax_id()] = $this->get_sanitized_attribute([
                 'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_quick_ajax_id(),
+            $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID] = $this->get_sanitized_attribute([
+                'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_ID,
                 'type' => 'number',
             ]);
+        }
         $attributes[QAPL_Quick_Ajax_Helper::layout_quick_ajax_css_style()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_quick_ajax_css_style(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_quick_ajax_css_style(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_QUICK_AJAX_CSS_STYLE,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_QUICK_AJAX_CSS_STYLE,
             'type' => 'string',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_container_num_columns()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_container_num_columns(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_select_columns_qty(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_GRID_NUM_COLUMNS,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_COLUMNS_QTY,
             'type' => 'number',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_post_item_template()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_post_item_template(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_post_item_template(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_POST_ITEM_TEMPLATE,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_POST_ITEM_TEMPLATE,
             'type' => 'string',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_taxonomy_filter_class()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_taxonomy_filter_class(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_taxonomy_filter_class(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_TAXONOMY_FILTER_CLASS,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_TAXONOMY_FILTER_CLASS,
             'type' => 'html_class',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_container_class()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_container_class(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_layout_container_class(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_CONTAINER_CLASS,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_CONTAINER_CLASS,
             'type' => 'html_class',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_load_more_posts()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_load_more_posts(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_select_custom_load_more_post_quantity(),
             'only_if_meta_key_true' => QAPL_Quick_Ajax_Helper::shortcode_page_show_custom_load_more_post_quantity(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOAD_MORE_POSTS,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_CUSTOM_LOAD_MORE_POST_QUANTITY,
+            'only_if_meta_key_true' => QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_CUSTOM_LOAD_MORE_POST_QUANTITY,
             'type' => 'number',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_select_loader_icon()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_select_loader_icon(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_select_loader_icon(),
             'only_if_meta_key_true' => QAPL_Quick_Ajax_Helper::shortcode_page_override_global_loader_icon(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_LOADER_ICON,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_SELECT_LOADER_ICON,
+            'only_if_meta_key_true' => QAPL_Quick_Ajax_Plugin_Constants::LAYOUT_SETTING_OVERRIDE_GLOBAL_LOADER_ICON,
             'type' => 'string',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::query_settings_ajax_on_initial_load()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::query_settings_ajax_on_initial_load(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_on_initial_load(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::AJAX_SETTING_AJAX_INITIAL_LOAD] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::AJAX_SETTING_AJAX_INITIAL_LOAD,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_ON_INITIAL_LOAD,
             'type' => 'bool',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_ajax_infinite_scroll()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_ajax_infinite_scroll(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_ajax_infinite_scroll(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_AJAX_INFINITE_SCROLL,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_AJAX_INFINITE_SCROLL,
             'type' => 'bool',
         ]);
         $attributes[QAPL_Quick_Ajax_Helper::layout_show_end_message()] = $this->get_sanitized_attribute([
             'shortcode_key' => QAPL_Quick_Ajax_Helper::layout_show_end_message(),
             'postmeta_key' => QAPL_Quick_Ajax_Helper::shortcode_page_show_end_message(),
+        $attributes[QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_SHOW_END_MESSAGE] = $this->get_sanitized_attribute([
+            'shortcode_key' => QAPL_Quick_Ajax_Plugin_Constants::ATTRIBUTE_SHOW_END_MESSAGE,
+            'postmeta_key' => QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_END_MESSAGE,
             'type' => 'bool',
         ]);
 …
             $data_args = new QAPL_Shortcode_Query_Args_Provider($this->shortcode_params, $this->shortcode_postmeta);
             $args = array();
             // get main query params from shortcode or postmeta
             $selected_post_type = $data_args->get_arg_value('post_type', QAPL_Quick_Ajax_Helper::shortcode_page_select_post_type());
             $post_per_page = $data_args->get_arg_value('posts_per_page', QAPL_Quick_Ajax_Helper::shortcode_page_select_posts_per_page());
             $post_order = $data_args->get_arg_value('order', QAPL_Quick_Ajax_Helper::shortcode_page_select_order());
             $post_orderby = $data_args->get_arg_value('orderby', QAPL_Quick_Ajax_Helper::shortcode_page_select_orderby());
             $post_not_in = $data_args->get_arg_value('excluded_post_ids', QAPL_Quick_Ajax_Helper::shortcode_page_set_post_not_in());
             $ignore_sticky_posts = $data_args->get_arg_value('ignore_sticky_posts', QAPL_Quick_Ajax_Helper::shortcode_page_ignore_sticky_posts());
             $show_taxonomy = $data_args->get_arg_value('show_taxonomy', QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter());
             $select_taxonomy = $data_args->get_arg_value('select_taxonomy', QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy());
             $manual_term_selection = $data_args->get_arg_value('manual_term_selection', QAPL_Quick_Ajax_Helper::shortcode_page_manual_term_selection());
             $manual_selected_terms = $data_args->get_arg_value('manual_selected_terms', QAPL_Quick_Ajax_Helper::shortcode_page_manual_selected_terms());
+            // get main query params from shortcode or postmeta
+            $selected_post_type = $data_args->get_arg_value('post_type', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POST_TYPE);
+            $post_per_page = $data_args->get_arg_value('posts_per_page', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_POSTS_PER_PAGE);
+            $post_order = $data_args->get_arg_value('order', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDER);
+            $post_orderby = $data_args->get_arg_value('orderby', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_ORDERBY);
+            $post_not_in = $data_args->get_arg_value('excluded_post_ids', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SET_POST_NOT_IN);
+            $ignore_sticky_posts = $data_args->get_arg_value('ignore_sticky_posts', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_IGNORE_STICKY_POSTS);
+            $show_taxonomy = $data_args->get_arg_value('show_taxonomy', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER);
+            $select_taxonomy = $data_args->get_arg_value('select_taxonomy', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY);
+            $manual_term_selection = $data_args->get_arg_value('manual_term_selection', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_MANUAL_TERM_SELECTION);
+            $manual_selected_terms = $data_args->get_arg_value('manual_selected_terms', QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECTED_TERMS);
             // return query args if post type is defined
             if(!empty($selected_post_type)){
 …
                 return null;
+            }
             $show_taxonomies_filter = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_taxonomy_filter()] : null;
+            $show_taxonomies_filter = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_TAXONOMY_FILTER] : null;
             if($show_taxonomies_filter==1){
                 $selectedTaxonomy = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_select_taxonomy()] : null;
+                $selectedTaxonomy = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_TAXONOMY] : null;
                 $selectedTaxonomy = esc_attr($selectedTaxonomy);
+            }
 …
         private function create_shortcode_controls_container(){
             if(!empty($this->shortcode_params['id'])){
                 $show_sort_orderby_button = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button()] : null;
+                $show_sort_orderby_button = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON] : null;
                 if($show_sort_orderby_button==1){
                     $add_wrapper = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_inline_filter_sorting()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_inline_filter_sorting()] : null;
+                    $add_wrapper = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_INLINE_FILTER_SORTING]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_INLINE_FILTER_SORTING] : null;
                     return $add_wrapper;
+                }
 …
         private function create_shortcode_sort_button(){
             if(!empty($this->shortcode_params['id'])){
                 $show_sort_orderby_button = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_show_sort_button()] : null;
+                $show_sort_orderby_button = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SHOW_SORT_BUTTON] : null;
                 if($show_sort_orderby_button==1){
                     $sort_orderby = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options()]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Helper::shortcode_page_select_sort_button_options()] : null;
+                    $sort_orderby = isset($this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS]) ? $this->shortcode_postmeta[QAPL_Quick_Ajax_Plugin_Constants::QUERY_SETTING_SELECT_SORT_BUTTON_OPTIONS] : null;
                     if (is_array($sort_orderby)) {
                         $sort_orderby = array_map('esc_attr', $sort_orderby);

quick-ajax-post-loader/trunk/inc/class-template-hooks.php

r3305166	r3352831
158	158	$date_format = $this->config->get('date_format');
159	159	$output = '<div class="qapl-post-date"><span>' . esc_html(get_the_date($date_format)) . '</span></div>';
160		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_DATE, $output, $this->template_name, $this->quick_ajax_id);
	160	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_DATE, $output, $this->template_name, $this->quick_ajax_id);
161	161	}
162	162
…	…
167	167	: '<div class="qapl-post-image qapl-no-image"></div>';
168	168
169		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_IMAGE, $output, $this->template_name, $this->quick_ajax_id);
	169	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_IMAGE, $output, $this->template_name, $this->quick_ajax_id);
170	170	}
171	171
172	172	public function render_title() {
173	173	$output = '<div class="qapl-post-title"><h3>' . esc_html(get_the_title()) . '</h3></div>';
174		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_TITLE, $output, $this->template_name, $this->quick_ajax_id);
	174	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_TITLE, $output, $this->template_name, $this->quick_ajax_id);
175	175	}
176	176
177	177	public function render_excerpt() {
178	178	$output = '<div class="qapl-post-description"><p>' . esc_html(wp_trim_words(get_the_excerpt(), 20)) . '</p></div>';
179		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_EXCERPT, $output, $this->template_name, $this->quick_ajax_id);
	179	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_EXCERPT, $output, $this->template_name, $this->quick_ajax_id);
180	180	}
181	181
…	…
186	186	$label = $this->config->get('read_more_label');
187	187	$output = '<div class="qapl-read-more"><p>' . esc_html($label) . '</p></div>';
188		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_READ_MORE, $output, $this->template_name, $this->quick_ajax_id);
	188	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_READ_MORE, $output, $this->template_name, $this->quick_ajax_id);
189	189	}
190	190	}
…	…
204	204	$date_format = $this->config->get('date_format');
205	205	$output = '<div class="qapl-post-date"><span>' . esc_html(get_the_date($date_format)) . '</span></div>';
206		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_DATE, $output, $this->template_name, $this->quick_ajax_id);
	206	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_DATE, $output, $this->template_name, $this->quick_ajax_id);
207	207	}
208	208
…	…
213	213	: '<span class="qapl-no-image"></span>';
214	214
215		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_IMAGE, $output, $this->template_name, $this->quick_ajax_id);
	215	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_IMAGE, $output, $this->template_name, $this->quick_ajax_id);
216	216	}
217	217
218	218	public function render_title() {
219	219	$output = '<div class="qapl-post-title"><h3>' . esc_html(get_the_title()) . '</h3></div>';
220		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_TITLE, $output, $this->template_name, $this->quick_ajax_id);
	220	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_TITLE, $output, $this->template_name, $this->quick_ajax_id);
221	221	}
222	222
223	223	public function render_excerpt() {
224	224	$output = '<div class="qapl-post-description"><p>' . esc_html(wp_trim_words(get_the_excerpt(), 20)) . '</p></div>';
225		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_EXCERPT, $output, $this->template_name, $this->quick_ajax_id);
	225	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_EXCERPT, $output, $this->template_name, $this->quick_ajax_id);
226	226	}
227	227
…	…
232	232	$label = $this->config->get('read_more_label');
233	233	$output = '<div class="qapl-read-more"><p>' . esc_html($label) . '</p></div>';
234		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_POST_ITEM_READ_MORE, $output, $this->template_name, $this->quick_ajax_id);
	234	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_POST_ITEM_READ_MORE, $output, $this->template_name, $this->quick_ajax_id);
235	235	}
236	236	}
…	…
240	240	$label = $this->config->get('load_more_label');
241	241	$output = '<button type="button" class="qapl-load-more-button qapl-button" data-button="quick-ajax-load-more-button">' . esc_html($label) . '</button>';
242		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_LOAD_MORE_BUTTON, $output, $this->quick_ajax_id);
	242	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_LOAD_MORE_BUTTON, $output, $this->quick_ajax_id);
243	243	}
244	244	}
…	…
248	248	$end_post_message = $this->config->get('end_post_message');
249	249	$output = '<p>' . esc_html($end_post_message) . '</p>';
250		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_END_POST_MESSAGE, $output, $this->quick_ajax_id);
	250	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_END_POST_MESSAGE, $output, $this->quick_ajax_id);
251	251	}
252	252	}
…	…
256	256	$no_post_message = $this->config->get('no_post_message');
257	257	$output = '<p>' . esc_html($no_post_message) . '</p>';
258		return apply_filters(QAPL_~~Hook~~s::HOOK_TEMPLATE_NO_POST_MESSAGE, $output, $this->quick_ajax_id);
	258	return apply_filters(QAPL_Quick_Ajax_Plugin_Constants::HOOK_TEMPLATE_NO_POST_MESSAGE, $output, $this->quick_ajax_id);
259	259	}
260	260	}
…	…
286	286	$quick_ajax_id = $container_settings['quick_ajax_id'] ?? '';
287	287	$config_array = $container_settings['config'] ?? [];
288		$global_options = get_option(QAPL_Quick_Ajax_~~Helper::admin_page_global_options_name()~~, []);
	288	$global_options = get_option(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME, []);
289	289	$config = new QAPL_Quick_Ajax_Template_Config($config_array);
290	290

quick-ajax-post-loader/trunk/inc/class-updater.php

-                      r3321429
+                      r3352831
         public function __construct(array $update_strategies) {
             $this->current_version = get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version());
             $this->new_version = QAPL_Quick_Ajax_Helper::get_plugin_info()['version'];
+            $this->current_version = get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION);
+            $this->new_version = QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_VERSION;
             QAPL_Update_Validator::init(); // initialise flags
             $this->update_strategies = $update_strategies; // save the given update classes to the class property
 …
         private function finalise_updates() {
             QAPL_Update_Validator::save_cleanup_flags();
             update_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version(), $this->new_version);
+            update_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION, $this->new_version);
+        }
         private function check_and_downgrade_version(): bool {
             $stored_version = get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version());
+            $stored_version = get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION);
             if ($stored_version === false) {
                 add_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version(), $this->new_version, '', 'off');
+                add_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION, $this->new_version, '', 'off');
                 //error_log('QAPL Updater: Version record created.');
                 return true;
+            }
             if (version_compare($stored_version, $this->new_version, '>')) {
                 update_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version(), $this->new_version);
+                update_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION, $this->new_version);
                 //error_log('QAPL Updater: Version downgraded successfully.');
                 return true;
 …
     add_action('init', 'qapl_action_quick_ajax_check_version_and_run_updates');
     function qapl_action_quick_ajax_check_version_and_run_updates() {
         $current_version = get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version());
         $plugin_version = QAPL_Quick_Ajax_Helper::get_plugin_info()['version'];
+        $current_version = get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION);
+        $plugin_version = QAPL_Quick_Ajax_Plugin_Constants::PLUGIN_VERSION;
         if ($current_version !== $plugin_version) {
             // register update strategies and send them to the constructor
 …
     public function run_update(): bool {
         $results = array();
         $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_quick_ajax_meta_box_shortcode_shortcode', 'qapl_quick_ajax_shortcode_code');
         $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_settings_wrapper' , 'qapl_quick_ajax_shortcode_settings');
+        $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_quick_ajax_meta_box_shortcode_shortcode', 'qapl_quick_ajax_shortcode_code');
+        $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_settings_wrapper' , 'qapl_quick_ajax_shortcode_settings');
         return QAPL_Update_Validator::check_migration_results($results, '1.3.2');
+    }
 …
     public function run_update(): bool {
         $results = array();
         $results[] = QAPL_Data_Migrator::migrate_option('qapl-global-options', QAPL_Quick_Ajax_Helper::admin_page_global_options_name());
         $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_quick_ajax_shortcode_settings', QAPL_Quick_Ajax_Helper::quick_ajax_shortcode_settings());
+        $results[] = QAPL_Data_Migrator::migrate_option('qapl-global-options', QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME);
+        $results[] = QAPL_Data_Migrator::migrate_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_quick_ajax_shortcode_settings', QAPL_Quick_Ajax_Plugin_Constants::DB_POSTMETA_SHORTCODE_SETTINGS);
         $return = QAPL_Update_Validator::check_migration_results($results, '1.3.3');
         return $return;
 …
     public function run_update(): bool {
         $results = array();
         $results[] = QAPL_Data_Migrator::update_autoload_for_option(QAPL_Quick_Ajax_Helper::admin_page_global_options_name(),'off');
         $results[] = QAPL_Data_Migrator::update_autoload_for_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_version(),'off');
+        $results[] = QAPL_Data_Migrator::update_autoload_for_option(QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME,'off');
+        $results[] = QAPL_Data_Migrator::update_autoload_for_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_VERSION,'off');
         $return = QAPL_Update_Validator::check_migration_results($results, '1.3.4');
         return $return;
 …
     // fix wrong label assignment for title ASC and DESC sort options due to naming issue
     public function run_update(): bool {
         $option_name = QAPL_Quick_Ajax_Helper::admin_page_global_options_name();
+        $option_name = QAPL_Quick_Ajax_Plugin_Constants::GLOBAL_OPTIONS_NAME;
         $options = get_option($option_name, array());
         if (!is_array($options)) {
 …
     public static function init() {
         $flags = get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags(), array());
+        $flags = get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS, array());
         if (is_array($flags)) {
             self::$cleanup_flags = array_map('boolval', $flags);
 …
        //error_log('QAPL_Quick_Ajax_Cleaner: cleanup ' . json_encode(self::$cleanup_flags));
         if (empty(self::$cleanup_flags)) {
             delete_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags());
+            delete_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS);
         } else {
             if (get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags()) === false) {
                 add_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags(), self::$cleanup_flags, '', 'off');
+            if (get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS) === false) {
+                add_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS, self::$cleanup_flags, '', 'off');
             } else {
                 update_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags(), self::$cleanup_flags);
+                update_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS, self::$cleanup_flags);
+            }
+        }
 …
         public function __construct($cleanup_strategies) {
             $this->cleanup_flags = get_option(QAPL_Quick_Ajax_Helper::quick_ajax_plugin_cleanup_flags(), []);
+            $this->cleanup_flags = get_option(QAPL_Quick_Ajax_Plugin_Constants::DB_OPTION_PLUGIN_CLEANUP_FLAGS, []);
             if (!is_array($this->cleanup_flags)) {
                 $this->cleanup_flags = [];
 …
     public function run_cleanup(): bool {
         $results = [];
         $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_quick_ajax_meta_box_shortcode_shortcode');
         $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_settings_wrapper');
+        $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_quick_ajax_meta_box_shortcode_shortcode');
+        $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_settings_wrapper');
         return QAPL_Update_Validator::check_result_array_if_all_true($results);
+    }
 …
             $results[] = false;
+        }
         $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_quick_ajax_shortcode_settings');
         $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Helper::cpt_shortcode_slug(), 'qapl_quick_ajax_shortcode_code');
+        $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_quick_ajax_shortcode_settings');
+        $results[] = QAPL_Data_Cleaner::remove_old_meta_for_all_posts(QAPL_Quick_Ajax_Plugin_Constants::CPT_SHORTCODE_SLUG, 'qapl_quick_ajax_shortcode_code');
         return QAPL_Update_Validator::check_result_array_if_all_true($results);
+    }

quick-ajax-post-loader/trunk/inc/functions.php

-                      r3321429
+                      r3352831
 //add get qapl_render_taxonomy_filter
 function qapl_render_post_container($args, $attributes = null, $render_context = null, $meta_query = null) {
+    if (!class_exists('QAPL_Quick_Ajax_Handler') || !method_exists('QAPL_Quick_Ajax_Handler', 'get_instance')) {
+        if (defined('WP_DEBUG') && WP_DEBUG) {
+            //error_log('Quick Ajax Post Loader: QAPL_Quick_Ajax_Handler class or method get_instance not found');
+        }
+    if (!class_exists('QAPL_Quick_Ajax_Handler')) {
         return;
+    }
+    $ajax_class = QAPL_Quick_Ajax_Handler::get_instance();
+    $attributes = $attributes ?? [];
+    if (!is_array($args)) {
+        return;
+    }
+    $attributes = is_array($attributes) ? $attributes : [];
+    $file_manager = new QAPL_Quick_Ajax_File_Manager();
+    $ajax_class = new QAPL_Quick_Ajax_Handler($file_manager);
     $ajax_class->wp_query_args($args, $attributes);
     $ajax_class->layout_customization($attributes);
     $output = '';
     $filter_wrapper_start = $filter_wrapper_end = '';
 …
 function qapl_render_taxonomy_filter($args, $attributes, $taxonomy = null){
+    if (!class_exists('QAPL_Quick_Ajax_Handler') || !method_exists('QAPL_Quick_Ajax_Handler', 'get_instance')) {
+        if (defined('WP_DEBUG') && WP_DEBUG) {
+            //error_log('Quick Ajax Post Loader: QAPL_Quick_Ajax_Handler class or method get_instance not found');
+        }
+    if (!class_exists('QAPL_Quick_Ajax_Handler')) {
         return;
+    }
+    $ajax_class = QAPL_Quick_Ajax_Handler::get_instance();
+    $attributes = $attributes ?? [];
+    $ajax_class->wp_query_args($args, $attributes);
+    $ajax_class->layout_customization($attributes);
+    $attributes = is_array($attributes) ? $attributes : [];
+    $file_manager = new QAPL_Quick_Ajax_File_Manager();
+    $ajax_handler = new QAPL_Quick_Ajax_Handler($file_manager);
+    $ajax_handler->wp_query_args($args, $attributes);
+    $ajax_handler->layout_customization($attributes);
     $selected_taxonomy = null;
 …
+    }
     if(!empty($selected_taxonomy) && is_string($selected_taxonomy)) {
         echo $ajax_class->render_taxonomy_terms_filter($selected_taxonomy);// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        echo $ajax_handler->render_taxonomy_terms_filter($selected_taxonomy);// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    }
+}
 …
 function qapl_render_sort_controls($args, $attributes, $sort_options){
+    if (!class_exists('QAPL_Quick_Ajax_Handler') || !method_exists('QAPL_Quick_Ajax_Handler', 'get_instance')) {
+        if (defined('WP_DEBUG') && WP_DEBUG) {
+            //error_log('Quick Ajax Post Loader: QAPL_Quick_Ajax_Handler class or method get_instance not found');
+        }
+    if (!class_exists('QAPL_Quick_Ajax_Handler')) {
         return;
+    }
+    $ajax_class = QAPL_Quick_Ajax_Handler::get_instance();
+    $attributes = $attributes ?? [];
+    $ajax_class->wp_query_args($args, $attributes);
+    $ajax_class->layout_customization($attributes);
+    $attributes = is_array($attributes) ? $attributes : [];
+    $file_manager = new QAPL_Quick_Ajax_File_Manager();
+    $ajax_handler = new QAPL_Quick_Ajax_Handler($file_manager);
+    $ajax_handler->wp_query_args($args, $attributes);
+    $ajax_handler->layout_customization($attributes);
     if(!empty($sort_options) && is_array($sort_options)) {
         echo $ajax_class->render_sort_options($sort_options);// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        echo $ajax_handler->render_sort_options($sort_options);// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    }
+}
-function qapl_quick_ajax_get_quick_ajax_id(){
-    if (!class_exists('QAPL_Quick_Ajax_Handler') || !method_exists('QAPL_Quick_Ajax_Handler', 'get_instance')) {
-        if (defined('WP_DEBUG') && WP_DEBUG) {
-            //error_log('Quick Ajax Post Loader: QAPL_Quick_Ajax_Handler class or method get_instance not found');
+        }
-        return '';
+    }
-    $instance = QAPL_Quick_Ajax_Handler::get_instance();
-    return sanitize_text_field($instance->get_quick_ajax_id());
+}

quick-ajax-post-loader/trunk/js/admin-script.js

-                      r3328398
+                      r3352831
             var quickAjaxSortControlValue = "";
             var quickAjaxSortControlText = "";
             if (quickAjaxSortControl !== null) {
+            if (quickAjaxSortControl !== null && quickAjaxSortControlValueOptions) {
                 quickAjaxSortControlValue = "";
                 quickAjaxSortControlValue += quickAjaxSortControlValueOptions;
 …
+            }
             let formattedText = "";
             if (quickAjaxSortControlValue.trim() !== "") {
+            if (typeof quickAjaxSortControlValue === "string" && quickAjaxSortControlValue.trim() !== "") {
                 formattedText += "\n// Set the sort options for the button.\n";
                 formattedText += quickAjaxSortControlValue.trim() + "\n";
+            }
             if (quickAjaxSortControlText.trim() !== "") {
+            if (typeof quickAjaxSortControlText === "string" && quickAjaxSortControlText.trim() !== "") {
                 formattedText += "\n// Render the sorting control button.\n";
                 formattedText += quickAjaxSortControlText.trim() + "\n";

quick-ajax-post-loader/trunk/js/admin-script.min.js

r3328398	r3352831
1		!function(e){var t={helper_available:"undefined"!=typeof qapl_quick_ajax_helper&&qapl_quick_ajax_helper,init:function(){this.click_and_select_shortcode(),this.click_and_select_all(),this.handle_post_type_change(),this.handle_taxonomy_change(),this.show_hide_element_on_change(),this.quick_ajax_tabs(),this.copy_code(),this.quick_ajax_function_generator(),this.accordion_block_toggle()},handle_post_type_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_post_type);a.length&&a.on("change",(function(){const a=e(this).val();e.ajax({url:qapl_quick_ajax_helper.ajax_url,type:"POST",data:{action:"qapl_quick_ajax_get_taxonomies_by_post_type",post_type:a,nonce:qapl_quick_ajax_helper.nonce},success:function(a){if(a&&a.data){const n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy);n.empty(),n.append(a.data),t.trigger_taxonomy_change()}},error:function(e,t,a){}})}))},handle_taxonomy_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy),n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_manual_selected_terms);a.length&&a.on("change",(function(){n.empty(),t.admin_page_loader(n);let a=e(this).val(),_="";e("#post_ID").length&&(_=e("#post_ID").val()),e.ajax({url:qapl_quick_ajax_helper.ajax_url,type:"POST",data:{action:"qapl_quick_ajax_get_terms_by_taxonomy",taxonomy:a,post_id:_,nonce:qapl_quick_ajax_helper.nonce},success:function(e){e&&e.data&&n.fadeOut(100,(function(){n.empty(),n.append(e.data),n.fadeIn(100)}))},error:function(e,t,a){}})}))},trigger_taxonomy_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy),n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_manual_selected_terms);n.length&&(t.admin_page_loader(n),a.trigger("change"))},admin_page_loader:function(e){e.append('<div class="qapl-admin-page-loader"><span></span><span></span><span></span></div>')},show_hide_element_on_change:function(){e(".show-hide-trigger input, .show-hide-trigger select").on("change",(function(){e(".quick-ajax-field-container[data-conditional]").each((function(){const t=e(this),a=t.data("conditional");let n=!0;for(const t in a){if(!a.hasOwnProperty(t))continue;const _=a[t],o=e("#"+t);if((o.is(":checkbox")?o.is(":checked")?"1":"0":o.val())!==_){n=!1;break}}n?t.removeClass("inactive"):t.addClass("inactive")}))}))},quick_ajax_tabs:function(){if(e(".quick-ajax-tabs").length){const t=e(".quick-ajax-tab-button"),a=e(".quick-ajax-tab-content");t.on("click",(function(n){n.preventDefault();const _=e(this).data("tab");t.removeClass("active").attr("aria-selected","false").attr("tabindex","-1"),a.removeClass("active").attr("hidden",!0),e(this).addClass("active").attr("aria-selected","true").attr("tabindex","0"),e("#"+_).addClass("active").attr("hidden",!1)})),t.on("keydown",(function(e){const a=t.index(this);let n;if("ArrowRight"===e.key)n=(a+1)%t.length;else{if("ArrowLeft"!==e.key)return;n=(a-1+t.length)%t.length}t.eq(n).focus().click()}))}},copy_code:function(){e(".copy-button").on("click",(function(){var t=e("#"+e(this).data("copy")),a=e("<textarea>").val(t.text()).appendTo("body").select();try{navigator.clipboard.writeText(t.text()).then((()=>{})).catch((e=>{}))}finally{a.remove(),e(this).text("Code Copied"),setTimeout((()=>{e(this).text("Copy Code")}),2e3)}}))},generateId:function(e){let t=0;for(let a=0;a<e.length;a++)t+=e.charCodeAt(a),a%2==0?t+=e.charCodeAt(a):t-=e.charCodeAt(a);return t},getExcludedPostIds:function(e){var t=e.split(/[,\s]+/),a=[];return t.forEach((function(e){/^\d+$/.test(e)&&-1===a.indexOf(e)&&a.push(e)})),a.join(", ")},cleanClassNames:function(e){let t=e.replace(/,/g," ").split(/\s+/);return t=t.filter(((e,t,a)=>!/^\d/.test(e)&&""!==e&&a.indexOf(e)===t)),t.join(", ")},qapl_collect_input_data:function(){const t={};return e(".function-generator-wrap input, .function-generator-wrap select").each((function(a,n){const _=e(n),o=_.attr("name"),i=_.attr("id");if("checkbox"===n.type)if(o&&o.endsWith("[]")){let e=o.replace(/\[\]$/,"");t[e]\|\|(t[e]=[]),_.prop("checked")&&t[e].push(_.val())}else t[i]=_.prop("checked")?1:0;else t[i]=_.val()})),t},qapl_generate_args:function(e){const t=this;let a="",n="",_="";(a+="$quick_ajax_args = [\n",a+=" 'post_type' => '"+e.qapl_select_post_type+"',\n",a+=" 'posts_per_page' => "+e.qapl_select_posts_per_page+",\n","none"!==e.qapl_select_orderby&&(a+=" 'orderby' => '"+e.qapl_select_orderby+"',\n"),a+=" 'order' => '"+e.qapl_select_order+"',\n",""!==e.qapl_select_post_not_in)&&(a+=" 'post__not_in' => ["+t.getExcludedPostIds(e.qapl_select_post_not_in)+"],\n");if(1===e.qapl_ignore_sticky_posts&&(a+=" 'ignore_sticky_posts' => "+e.qapl_ignore_sticky_posts+",\n"),1===e.qapl_show_select_taxonomy&&(a+=" 'selected_taxonomy' => '"+e.qapl_select_taxonomy+"',\n"),1===e.qapl_show_select_taxonomy&&1===e.qapl_manual_term_selection){var o=e.qapl_manual_selected_terms;o&&o.length>0&&(n="[",n+=o.map((e=>`${e}`)).join(", "),n+="]"),n&&(a+=" 'selected_terms' => "+n+",\n")}let i=a.trimEnd();return i.endsWith(",")&&(a=i.slice(0,-1)+"\n"),a+="];",""!==a.trim()&&(_+="\n// Define AJAX query parameters for '"+e.qapl_select_post_type+"' type posts.\n",_+=a.trim()+"\n"),_},qapl_generate_attributes:function(e,t){const a=this;let n={},_="";n[qapl_quick_ajax_helper.quick_ajax_id]=t,1===e.qapl_layout_quick_ajax_css_style&&(n[qapl_quick_ajax_helper.quick_ajax_css_style]=e.qapl_layout_quick_ajax_css_style,n[qapl_quick_ajax_helper.grid_num_columns]=e.qapl_layout_select_columns_qty),e.qapl_layout_quick_ajax_post_item_template&&(n[qapl_quick_ajax_helper.post_item_template]=e.qapl_layout_quick_ajax_post_item_template),e.qapl_layout_add_taxonomy_filter_class&&""!==e.qapl_layout_add_taxonomy_filter_class&&(n[qapl_quick_ajax_helper.taxonomy_filter_class]=a.cleanClassNames(e.qapl_layout_add_taxonomy_filter_class)),e.qapl_layout_add_container_class&&""!==e.qapl_layout_add_container_class&&(n[qapl_quick_ajax_helper.container_class]=a.cleanClassNames(e.qapl_layout_add_container_class)),1===e.qapl_show_custom_load_more_post_quantity&&(n[qapl_quick_ajax_helper.load_more_posts]=e.qapl_select_custom_load_more_post_quantity),1===e.qapl_override_global_loader_icon&&(n[qapl_quick_ajax_helper.loader_icon]=e.qapl_loader_icon),1===e.qapl_ajax_on_initial_load&&(n[qapl_quick_ajax_helper.ajax_initial_load]=e.qapl_ajax_on_initial_load),1===e.qapl_ajax_infinite_scroll&&(n[qapl_quick_ajax_helper.infinite_scroll]=e.qapl_ajax_infinite_scroll),1===e.qapl_show_end_post_message&&(n[qapl_quick_ajax_helper.show_end_message]=e.qapl_show_end_post_message);var o="";return Object.keys(n).length>0&&(o="",o+="$quick_ajax_attributes = [\n",Object.entries(n).forEach((([e,t])=>{let n;n=a.quick_ajax_is_numeric(t)?parseInt(t):"string"==typeof t?`'${t}'`:t,o+=` '${e}' => ${n},\n`})),o=o.slice(0,-2)+"\n",o+="];"),""!==o.trim()&&(_+="\n// Define attributes for AJAX.\n",_+=o.trim()+"\n"),_},qapl_generate_sort_controls:function(e){let t=null,a=null;1===e.qapl_show_order_button&&(t=e.qapl_select_orderby_button_options,t&&t.length>0&&(a="$quick_ajax_sort_options = [",a+=t.map((e=>`'${e}'`)).join(", "),a+="];"));var n="",_="";null!==t&&(n="",n+=a,_="",_+="if(function_exists('qapl_render_sort_controls')){\n",_+=" qapl_render_sort_controls(\n",_+=" $quick_ajax_args,\n",_+=" $quick_ajax_attributes,\n",_+=" $quick_ajax_sort_options\n",_+=" );\n",_+="}");let o="";return""!==n.trim()&&(o+="\n// Set the sort options for the button.\n",o+=n.trim()+"\n"),""!==_.trim()&&(o+="\n// Render the sorting control button.\n",o+=_.trim()+"\n"),o},qapl_generate_taxonomy_filter:function(e){let t=null,a="",n="";return 1===e.qapl_show_select_taxonomy&&(t=e.qapl_select_taxonomy),null!==t&&(n+="if(function_exists('qapl_render_taxonomy_filter')){\n",n+=" qapl_render_taxonomy_filter(\n",n+=" $quick_ajax_args,\n",n+=" $quick_ajax_attributes,\n",n=n.slice(0,-2)+"\n",n+=" );\n",n+="}"),""!==n.trim()&&(a+="\n// Render the navigation for '"+e.qapl_select_taxonomy+"' taxonomy.\n",a+=n.trim()+"\n"),a},qapl_generate_post_container:function(e,t){let a="",n="";return n+="if(function_exists('qapl_render_post_container')){\n",n+=" qapl_render_post_container(\n",n+=" $quick_ajax_args,\n",""!==t&&(n+=" $quick_ajax_attributes,\n"),n=n.slice(0,-2)+"\n",n+=" );\n",n+="}",""!==n.trim()&&(a+="\n// Render the grid for '"+e.qapl_select_post_type+"' type posts.\n",a+=n.trim()+"\n"),a},quick_ajax_function_generator:function(){const t=this;this.helper_available&&e(".generate-function-button").on("click",(function(){const a=e(this),n=a.attr("data-output"),_=e("#"+n),o=e('.copy-button[data-copy="'+n+'"]');a.prop("disabled",!0),o.prop("disabled",!0);const i=t.qapl_collect_input_data(),l=Object.values(i).join(""),c=t.generateId(l),s=t.qapl_generate_args(i),r=t.qapl_generate_attributes(i,c),p=[s,r,t.qapl_generate_sort_controls(i),t.qapl_generate_taxonomy_filter(i),t.qapl_generate_post_container(i,r)].filter(Boolean).join("");_.empty();for(var u=p.split("\n"),d=0;d<u.length;d++)!function(e){setTimeout((function(){_.append(u[e]+"\n"),e===u.length-1&&(a.prop("disabled",!1),o.prop("disabled",!1))}),50*d)}(d)}))},quick_ajax_is_numeric:function(e){return/^-?\d+(\.\d+)?$/.test(e)},quick_ajax_color_picker:function(){e(".color-picker-field").wpColorPicker()},quick_ajax_select_text:function(e){var t,a;document.body.createTextRange?((t=document.body.createTextRange()).moveToElementText(e),t.select()):window.getSelection&&(a=window.getSelection(),(t=document.createRange()).selectNodeContents(e),a.removeAllRanges(),a.addRange(t))},click_and_select_shortcode:function(){const t=this;e(".quick-ajax-shortcode").on("click",(function(){t.quick_ajax_select_text(this)}))},click_and_select_all:function(){const t=this;e(".click-and-select-all").on("click",(function(){var a=e(this).find("code").get(0);t.quick_ajax_select_text(a)}))},accordion_block_toggle:function(){var t=e("#wpbody-content");if(t.find(".quick-ajax-tabs").length>0){var a=e("#adminmenuwrap").outerHeight();t.css("min-height",a)}e(".quick-ajax-accordion-toggle").click((function(){e(this).toggleClass("active").next(".quick-ajax-accordion-content").slideToggle(200)}))}};e(document).ready((function(){t.init()}))}(jQuery);
	1	!function(e){var t={helper_available:"undefined"!=typeof qapl_quick_ajax_helper&&qapl_quick_ajax_helper,init:function(){this.click_and_select_shortcode(),this.click_and_select_all(),this.handle_post_type_change(),this.handle_taxonomy_change(),this.show_hide_element_on_change(),this.quick_ajax_tabs(),this.copy_code(),this.quick_ajax_function_generator(),this.accordion_block_toggle()},handle_post_type_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_post_type);a.length&&a.on("change",(function(){const a=e(this).val();e.ajax({url:qapl_quick_ajax_helper.ajax_url,type:"POST",data:{action:"qapl_quick_ajax_get_taxonomies_by_post_type",post_type:a,nonce:qapl_quick_ajax_helper.nonce},success:function(a){if(a&&a.data){const n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy);n.empty(),n.append(a.data),t.trigger_taxonomy_change()}},error:function(e,t,a){}})}))},handle_taxonomy_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy),n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_manual_selected_terms);a.length&&a.on("change",(function(){n.empty(),t.admin_page_loader(n);let a=e(this).val(),_="";e("#post_ID").length&&(_=e("#post_ID").val()),e.ajax({url:qapl_quick_ajax_helper.ajax_url,type:"POST",data:{action:"qapl_quick_ajax_get_terms_by_taxonomy",taxonomy:a,post_id:_,nonce:qapl_quick_ajax_helper.nonce},success:function(e){e&&e.data&&n.fadeOut(100,(function(){n.empty(),n.append(e.data),n.fadeIn(100)}))},error:function(e,t,a){}})}))},trigger_taxonomy_change:function(){if(!this.helper_available)return;const t=this,a=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_taxonomy),n=e("#"+qapl_quick_ajax_helper.quick_ajax_settings_wrapper+" #"+qapl_quick_ajax_helper.quick_ajax_manual_selected_terms);n.length&&(t.admin_page_loader(n),a.trigger("change"))},admin_page_loader:function(e){e.append('<div class="qapl-admin-page-loader"><span></span><span></span><span></span></div>')},show_hide_element_on_change:function(){e(".show-hide-trigger input, .show-hide-trigger select").on("change",(function(){e(".quick-ajax-field-container[data-conditional]").each((function(){const t=e(this),a=t.data("conditional");let n=!0;for(const t in a){if(!a.hasOwnProperty(t))continue;const _=a[t],o=e("#"+t);if((o.is(":checkbox")?o.is(":checked")?"1":"0":o.val())!==_){n=!1;break}}n?t.removeClass("inactive"):t.addClass("inactive")}))}))},quick_ajax_tabs:function(){if(e(".quick-ajax-tabs").length){const t=e(".quick-ajax-tab-button"),a=e(".quick-ajax-tab-content");t.on("click",(function(n){n.preventDefault();const _=e(this).data("tab");t.removeClass("active").attr("aria-selected","false").attr("tabindex","-1"),a.removeClass("active").attr("hidden",!0),e(this).addClass("active").attr("aria-selected","true").attr("tabindex","0"),e("#"+_).addClass("active").attr("hidden",!1)})),t.on("keydown",(function(e){const a=t.index(this);let n;if("ArrowRight"===e.key)n=(a+1)%t.length;else{if("ArrowLeft"!==e.key)return;n=(a-1+t.length)%t.length}t.eq(n).focus().click()}))}},copy_code:function(){e(".copy-button").on("click",(function(){var t=e("#"+e(this).data("copy")),a=e("<textarea>").val(t.text()).appendTo("body").select();try{navigator.clipboard.writeText(t.text()).then((()=>{})).catch((e=>{}))}finally{a.remove(),e(this).text("Code Copied"),setTimeout((()=>{e(this).text("Copy Code")}),2e3)}}))},generateId:function(e){let t=0;for(let a=0;a<e.length;a++)t+=e.charCodeAt(a),a%2==0?t+=e.charCodeAt(a):t-=e.charCodeAt(a);return t},getExcludedPostIds:function(e){var t=e.split(/[,\s]+/),a=[];return t.forEach((function(e){/^\d+$/.test(e)&&-1===a.indexOf(e)&&a.push(e)})),a.join(", ")},cleanClassNames:function(e){let t=e.replace(/,/g," ").split(/\s+/);return t=t.filter(((e,t,a)=>!/^\d/.test(e)&&""!==e&&a.indexOf(e)===t)),t.join(", ")},qapl_collect_input_data:function(){const t={};return e(".function-generator-wrap input, .function-generator-wrap select").each((function(a,n){const _=e(n),o=_.attr("name"),i=_.attr("id");if("checkbox"===n.type)if(o&&o.endsWith("[]")){let e=o.replace(/\[\]$/,"");t[e]\|\|(t[e]=[]),_.prop("checked")&&t[e].push(_.val())}else t[i]=_.prop("checked")?1:0;else t[i]=_.val()})),t},qapl_generate_args:function(e){const t=this;let a="",n="",_="";(a+="$quick_ajax_args = [\n",a+=" 'post_type' => '"+e.qapl_select_post_type+"',\n",a+=" 'posts_per_page' => "+e.qapl_select_posts_per_page+",\n","none"!==e.qapl_select_orderby&&(a+=" 'orderby' => '"+e.qapl_select_orderby+"',\n"),a+=" 'order' => '"+e.qapl_select_order+"',\n",""!==e.qapl_select_post_not_in)&&(a+=" 'post__not_in' => ["+t.getExcludedPostIds(e.qapl_select_post_not_in)+"],\n");if(1===e.qapl_ignore_sticky_posts&&(a+=" 'ignore_sticky_posts' => "+e.qapl_ignore_sticky_posts+",\n"),1===e.qapl_show_select_taxonomy&&(a+=" 'selected_taxonomy' => '"+e.qapl_select_taxonomy+"',\n"),1===e.qapl_show_select_taxonomy&&1===e.qapl_manual_term_selection){var o=e.qapl_manual_selected_terms;o&&o.length>0&&(n="[",n+=o.map((e=>`${e}`)).join(", "),n+="]"),n&&(a+=" 'selected_terms' => "+n+",\n")}let i=a.trimEnd();return i.endsWith(",")&&(a=i.slice(0,-1)+"\n"),a+="];",""!==a.trim()&&(_+="\n// Define AJAX query parameters for '"+e.qapl_select_post_type+"' type posts.\n",_+=a.trim()+"\n"),_},qapl_generate_attributes:function(e,t){const a=this;let n={},_="";n[qapl_quick_ajax_helper.quick_ajax_id]=t,1===e.qapl_layout_quick_ajax_css_style&&(n[qapl_quick_ajax_helper.quick_ajax_css_style]=e.qapl_layout_quick_ajax_css_style,n[qapl_quick_ajax_helper.grid_num_columns]=e.qapl_layout_select_columns_qty),e.qapl_layout_quick_ajax_post_item_template&&(n[qapl_quick_ajax_helper.post_item_template]=e.qapl_layout_quick_ajax_post_item_template),e.qapl_layout_add_taxonomy_filter_class&&""!==e.qapl_layout_add_taxonomy_filter_class&&(n[qapl_quick_ajax_helper.taxonomy_filter_class]=a.cleanClassNames(e.qapl_layout_add_taxonomy_filter_class)),e.qapl_layout_add_container_class&&""!==e.qapl_layout_add_container_class&&(n[qapl_quick_ajax_helper.container_class]=a.cleanClassNames(e.qapl_layout_add_container_class)),1===e.qapl_show_custom_load_more_post_quantity&&(n[qapl_quick_ajax_helper.load_more_posts]=e.qapl_select_custom_load_more_post_quantity),1===e.qapl_override_global_loader_icon&&(n[qapl_quick_ajax_helper.loader_icon]=e.qapl_loader_icon),1===e.qapl_ajax_on_initial_load&&(n[qapl_quick_ajax_helper.ajax_initial_load]=e.qapl_ajax_on_initial_load),1===e.qapl_ajax_infinite_scroll&&(n[qapl_quick_ajax_helper.infinite_scroll]=e.qapl_ajax_infinite_scroll),1===e.qapl_show_end_post_message&&(n[qapl_quick_ajax_helper.show_end_message]=e.qapl_show_end_post_message);var o="";return Object.keys(n).length>0&&(o="",o+="$quick_ajax_attributes = [\n",Object.entries(n).forEach((([e,t])=>{let n;n=a.quick_ajax_is_numeric(t)?parseInt(t):"string"==typeof t?`'${t}'`:t,o+=` '${e}' => ${n},\n`})),o=o.slice(0,-2)+"\n",o+="];"),""!==o.trim()&&(_+="\n// Define attributes for AJAX.\n",_+=o.trim()+"\n"),_},qapl_generate_sort_controls:function(e){let t=null,a=null;1===e.qapl_show_order_button&&(t=e.qapl_select_orderby_button_options,t&&t.length>0&&(a="$quick_ajax_sort_options = [",a+=t.map((e=>`'${e}'`)).join(", "),a+="];"));var n="",_="";null!==t&&a&&(n="",n+=a,_="",_+="if(function_exists('qapl_render_sort_controls')){\n",_+=" qapl_render_sort_controls(\n",_+=" $quick_ajax_args,\n",_+=" $quick_ajax_attributes,\n",_+=" $quick_ajax_sort_options\n",_+=" );\n",_+="}");let o="";return"string"==typeof n&&""!==n.trim()&&(o+="\n// Set the sort options for the button.\n",o+=n.trim()+"\n"),"string"==typeof _&&""!==_.trim()&&(o+="\n// Render the sorting control button.\n",o+=_.trim()+"\n"),o},qapl_generate_taxonomy_filter:function(e){let t=null,a="",n="";return 1===e.qapl_show_select_taxonomy&&(t=e.qapl_select_taxonomy),null!==t&&(n+="if(function_exists('qapl_render_taxonomy_filter')){\n",n+=" qapl_render_taxonomy_filter(\n",n+=" $quick_ajax_args,\n",n+=" $quick_ajax_attributes,\n",n=n.slice(0,-2)+"\n",n+=" );\n",n+="}"),""!==n.trim()&&(a+="\n// Render the navigation for '"+e.qapl_select_taxonomy+"' taxonomy.\n",a+=n.trim()+"\n"),a},qapl_generate_post_container:function(e,t){let a="",n="";return n+="if(function_exists('qapl_render_post_container')){\n",n+=" qapl_render_post_container(\n",n+=" $quick_ajax_args,\n",""!==t&&(n+=" $quick_ajax_attributes,\n"),n=n.slice(0,-2)+"\n",n+=" );\n",n+="}",""!==n.trim()&&(a+="\n// Render the grid for '"+e.qapl_select_post_type+"' type posts.\n",a+=n.trim()+"\n"),a},quick_ajax_function_generator:function(){const t=this;this.helper_available&&e(".generate-function-button").on("click",(function(){const a=e(this),n=a.attr("data-output"),_=e("#"+n),o=e('.copy-button[data-copy="'+n+'"]');a.prop("disabled",!0),o.prop("disabled",!0);const i=t.qapl_collect_input_data(),l=Object.values(i).join(""),c=t.generateId(l),s=t.qapl_generate_args(i),r=t.qapl_generate_attributes(i,c),p=[s,r,t.qapl_generate_sort_controls(i),t.qapl_generate_taxonomy_filter(i),t.qapl_generate_post_container(i,r)].filter(Boolean).join("");_.empty();for(var u=p.split("\n"),d=0;d<u.length;d++)!function(e){setTimeout((function(){_.append(u[e]+"\n"),e===u.length-1&&(a.prop("disabled",!1),o.prop("disabled",!1))}),50*d)}(d)}))},quick_ajax_is_numeric:function(e){return/^-?\d+(\.\d+)?$/.test(e)},quick_ajax_color_picker:function(){e(".color-picker-field").wpColorPicker()},quick_ajax_select_text:function(e){var t,a;document.body.createTextRange?((t=document.body.createTextRange()).moveToElementText(e),t.select()):window.getSelection&&(a=window.getSelection(),(t=document.createRange()).selectNodeContents(e),a.removeAllRanges(),a.addRange(t))},click_and_select_shortcode:function(){const t=this;e(".quick-ajax-shortcode").on("click",(function(){t.quick_ajax_select_text(this)}))},click_and_select_all:function(){const t=this;e(".click-and-select-all").on("click",(function(){var a=e(this).find("code").get(0);t.quick_ajax_select_text(a)}))},accordion_block_toggle:function(){var t=e("#wpbody-content");if(t.find(".quick-ajax-tabs").length>0){var a=e("#adminmenuwrap").outerHeight();t.css("min-height",a)}e(".quick-ajax-accordion-toggle").click((function(){e(this).toggleClass("active").next(".quick-ajax-accordion-content").slideToggle(200)}))}};e(document).ready((function(){t.init()}))}(jQuery);

quick-ajax-post-loader/trunk/quick-ajax-post-loader.php

-                      r3337932
+                      r3352831
 * Text Domain: quick-ajax-post-loader
 * Domain Path: /languages
 * Version: 1.7.7
+* Version: 1.8.0
 * Description: Supercharge post loading with Quick Ajax Post Loader. Enhance user experience and optimize site performance using AJAX technology.
 * Author: Pawel Grzelkowski
 …
 register_activation_hook(__FILE__, ['QAPL_Quick_Ajax_Activator', 'activate']);
-function qapl_quick_ajax_load_textdomain() {
-    load_plugin_textdomain('quick-ajax-post-loader', false, dirname(plugin_basename(__FILE__)) . '/languages/');
+}
-add_action('plugins_loaded', 'qapl_quick_ajax_load_textdomain');
 function qapl_initialize_plugin() {
     if (class_exists('QAPL_Quick_Ajax_Helper')) {
+    if (class_exists('QAPL_Quick_Ajax_Plugin_Starter')) {
         function qapl_quick_ajax_admin_notice() {
             echo '<div class="error"><p><strong>Quick Ajax Post Loader:</strong> A class named <strong>"QAPL_Quick_Ajax_Helper"</strong> already exists, which may have been declared by another plugin.</p></div>';
+            echo '<div class="error"><p><strong>Quick Ajax Post Loader:</strong> A class named <strong>"QAPL_Quick_Ajax_Plugin_Starter"</strong> already exists, which may have been declared by another plugin.</p></div>';
+        }
         add_action('admin_notices', 'qapl_quick_ajax_admin_notice');
     }else{
         require_once(plugin_dir_path( __FILE__ ).'inc/class-helper.php');
-        $qapl_helper = QAPL_Quick_Ajax_Helper::get_instance();
-        // Register frontend styles and scripts
-        add_action('wp_enqueue_scripts', [$qapl_helper, 'enqueue_frontend_styles_and_scripts']);
-        // Register admin styles and scripts
-        add_action('admin_enqueue_scripts', [$qapl_helper, 'enqueue_admin_styles_and_scripts']);
+    }
+}

quick-ajax-post-loader/trunk/readme.txt

-                      r3337932
+                      r3352831
 Requires at least: 5.6
 Tested up to: 6.8
 Stable tag: 1.7.7
+Stable tag: 1.8.0
 Requires PHP: 7.4
 License: GPLv2 or later
 …
 == Changelog ==
+= 1.8.0 - 2025-08-29 =
+- Major internal refactoring to improve plugin stability and long-term reliability.
+- Fixed several issues in the Function Generator for more consistent output.
+- Corrected minor CSS and JavaScript bugs to improve layout and functionality.
+- Optimized performance across both frontend and admin interface.
+- Improved compatibility with the latest WordPress versions.
+**Note:**
+- Most changes are behind the scenes. You may notice smoother performance and fewer issues, while the plugin remains fully compatible with your setup.
 = 1.7.7 - 2025-08-01 =
 - Improved CSS for better layout adaptability and responsiveness across various screen sizes.
 …
 == Upgrade Notice ==
+= 1.8.0 =
+Includes major internal improvements, bug fixes, and performance optimizations.
+Recommended update for better stability and compatibility.
 = 1.7.3 =
 **Important:**
 …
 = 1.7.0 =
+This update introduces improvements to filter buttons, loader styling, and shortcode parameter handling.
+**Important:**
+- New support for selecting taxonomy terms directly in shortcode settings offers better control.
+- The `qapl_render_taxonomy_filter()` function now auto-detects taxonomy and remains backward compatible.
+Recommended update for improved developer experience and enhanced plugin stability.
+Improves filter buttons, loader styling, and shortcode parameters. Adds taxonomy term selection in settings. `qapl_render_taxonomy_filter()` now auto-detects taxonomy. Recommended for better stability.
 = 1.6.4 =
 …
 = 1.6.3 =
+This update adds support for an "End Message" that appears when there are no more posts to load.
+**Important:**
+- The message can be set globally, edited in the template, or modified via the `qapl_template_end_post_message` filter.
+Recommended update for improved usability and developer flexibility.
+Adds support for an "End Message" shown when no more posts load. It can be set globally, edited in the template, or modified via the `qapl_template_end_post_message` filter.
 = 1.6.0 =
 …
 = 1.5.0 =
+Introduces a new sorting button feature and global sorting label options.
+**Important:**
+- The plugin now supports only `publish` posts, removing unnecessary settings.
+- Removed unused `orderby` values (can still be re-added via the `qapl_modify_posts_query_args` hook).
+Recommended update for improved sorting control and better plugin stability.
+Adds new sorting button and global sorting labels. Now supports only `publish` posts. Unused `orderby` values removed (can be restored via `qapl_modify_posts_query_args`). Improves sorting control and plugin stability.
 = 1.4.0 =

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 3352831

Legend:

quick-ajax-post-loader/trunk/admin/admin-pages-config.php

quick-ajax-post-loader/trunk/admin/pages/settings-page.php

quick-ajax-post-loader/trunk/admin/pages/shortcode-page.php

quick-ajax-post-loader/trunk/css/admin-style.css

quick-ajax-post-loader/trunk/css/admin-style.min.css

quick-ajax-post-loader/trunk/inc/actions.php

quick-ajax-post-loader/trunk/inc/class-activator.php

quick-ajax-post-loader/trunk/inc/class-ajax.php

quick-ajax-post-loader/trunk/inc/class-deprecated-hooks-handler.php

quick-ajax-post-loader/trunk/inc/class-helper.php

quick-ajax-post-loader/trunk/inc/class-shortcode.php

quick-ajax-post-loader/trunk/inc/class-template-hooks.php

quick-ajax-post-loader/trunk/inc/class-updater.php

quick-ajax-post-loader/trunk/inc/functions.php

quick-ajax-post-loader/trunk/js/admin-script.js

quick-ajax-post-loader/trunk/js/admin-script.min.js

quick-ajax-post-loader/trunk/quick-ajax-post-loader.php

quick-ajax-post-loader/trunk/readme.txt

Download in other formats: