Changeset 3776355

Timestamp:

10/31/2026 05:43:48 AM (18 hours ago)

Author:

fahadmahmood

Message:

releasing 1.3.7

Location:

wp-sort-order

Files:

• assets/banner-1544x500-old.png (added)
• assets/banner-1544x500.png (modified) ( previous)
• assets/banner-772x250-old.png (added)
• assets/banner-772x250.png (modified) ( previous)
• assets/icon-128x128-old.png (added)
• assets/icon-128x128.png (modified) ( previous)
• assets/icon-256x256-old.png (added)
• assets/icon-256x256.png (modified) ( previous)
• tags/1.3.7 (added)
• tags/1.3.7/css (added)
• tags/1.3.7/css/admin.css (added)
• tags/1.3.7/css/bootstrap.min.css (added)
• tags/1.3.7/css/fontawesome.min.css (added)
• tags/1.3.7/css/styles.css (added)
• tags/1.3.7/images (added)
• tags/1.3.7/images/bamboo.png (added)
• tags/1.3.7/images/check.png (added)
• tags/1.3.7/images/menu-over.png (added)
• tags/1.3.7/images/menu.png (added)
• tags/1.3.7/images/uncheck.png (added)
• tags/1.3.7/inc (added)
• tags/1.3.7/inc/functions.php (added)
• tags/1.3.7/inc/hooks.php (added)
• tags/1.3.7/inc/settings.php (added)
• tags/1.3.7/index.php (added)
• tags/1.3.7/js (added)
• tags/1.3.7/js/admin.js (added)
• tags/1.3.7/js/bootstrap.min.js (added)
• tags/1.3.7/js/fontawesome.min.js (added)
• tags/1.3.7/js/front-scripts.js (added)
• tags/1.3.7/js/scripts.js (added)
• tags/1.3.7/languages (added)
• tags/1.3.7/languages/wpso-sort-order-de_DE.mo (added)
• tags/1.3.7/languages/wpso-sort-order-de_DE.po (added)
• tags/1.3.7/languages/wpso-sort-order-es_ES.mo (added)
• tags/1.3.7/languages/wpso-sort-order-es_ES.po (added)
• tags/1.3.7/languages/wpso-sort-order-fr_FR.mo (added)
• tags/1.3.7/languages/wpso-sort-order-fr_FR.po (added)
• tags/1.3.7/readme.txt (added)
• tags/1.3.7/uninstall.php (added)
• tags/1.3.7/webfonts (added)
• tags/1.3.7/webfonts/fa-brands-400.eot (added)
• tags/1.3.7/webfonts/fa-brands-400.svg (added)
• tags/1.3.7/webfonts/fa-brands-400.ttf (added)
• tags/1.3.7/webfonts/fa-brands-400.woff (added)
• tags/1.3.7/webfonts/fa-brands-400.woff2 (added)
• tags/1.3.7/webfonts/fa-regular-400.eot (added)
• tags/1.3.7/webfonts/fa-regular-400.svg (added)
• tags/1.3.7/webfonts/fa-regular-400.ttf (added)
• tags/1.3.7/webfonts/fa-regular-400.woff (added)
• tags/1.3.7/webfonts/fa-regular-400.woff2 (added)
• tags/1.3.7/webfonts/fa-solid-900.eot (added)
• tags/1.3.7/webfonts/fa-solid-900.svg (added)
• tags/1.3.7/webfonts/fa-solid-900.ttf (added)
• tags/1.3.7/webfonts/fa-solid-900.woff (added)
• tags/1.3.7/webfonts/fa-solid-900.woff2 (added)
• trunk/inc/functions.php (modified) (1 diff)
• trunk/inc/hooks.php (modified) (1 diff)
• trunk/inc/settings.php (modified) (16 diffs)
• trunk/index.php (modified) (1 diff)
• trunk/js/admin.js (modified) (1 diff)
• trunk/js/scripts.js (modified) (2 diffs)
• trunk/readme.txt (modified) (5 diffs)
• trunk/uninstall.php (added)

wp-sort-order/trunk/inc/functions.php

@@ -1 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; 
-                
-        function sanitize_wpso_data( $input ) {
-                if(is_array($input)){           
-                        $new_input = array();   
-                        foreach ( $input as $key => $val ) {
-                                $new_input[ $key ] = (is_array($val)?sanitize_wpso_data($val):sanitize_text_field( $val ));
-                        }                       
-                }else{
-                        $new_input = sanitize_text_field($input);                       
-                        if(stripos($new_input, '@') && is_email($new_input)){
-                                $new_input = sanitize_email($new_input);
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+}
+
+/**
+ * Is the optional /pro add-on present and loaded?
+ *
+ * @return bool
+ */
+function wpso_is_pro() {
+        return ! empty( $GLOBALS['wpso_pro'] );
+}
+
+/**
+ * Recursively sanitize plugin data.
+ *
+ * @param mixed $input Raw value.
+ * @return mixed
+ */
+function sanitize_wpso_data( $input ) {
+        if ( is_array( $input ) ) {
+                $new_input = array();
+                foreach ( $input as $key => $val ) {
+                        $key               = is_int( $key ) ? $key : sanitize_text_field( (string) $key );
+                        $new_input[ $key ] = is_array( $val ) ? sanitize_wpso_data( $val ) : sanitize_text_field( (string) $val );
+                }
+                return $new_input;
+        }
+
+        $new_input = sanitize_text_field( (string) $input );
+        if ( false !== stripos( $new_input, '@' ) && is_email( $new_input ) ) {
+                $new_input = sanitize_email( $new_input );
+        }
+        if ( 0 === stripos( $new_input, 'http' ) && wp_http_validate_url( $new_input ) ) {
+                $new_input = sanitize_url( $new_input );
+        }
+        return $new_input;
+}
+
+/**
+ * Who may drag & drop?  Administrators by default; the pro add-on may extend this
+ * (never to anything the user could not already edit - every handler also checks
+ * per-object capabilities).
+ *
+ * @return bool
+ */
+function wpso_user_can_sort() {
+        return (bool) apply_filters( 'wpso_user_can_sort', current_user_can( 'manage_options' ) );
+}
+
+/**
+ * Read a sanitized value from $_GET.
+ *
+ * @param string $key     Query var.
+ * @param string $default Default.
+ * @return string
+ */
+function wpso_get( $key, $default = '' ) {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only routing, no state change.
+        return isset( $_GET[ $key ] ) && ! is_array( $_GET[ $key ] ) ? sanitize_text_field( wp_unslash( $_GET[ $key ] ) ) : $default;
+}
+
+/**
+ * Current admin request path (sanitized).
+ *
+ * @return string
+ */
+function wpso_request_uri() {
+        return isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
+}
+
+function wp_wpso_enqueue_scripts() {
+        global $wpdb;
+
+        wp_enqueue_script(
+                'wpso-front-scripts',
+                plugins_url( 'js/front-scripts.js', WPSO_FILE ),
+                array( 'jquery' ),
+                WPSO_VERSION,
+                true
+        );
+
+        $wp_wpso_array = array(
+                'ajaxurl' => admin_url( 'admin-ajax.php' ),
+        );
+
+        $expected_items = array();
+
+        // "User Categories" is a premium taxonomy - nothing to look up without it.
+        if ( wpso_is_pro() && taxonomy_exists( 'usercategories' ) ) {
+                $expected_terms = $wpdb->get_results(
+                        $wpdb->prepare( "SELECT t.term_id FROM {$wpdb->term_taxonomy} t WHERE t.taxonomy = %s", 'usercategories' )
+                );
+
+                foreach ( (array) $expected_terms as $eterms ) {
+                        $tax_term = $wpdb->get_row(
+                                $wpdb->prepare(
+                                        "SELECT t.taxonomy, t.term_id FROM {$wpdb->term_taxonomy} t, {$wpdb->terms} tr WHERE tr.term_id = %d AND tr.term_id = t.term_id LIMIT 1",
+                                        $eterms->term_id
+                                )
+                        );
+                        if ( ! $tax_term ) {
+                                continue;
                         }
-                        if(stripos($new_input, 'http') || wp_http_validate_url($new_input)){
-                                $new_input = sanitize_url($new_input);
-                        }                       
-                }       
-                return $new_input;
-        }       
-        function wp_wpso_enqueue_scripts() {
-                
-                global $wpdb;
-                
-                wp_enqueue_script(
-                        'wpso-front-scripts',
-                        plugins_url('js/front-scripts.js', dirname(__FILE__)),
-                        array('jquery'),
-                        date('Ymhi')
-                );
-                
-                $expected_terms = $wpdb->get_results("SELECT t.term_id FROM ".$wpdb->prefix."term_taxonomy t WHERE t.taxonomy='usercategories'");               
-                
-                $wp_wpso_array = array(
-                                                                'ajaxurl' => admin_url( 'admin-ajax.php' ),     
-                                                                'nonce'=> wp_create_nonce('wpso_nonce_ensured'),
-                                                );
-                                                
-                $expected_items = array();                              
-                                                
-                if(!empty($expected_terms)){
-                        foreach($expected_terms as $eterms){
-                                //pree($eterms);
-                                
-                                //$tquery = "SELECT t.taxonomy, t.term_id FROM $wpdb->term_taxonomy t, $wpdb->terms tr WHERE ".("tr.term_id='".$eterms->term_id."'")." AND tr.term_id=t.term_id LIMIT 1";       
-                                //pree($tquery);
-                                //$tax_term = $wpdb->get_row($tquery);
-                                
-                                $tquery = $wpdb->prepare(
-                                        "SELECT t.taxonomy, t.term_id FROM $wpdb->term_taxonomy t, $wpdb->terms tr WHERE tr.term_id = %d AND tr.term_id = t.term_id LIMIT 1",
-                                        $eterms->term_id
+
+                        $taxonomy   = $tax_term->taxonomy;
+                        $term_id    = (int) $tax_term->term_id;
+                        $term_items = get_term_children( $term_id, $taxonomy );
+
+                        if ( empty( $term_items ) || is_wp_error( $term_items ) ) {
+                                $term_items_direct = get_objects_in_term( $term_id, $taxonomy );
+                                $term_items        = ( ! empty( $term_items_direct ) && ! is_wp_error( $term_items_direct ) ) ? array( $term_id ) : array();
+                        }
+
+                        foreach ( $term_items as $items ) {
+                                $items        = (int) $items;
+                                $team_members = $wpdb->get_results(
+                                        $wpdb->prepare(
+                                                "SELECT um.user_id FROM {$wpdb->usermeta} um WHERE um.meta_key = %s ORDER BY CAST(um.meta_value AS unsigned) ASC",
+                                                'user_order_' . $items
+                                        )
                                 );
-                                $tax_term = $wpdb->get_row($tquery);
-                                
-                                
-                                $taxonomy = $tax_term->taxonomy;
-                                $term_id = $tax_term->term_id;
-                                $term_items = get_term_children($term_id, $taxonomy);
-                                
-                                if(empty($term_items)){
-                                        $term_items_direct = get_objects_in_term( $term_id, $taxonomy); //07-10-2018
-                                        if(!empty($term_items_direct)){
-                                                $term_items = array($term_id);
-                                        }
+
+                                foreach ( (array) $team_members as $team_member ) {
+                                        $expected_items[ $items ][] = array(
+                                                'user_id'   => (int) $team_member->user_id,
+                                                'user_link' => esc_url_raw( get_author_posts_url( $team_member->user_id ) ),
+                                        );
                                 }
-                                
-                                if(!empty($term_items)){
-                                        
-                                        if($items>0)
-                                        $expected_items[$items] = array();
-                                        
-                                        foreach($term_items as $items){
-                                                //pree($items);
-                                                $term = get_term_by('id', $items, $taxonomy);
-                                                
-                                                
-                                                /*$squery = "
-                                                                                SELECT                                                  
-                                                                                        um.user_id
-                                                                                        
-                                                                                FROM 
-                                                                                        $wpdb->usermeta um
-                                                                                WHERE                                                                           
-                                                                                        um.meta_key=CONCAT('user_order_', $items)
-                                                                                ORDER BY
-                                                                                        CAST(um.meta_value AS unsigned)
-                                                                                ASC
-                                                                                        
-                                                                        ";
-                                                                        
-                                                $teamMembers = $wpdb->get_results($squery);*/
-                                                
-                                                $squery = $wpdb->prepare(
-                                                        "SELECT um.user_id
-                                                        FROM $wpdb->usermeta um
-                                                        WHERE um.meta_key = %s
-                                                        ORDER BY CAST(um.meta_value AS unsigned) ASC",
-                                                        'user_order_' . $items
-                                                );
-                                                $teamMembers = $wpdb->get_results($squery);
-                                                
-                                                
-                                                if(!empty($teamMembers)){                                                       
-                                                        foreach ( $teamMembers as $teamMember ){
-                                                                        
-                                                                //$teamMember_info = get_userdata($teamMember->user_id);        
-                                                                //pree(get_author_posts_url($teamMember->user_id));
-                                                                $expected_items[$items][] = array('user_id'=>$teamMember->user_id, 'user_link'=>get_author_posts_url($teamMember->user_id));
-                                                        } 
-                                                        
-                                                }
-                                        }
-                                }
-
                         }
-                }               
-                
-                $wp_wpso_array['user_items'] = $expected_items;
-                
-                wp_localize_script( 'wpso-front-scripts', 'wpso', $wp_wpso_array );
-        }
-        
-        add_action( 'wp_enqueue_scripts', 'wp_wpso_enqueue_scripts', 99 );      
-        
-        
-        function wp_wpso_admin_enqueue_scripts() {
-                
-                global $wpdb;
-                
-                if(isset($_GET['page']) && $_GET['page']=='wpso-settings'){
-                        
-                        wp_enqueue_script( 'wpso-fontawesome', plugin_dir_url( dirname(__FILE__) ) . 'js/fontawesome.min.js' );
-                        wp_enqueue_style( 'wpso-fontawesome', plugins_url('css/fontawesome.min.css', dirname(__FILE__)), array());      
-                        wp_enqueue_script( 'wpso-bootstrap', plugin_dir_url( dirname(__FILE__) ) . 'js/bootstrap.min.js' );
-                        wp_enqueue_style( 'wpso-bootstrap', plugins_url('css/bootstrap.min.css', dirname(__FILE__)), array());                          
-                }
-                
-        }
-                        
-        add_action( 'admin_enqueue_scripts', 'wp_wpso_admin_enqueue_scripts', 99 );             
-        
-        if(!function_exists('pre')){
-                function pre($data){
-                        if(isset($_GET['debug']) && current_user_can('manage_options')){
-                                pree($data);
-                        }
-                }        
-        } 
-                
-        if(!function_exists('pree')){
-        function pree($data){
-                                if ( ! current_user_can( 'manage_options' ) ) {
-                                        return;
-                                }
-                                echo '<pre>';
-                                print_r($data);
-                                echo '</pre>';  
-                
-                }        
-        }       
-
-        if ( ! function_exists("wpso_plugin_links"))
-        {
-                function wpso_plugin_links($links) { 
-                        global $wpso_premium_link, $wpso_pro;
-                        
-                        $settings_link = '<a href="options-general.php?page=wpso-settings">'.__('Settings', 'wpso-sort-order').'</a>';
-                        
-                        if($wpso_pro){
-                                array_unshift($links, $settings_link); 
-                        }else{
-                                 
-                                $wpso_premium_link = '<a href="'.esc_url($wpso_premium_link).'" title="'.__('Go Premium', 'wpso-sort-order').'" target=_blank>'.__('Go Premium', 'wpso-sort-order').'</a>'; 
-                                array_unshift($links, $settings_link, $wpso_premium_link); 
-                        
-                        }
-                        
-                        
-                        return $links; 
-                }
-        }
-        
-/**
-* Uninstall hook
-*/
-        
-        register_uninstall_hook( __FILE__, 'wpso_uninstall' );
-        
-        function wpso_uninstall()
-        {
-                global $wpdb;
-                if ( function_exists( 'is_multisite' ) && is_multisite() ) {
-                        $curr_blog = $wpdb->blogid;
-                        $blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
-                        foreach( $blogids as $blog_id ) {
-                                switch_to_blog( $blog_id );
-                                wpso_uninstall_db();
-                        }
-                        switch_to_blog( $curr_blog );
+                }
+        }
+
+        $wp_wpso_array['user_items'] = $expected_items;
+
+        wp_localize_script( 'wpso-front-scripts', 'wpso', $wp_wpso_array );
+}
+add_action( 'wp_enqueue_scripts', 'wp_wpso_enqueue_scripts', 99 );
+
+function wp_wpso_admin_enqueue_scripts() {
+        if ( 'wpso-settings' === wpso_get( 'page' ) && current_user_can( 'manage_options' ) ) {
+                wp_enqueue_script( 'wpso-fontawesome', WPSO_URL . '/js/fontawesome.min.js', array(), WPSO_VERSION, true );
+                wp_enqueue_style( 'wpso-fontawesome', WPSO_URL . '/css/fontawesome.min.css', array(), WPSO_VERSION );
+                wp_enqueue_script( 'wpso-bootstrap', WPSO_URL . '/js/bootstrap.min.js', array( 'jquery' ), WPSO_VERSION, true );
+                wp_enqueue_style( 'wpso-bootstrap', WPSO_URL . '/css/bootstrap.min.css', array(), WPSO_VERSION );
+        }
+}
+add_action( 'admin_enqueue_scripts', 'wp_wpso_admin_enqueue_scripts', 99 );
+
+if ( ! function_exists( 'pre' ) ) {
+        function pre( $data ) {
+                if ( isset( $_GET['debug'] ) && current_user_can( 'manage_options' ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                        pree( $data );
+                }
+        }
+}
+
+if ( ! function_exists( 'pree' ) ) {
+        function pree( $data ) {
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        return;
+                }
+                echo '<pre>' . esc_html( print_r( $data, true ) ) . '</pre>'; // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
+        }
+}
+
+if ( ! function_exists( 'wpso_plugin_links' ) ) {
+        function wpso_plugin_links( $links ) {
+                global $wpso_premium_link;
+
+                $settings_link = '<a href="' . esc_url( admin_url( 'options-general.php?page=wpso-settings' ) ) . '">' . esc_html__( 'Settings', 'wpso-sort-order' ) . '</a>';
+
+                if ( wpso_is_pro() ) {
+                        array_unshift( $links, $settings_link );
                 } else {
-                        wpso_uninstall_db();
-                }
-        }
-        function wpso_uninstall_db()
-        {
-                global $wpdb;
-                $result = $wpdb->query( "DESCRIBE $wpdb->terms `term_order`" );
-                if ( $result ){
-                        $query = "ALTER TABLE $wpdb->terms DROP `term_order`";
-                        $result = $wpdb->query( $query );
-                }
-                
-                $result = $wpdb->query( "DESCRIBE $wpdb->users `user_order`" );
-                if ( $result ){
-                        $query = "ALTER TABLE $wpdb->users DROP `user_order`";
-                        $result = $wpdb->query( $query );
-                }
-        
-                delete_option( 'wpso_activation' );     
-        }
-        add_action('admin_init', 'wpso_admin_init');
-        function wpso_admin_init(){
-                //pree($_GET);
-                if(isset($_GET['get_keys'])){
-                        if( ! current_user_can( 'manage_options' ) ) {
-                                wp_die( esc_html__( 'Unauthorized access.', 'wpso-sort-order' ) );
-                        }
-                        if(isset($_GET['post']) && is_numeric($_GET['post'])){
-                                pre(get_post($_GET['post']));
-                                pre(get_post_meta($_GET['post']));
-                                wp_die();
-                        }
-                }
-        }
+                        $go_premium = '<a href="' . esc_url( $wpso_premium_link ) . '" title="' . esc_attr__( 'Go Premium', 'wpso-sort-order' ) . '" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Go Premium', 'wpso-sort-order' ) . '</a>';
+                        array_unshift( $links, $settings_link, $go_premium );
+                }
+
+                return $links;
+        }
+}
+
+/**
+ * Debug helper (administrators only): ?get_keys&post=ID dumps a post and its meta.
+ */
+function wpso_admin_init() {
+        if ( isset( $_GET['get_keys'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        wp_die( esc_html__( 'Unauthorized access.', 'wpso-sort-order' ) );
+                }
+                $post_id = isset( $_GET['post'] ) ? absint( $_GET['post'] ) : 0; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                if ( $post_id ) {
+                        pre( get_post( $post_id ) );
+                        pre( get_post_meta( $post_id ) );
+                        wp_die();
+                }
+        }
+}
+add_action( 'admin_init', 'wpso_admin_init' );

wp-sort-order/trunk/inc/hooks.php

@@ -1 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; 
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+}
+
 /**
-* Class & Method
-*/
-        
-        $wpso = new Wpso();
-        
-        class Wpso
-        {
-                function __construct()
-                {
-                        if ( !get_option( 'wpso_activation' ) ) $this->wpso_activation();
-                        
-                        add_action( 'plugins_loaded', array( $this, 'wpso_load_textdomain' ) );
-        
-                        add_action( 'admin_menu', array( $this, 'admin_menu') );
-                        
-                        if(isset($_GET['page']) && $_GET['page']=='wpso-settings')
+ * Class & Method
+ */
+class Wpso {
+
+        /**
+         * Post statuses that take part in ordering.
+         */
+        const STATUSES = "'publish', 'pending', 'draft', 'private', 'future'";
+
+        public function __construct() {
+                if ( ! get_option( 'wpso_activation' ) ) {
+                        $this->wpso_activation();
+                }
+
+                add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+
+                if ( 'wpso-settings' === wpso_get( 'page' ) ) {
                         add_action( 'admin_init', array( $this, 'refresh' ) );
-                        
-        
-                        
-                        add_action( 'admin_init', array( $this, 'update_options') );
-                        add_action( 'admin_init', array( $this, 'update_options_premium') );
-                        add_action( 'admin_init', array( $this, 'load_script_css' ) );
-                        
-                        // sortable ajax action
-                        add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
-                        add_action( 'wp_ajax_update-menu-order-tags', array( $this, 'update_menu_order_tags' ) );
-                        
-                        add_action( 'wp_ajax_update-menu-order-users', array( $this, 'update_menu_order_users' ) );
-                        add_action( 'wp_ajax_update-menu-order-extras', array( $this, 'update_menu_order_extras' ) );
-                        
-                        
-                        // reorder post types
-                        add_action( 'pre_get_posts', array( $this, 'wpso_pre_get_posts' ) );
-                        
-                        add_filter( 'get_previous_post_where', array( $this, 'wpso_previous_post_where' ) );
-                        add_filter( 'get_previous_post_sort', array( $this, 'wpso_previous_post_sort' ) );
-                        add_filter( 'get_next_post_where', array( $this, 'hocpo_next_post_where' ) );
-                        add_filter( 'get_next_post_sort', array( $this, 'wpso_next_post_sort' ) );
-                        
-                        // reorder taxonomies
-                        add_filter( 'get_terms_orderby', array( $this, 'wpso_get_terms_orderby' ), 10, 3 );
-                        add_filter( 'wp_get_object_terms', array( $this, 'wpso_get_object_terms' ), 10, 3 );
-                        add_filter( 'get_terms', array( $this, 'wpso_get_object_terms' ), 10, 3 );
-                        
-                        // reorder users
-                        add_action('pre_user_query', array($this, 'wpso_pre_user_query'));
-                }
-                
-                function wpso_pre_user_query($userquery){
-                        
-                        global $wpdb;
-                        
-                        $screen = get_current_screen();
-                        
-                        if ( ! is_object( $screen ) or 'users' != $screen->id )
+                }
+
+                add_action( 'admin_init', array( $this, 'update_options' ) );
+                add_action( 'admin_init', array( $this, 'update_options_premium' ) );
+                add_action( 'admin_init', array( $this, 'load_script_css' ) );
+
+                // sortable ajax actions
+                add_action( 'wp_ajax_update-menu-order', array( $this, 'update_menu_order' ) );
+                add_action( 'wp_ajax_update-menu-order-tags', array( $this, 'update_menu_order_tags' ) );
+                add_action( 'wp_ajax_update-menu-order-users', array( $this, 'update_menu_order_users' ) );
+                add_action( 'wp_ajax_update-menu-order-extras', array( $this, 'update_menu_order_extras' ) );
+
+                // reorder post types
+                add_action( 'pre_get_posts', array( $this, 'wpso_pre_get_posts' ) );
+
+                add_filter( 'get_previous_post_where', array( $this, 'wpso_previous_post_where' ) );
+                add_filter( 'get_previous_post_sort', array( $this, 'wpso_previous_post_sort' ) );
+                add_filter( 'get_next_post_where', array( $this, 'hocpo_next_post_where' ) );
+                add_filter( 'get_next_post_sort', array( $this, 'wpso_next_post_sort' ) );
+
+                // reorder taxonomies
+                add_filter( 'get_terms_orderby', array( $this, 'wpso_get_terms_orderby' ), 10, 3 );
+                add_filter( 'wp_get_object_terms', array( $this, 'wpso_get_object_terms' ), 10, 3 );
+                add_filter( 'get_terms', array( $this, 'wpso_get_object_terms' ), 10, 3 );
+
+                // reorder users
+                add_action( 'pre_user_query', array( $this, 'wpso_pre_user_query' ) );
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Users
+         * ------------------------------------------------------------------ */
+
+        public function wpso_pre_user_query( $userquery ) {
+                global $wpdb;
+
+                if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
                         return;
-                
-                        $vars = $userquery->query_vars;
-                        
-                        //pree($vars);
-                        
-                        $valid_tax = $this->current_tax($_GET);
-                        
-                        //pree($valid_tax);
-                        if($valid_tax==0)
+                }
+
+                $screen = get_current_screen();
+                if ( ! is_object( $screen ) || 'users' !== $screen->id ) {
                         return;
-                        
-                        $userquery->query_from .= " LEFT JOIN {$wpdb->usermeta} m1 ON {$wpdb->users}.ID=m1.user_id AND (m1.meta_key='user_order_".$valid_tax."')"; 
-                        
-                        $userquery->query_orderby = " ORDER BY CAST(m1.meta_value AS unsigned) ".($userquery->query_vars["order"] == "ASC" ? "asc " : "desc ");
-                        
-                        //pree($userquery);
-                }
-                
-                function wpso_activation()
-                {
-                        global $wpdb;
-                        $result = $wpdb->query( "DESCRIBE $wpdb->terms `term_order`" );
-
-                        if ( !$result ) {
-                                $query = "ALTER TABLE $wpdb->terms ADD `term_order` INT( 4 ) NULL DEFAULT '0'";
-                                $result = $wpdb->query( $query );
-                                
-                        }
-        
-                        $result = $wpdb->query( "DESCRIBE $wpdb->users `user_order`" );
-                        if ( !$result ) {
-                                $query = "ALTER TABLE $wpdb->users ADD `user_order` INT( 4 ) NULL DEFAULT '0'";
-                                $result = $wpdb->query( $query );
-                        }
-        
-                        update_option( 'wpso_activation', 1 );
-                }
-        
-                function wpso_load_textdomain()
-                {
-                        //load_plugin_textdomain( 'wp-sort-order', false, basename( dirname( __FILE__ ) ).'/languages/' );
-                }
-                function admin_menu()
-                {
-                        add_options_page( 'WP Sort Order', 'WP Sort Order', 'manage_options', 'wpso-settings', array( $this,'admin_page' ) );
-                }
-                
-                function admin_page()
-                {
-                        require WPSO_DIR.'inc/settings.php';
-                }
-        
-                function _check_load_script_css()
-                {
-                        global $wpso_pro, $wpso_allowed_pages;
-                        $active = false;
-                        
-                        $objects = $this->get_wpso_options_objects();
-                        $tags = $this->get_wpso_options_tags();
-                        $extras = $this->get_wpso_options_extras();
-                        //pree($extras);
-                        
-                        
-                        if (!$active && !empty( $extras ) ) {
-                                foreach($wpso_allowed_pages as $page_name=>$page_title){
-                                        if(in_array($page_name, $extras) && (strstr( $_SERVER['REQUEST_URI'], 'wp-admin/'.$page_name ))){
-                                                $active = true;
+                }
+
+                $valid_tax = absint( $this->current_tax( $_GET ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- sanitized in current_tax().
+                if ( 0 === $valid_tax ) {
+                        return;
+                }
+
+                $userquery->query_from .= $wpdb->prepare(
+                        " LEFT JOIN {$wpdb->usermeta} m1 ON {$wpdb->users}.ID = m1.user_id AND (m1.meta_key = %s)",
+                        'user_order_' . $valid_tax
+                );
+
+                $order                  = ( isset( $userquery->query_vars['order'] ) && 'ASC' === strtoupper( $userquery->query_vars['order'] ) ) ? 'asc' : 'desc';
+                $userquery->query_orderby = ' ORDER BY CAST(m1.meta_value AS unsigned) ' . $order . ' ';
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Activation / menu
+         * ------------------------------------------------------------------ */
+
+        public function wpso_activation() {
+                global $wpdb;
+
+                if ( ! $wpdb->query( "DESCRIBE {$wpdb->terms} `term_order`" ) ) { // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                        $wpdb->query( "ALTER TABLE {$wpdb->terms} ADD `term_order` INT( 4 ) NULL DEFAULT '0'" ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                }
+
+                if ( ! $wpdb->query( "DESCRIBE {$wpdb->users} `user_order`" ) ) { // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                        $wpdb->query( "ALTER TABLE {$wpdb->users} ADD `user_order` INT( 4 ) NULL DEFAULT '0'" ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery
+                }
+
+                update_option( 'wpso_activation', 1 );
+        }
+
+        public function wpso_load_textdomain() {
+                // Kept for backward compatibility - translations are loaded on "init" from index.php.
+        }
+
+        public function admin_menu() {
+                add_options_page( 'WP Sort Order', 'WP Sort Order', 'manage_options', 'wpso-settings', array( $this, 'admin_page' ) );
+        }
+
+        public function admin_page() {
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                }
+                require WPSO_DIR . 'inc/settings.php';
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Scripts
+         * ------------------------------------------------------------------ */
+
+        public function _check_load_script_css() {
+                global $wpso_allowed_pages;
+
+                $active  = false;
+                $objects = $this->get_wpso_options_objects();
+                $tags    = $this->get_wpso_options_tags();
+                $extras  = $this->get_wpso_options_extras();
+                $uri     = wpso_request_uri();
+
+                if ( ! empty( $extras ) && current_user_can( 'manage_options' ) ) {
+                        foreach ( (array) $wpso_allowed_pages as $page_name => $page_title ) {
+                                if ( in_array( $page_name, $extras, true ) && false !== strpos( $uri, 'wp-admin/' . $page_name ) ) {
+                                        $active = true;
+                                }
+                        }
+                }
+
+                if ( empty( $objects ) && empty( $tags ) ) {
+                        return false;
+                }
+
+                // exclude (sorting, addnew page, edit page)
+                if ( isset( $_GET['orderby'] ) || false !== strpos( $uri, 'action=edit' ) || false !== strpos( $uri, 'wp-admin/post-new.php' ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                        return false;
+                }
+
+                $post_type = wpso_get( 'post_type' );
+                $taxonomy  = wpso_get( 'taxonomy' );
+
+                if ( ! $active && ! empty( $objects ) ) {
+                        if ( '' !== $post_type && '' === $taxonomy && in_array( $post_type, $objects, true ) ) { // if page or custom post types
+                                $active = true;
+                        }
+                        if ( '' === $post_type && false !== strpos( $uri, 'wp-admin/edit.php' ) && in_array( 'post', $objects, true ) ) { // if post
+                                $active = true;
+                        }
+                }
+
+                if ( ! $active && ! empty( $tags ) ) {
+                        if ( '' !== $taxonomy && in_array( $taxonomy, $tags, true ) ) {
+                                $active = true;
+                        }
+
+                        foreach ( $tags as $tag ) {
+                                if ( isset( $_GET[ $tag ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                                        $active = true;
+                                        break;
+                                }
+                        }
+
+                        if ( wpso_is_pro() && false !== strpos( $uri, 'wp-admin/users.php' ) && in_array( 'usercategories', $tags, true ) ) {
+                                $active = true;
+                        }
+                }
+
+                return $active;
+        }
+
+        public function load_script_css() {
+                $translation_array = array(
+                        'ajaxurl'  => admin_url( 'admin-ajax.php' ),
+                        'this_url' => admin_url( 'admin.php?page=wpso-settings' ),
+                        'wpso_tab' => (string) absint( wpso_get( 't', '0' ) ),
+                        'nonce'    => wp_create_nonce( 'wpso_nonce_ensured' ),
+                );
+
+                if ( $this->_check_load_script_css() && wpso_user_can_sort() ) {
+                        wp_enqueue_script( 'jquery' );
+                        wp_enqueue_script( 'jquery-ui-sortable' );
+                        wp_enqueue_script( 'wpsojs', WPSO_URL . '/js/scripts.js', array( 'jquery' ), WPSO_VERSION, true );
+                        wp_enqueue_style( 'wpso', WPSO_URL . '/css/styles.css', array(), WPSO_VERSION );
+                }
+
+                if ( is_admin() && 'wpso-settings' === wpso_get( 'page' ) && current_user_can( 'manage_options' ) ) {
+                        wp_enqueue_style( 'wpso', WPSO_URL . '/css/admin.css', array(), WPSO_VERSION );
+                        wp_enqueue_script( 'wpsojs', WPSO_URL . '/js/admin.js', array( 'jquery' ), WPSO_VERSION, true );
+                }
+
+                if ( wp_script_is( 'wpsojs', 'enqueued' ) ) {
+                        wp_localize_script( 'wpsojs', 'wpso_obj', $translation_array );
+                }
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Re-numbering helpers
+         * ------------------------------------------------------------------ */
+
+        /**
+         * Re-number menu_order of the given post types.
+         *
+         * @param array  $objects Post types.
+         * @param string $mode    "keep" (current order), "page" (menu_order, title) or "date".
+         */
+        private function renumber_objects( $objects, $mode = 'keep' ) {
+                global $wpdb;
+
+                foreach ( (array) $objects as $object ) {
+                        $result = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        'SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status IN (' . self::STATUSES . ')',
+                                        $object
+                                )
+                        );
+                        if ( empty( $result ) || 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+                                continue;
+                        }
+
+                        if ( 'page' === $mode && 'page' === $object ) {
+                                $order_by = 'menu_order, post_title ASC';
+                        } elseif ( 'date' === $mode || 'page' === $mode ) {
+                                $order_by = 'post_date DESC';
+                        } else {
+                                $order_by = 'menu_order ASC';
+                        }
+
+                        $results = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        'SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_status IN (' . self::STATUSES . ') ORDER BY ' . $order_by, // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- fixed whitelist above.
+                                        $object
+                                )
+                        );
+                        foreach ( (array) $results as $key => $row ) {
+                                $wpdb->update( $wpdb->posts, array( 'menu_order' => $key + 1 ), array( 'ID' => (int) $row->ID ), array( '%d' ), array( '%d' ) );
+                                clean_post_cache( (int) $row->ID );
+                        }
+                }
+        }
+
+        /**
+         * Re-number term_order of the given taxonomies.
+         *
+         * @param array  $tags Taxonomies.
+         * @param string $sort "keep" (current order) or "name".
+         */
+        private function renumber_taxonomies( $tags, $sort = 'keep' ) {
+                global $wpdb;
+
+                foreach ( (array) $tags as $taxonomy ) {
+                        $result = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        "SELECT count(*) as cnt, max(term_order) as max, min(term_order) as min FROM {$wpdb->terms} AS terms INNER JOIN {$wpdb->term_taxonomy} AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) WHERE term_taxonomy.taxonomy = %s",
+                                        $taxonomy
+                                )
+                        );
+                        if ( empty( $result ) || 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+                                continue;
+                        }
+
+                        $order_by = ( 'name' === $sort ) ? 'name ASC' : 'term_order ASC';
+                        $results  = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        "SELECT terms.term_id FROM {$wpdb->terms} AS terms INNER JOIN {$wpdb->term_taxonomy} AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) WHERE term_taxonomy.taxonomy = %s ORDER BY " . $order_by, // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- fixed whitelist above.
+                                        $taxonomy
+                                )
+                        );
+                        foreach ( (array) $results as $key => $row ) {
+                                $wpdb->update( $wpdb->terms, array( 'term_order' => $key + 1 ), array( 'term_id' => (int) $row->term_id ), array( '%d' ), array( '%d' ) );
+                        }
+                }
+        }
+
+        public function refresh() {
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        return;
+                }
+
+                $objects = $this->get_wpso_options_objects();
+                $tags    = $this->get_wpso_options_tags();
+
+                $this->renumber_objects( $objects, 'keep' );
+                $this->renumber_taxonomies( $tags, 'keep' );
+
+                foreach ( $tags as $term ) {
+                        if ( ! taxonomy_exists( $term ) ) {
+                                continue;
+                        }
+                        $term_items = get_terms(
+                                array(
+                                        'taxonomy'   => $term,
+                                        'hide_empty' => false,
+                                )
+                        );
+                        if ( empty( $term_items ) || is_wp_error( $term_items ) ) {
+                                continue;
+                        }
+                        foreach ( $term_items as $item ) {
+                                if ( ! is_object( $item ) ) {
+                                        continue;
+                                }
+                                $this->refine_terms_relations( $item->term_id );
+                                $item_child = get_term_children( $item->term_id, $term );
+                                if ( ! empty( $item_child ) && ! is_wp_error( $item_child ) ) {
+                                        foreach ( $item_child as $child ) {
+                                                $this->refine_terms_relations( $child );
                                         }
                                 }
-                        }                       
-                        
-                        if ( empty( $objects ) && empty( $tags ) ) return false;
-                        
-                        //pree($objects);
-                        //pree($tags);
-                        
-                        // exclude (sorting, addnew page, edit page)
-                        if (isset( $_GET['orderby'] ) || strstr( $_SERVER['REQUEST_URI'], 'action=edit' ) || strstr( $_SERVER['REQUEST_URI'], 'wp-admin/post-new.php' ) ) return false;
-                        
-                        //pree($tags);
-                        
-                        if (!$active &&  !empty( $objects ) ) {
-                                if ( isset( $_GET['post_type'] ) && !isset( $_GET['taxonomy'] ) && in_array( $_GET['post_type'], $objects ) ) { // if page or custom post types
-                                        $active = true;
+                        }
+                }
+        }
+
+        public function refine_terms_relations( $item ) {
+                global $wpdb;
+
+                $item = absint( $item );
+                if ( ! $item ) {
+                        return;
+                }
+
+                $stats = $wpdb->get_results(
+                        $wpdb->prepare(
+                                "SELECT count(*) as cnt, max(um.meta_value) as max, min(um.meta_value) as min
+                                FROM {$wpdb->term_relationships} AS r, {$wpdb->users} AS u, {$wpdb->usermeta} AS um
+                                WHERE r.term_taxonomy_id = %d AND u.ID = r.object_id
+                                AND (um.user_id = r.object_id AND um.meta_key = CONCAT('user_order_', r.term_taxonomy_id))",
+                                $item
+                        )
+                );
+
+                $user_count1 = $wpdb->get_var(
+                        $wpdb->prepare(
+                                "SELECT COUNT(*) FROM {$wpdb->users} u, {$wpdb->term_relationships} AS r WHERE r.term_taxonomy_id = %d AND u.ID = r.object_id",
+                                $item
+                        )
+                );
+
+                $user_count2 = $wpdb->get_var(
+                        $wpdb->prepare(
+                                "SELECT COUNT(*) FROM {$wpdb->usermeta} um WHERE um.meta_key = %s",
+                                'user_order_' . $item
+                        )
+                );
+
+                if ( $user_count1 != $user_count2 ) {
+                        // Counts differ: drop the stored order for this term so it is rebuilt below.
+                        $dres = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        "SELECT um.umeta_id, um.user_id FROM {$wpdb->usermeta} um WHERE um.meta_key = %s",
+                                        'user_order_' . $item
+                                )
+                        );
+                        foreach ( (array) $dres as $res ) {
+                                $wpdb->delete( $wpdb->usermeta, array( 'umeta_id' => (int) $res->umeta_id ), array( '%d' ) );
+                        }
+                }
+
+                if ( ! empty( $stats ) && $stats[0]->cnt == $stats[0]->max ) {
+                        return;
+                }
+
+                $relations = $wpdb->get_results(
+                        $wpdb->prepare(
+                                "SELECT um.user_id, um.meta_value
+                                FROM {$wpdb->term_relationships} AS r, {$wpdb->users} AS u, {$wpdb->usermeta} AS um
+                                WHERE r.term_taxonomy_id = %d AND u.ID = r.object_id
+                                AND (um.user_id = r.object_id AND um.meta_key = CONCAT('user_order_', r.term_taxonomy_id))",
+                                $item
+                        )
+                );
+
+                if ( empty( $relations ) ) {
+                        $relations = $wpdb->get_results(
+                                $wpdb->prepare(
+                                        "SELECT u.ID AS user_id FROM {$wpdb->term_relationships} AS r, {$wpdb->users} AS u WHERE r.term_taxonomy_id = %d AND u.ID = r.object_id",
+                                        $item
+                                )
+                        );
+                }
+
+                foreach ( (array) $relations as $k => $res ) {
+                        update_user_meta( (int) $res->user_id, 'user_order_' . $item, $k + 1 );
+                }
+        }
+
+        /* ------------------------------------------------------------------ *
+         * AJAX helpers
+         * ------------------------------------------------------------------ */
+
+        /**
+         * Common AJAX gate: capability + nonce.
+         *
+         * @param bool $admin_only Restrict to administrators regardless of pro role settings.
+         */
+        private function ajax_gate( $admin_only = false ) {
+                $allowed = $admin_only ? current_user_can( 'manage_options' ) : wpso_user_can_sort();
+                if ( ! $allowed ) {
+                        wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                }
+
+                $nonce = isset( $_POST['wpso_nonce'] ) ? sanitize_text_field( wp_unslash( $_POST['wpso_nonce'] ) ) : '';
+                if ( ! $nonce || ! wp_verify_nonce( $nonce, 'wpso_nonce_ensured' ) ) {
+                        wp_die( esc_html__( 'Sorry! Your nonce did not verify.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                }
+        }
+
+        /**
+         * Parse jQuery UI "serialize()" output into a flat, ordered list of integer ids.
+         *
+         * @return int[]
+         */
+        private function parse_order_ids() {
+                $raw = isset( $_POST['order'] ) && is_string( $_POST['order'] ) ? wp_unslash( $_POST['order'] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- parsed + cast to int below.
+                if ( '' === $raw || strlen( $raw ) > 50000 ) {
+                        return array();
+                }
+                parse_str( $raw, $data );
+
+                $ids = array();
+                if ( is_array( $data ) ) {
+                        foreach ( $data as $values ) {
+                                if ( ! is_array( $values ) ) {
+                                        continue;
                                 }
-                                if ( !isset( $_GET['post_type'] ) && strstr( $_SERVER['REQUEST_URI'], 'wp-admin/edit.php' ) && in_array( 'post', $objects ) ) { // if post
-                                        $active = true;
+                                foreach ( $values as $id ) {
+                                        if ( is_scalar( $id ) && absint( $id ) ) {
+                                                $ids[] = absint( $id );
+                                        }
                                 }
                         }
-                        
-                        
-                        
-
-                        
-                        
-                        //pree($active);
-                        
-                        if (!$active && !empty( $tags ) ) {
-                                
-                                if ( isset( $_GET['taxonomy'] ) && in_array( $_GET['taxonomy'], $tags ) ) {
-                                        $active = true;
+                }
+                return array_slice( $ids, 0, 2000 );
+        }
+
+        public function update_menu_order() {
+                global $wpdb;
+
+                $this->ajax_gate();
+                $ids = $this->parse_order_ids();
+
+                foreach ( $ids as $id ) {
+                        if ( ! current_user_can( 'edit_post', $id ) ) {
+                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                        }
+                }
+
+                do_action( 'wpso_before_order_update', 'post', $ids );
+
+                $counter = 0;
+                foreach ( $ids as $id ) {
+                        ++$counter;
+                        $wpdb->update( $wpdb->posts, array( 'menu_order' => $counter ), array( 'ID' => $id ), array( '%d' ), array( '%d' ) );
+                        clean_post_cache( $id );
+                }
+
+                do_action( 'wpso_order_updated', 'post', $ids );
+                wp_die();
+        }
+
+        public function wpso_increment_order( $arr = array(), $order = 0 ) {
+                while ( in_array( $order, $arr, true ) ) {
+                        ++$order;
+                }
+                return $order;
+        }
+
+        public function update_menu_order_tags() {
+                global $wpdb;
+
+                $this->ajax_gate();
+                $ids = $this->parse_order_ids();
+
+                foreach ( $ids as $id ) {
+                        if ( ! current_user_can( 'edit_term', $id ) ) {
+                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                        }
+                }
+
+                do_action( 'wpso_before_order_update', 'term', $ids );
+
+                $menu_order_arr = array();
+                foreach ( $ids as $id ) {
+                        $row = $wpdb->get_row( $wpdb->prepare( "SELECT term_order FROM {$wpdb->terms} WHERE term_id = %d", $id ) );
+                        if ( is_object( $row ) ) {
+                                $menu_order_arr[] = $this->wpso_increment_order( $menu_order_arr, (int) $row->term_order );
+                        }
+                }
+                sort( $menu_order_arr );
+
+                foreach ( $ids as $position => $id ) {
+                        if ( array_key_exists( $position, $menu_order_arr ) ) {
+                                $wpdb->update( $wpdb->terms, array( 'term_order' => (int) $menu_order_arr[ $position ] ), array( 'term_id' => $id ), array( '%d' ), array( '%d' ) );
+                        }
+                }
+                clean_term_cache( $ids );
+
+                do_action( 'wpso_order_updated', 'term', $ids );
+                wp_die();
+        }
+
+        public function current_tax( $params ) {
+                $valid_tax = 0;
+                if ( ! empty( $params ) && is_array( $params ) ) {
+                        $tags = $this->get_wpso_options_tags();
+                        foreach ( $params as $tax => $term ) {
+                                if ( ! is_string( $tax ) || ! is_string( $term ) || ! in_array( $tax, $tags, true ) ) {
+                                        continue;
                                 }
-                                
-                                foreach($tags as $tag){
-                                        if(isset($_GET[$tag])){
-                                                $active = true;
+                                $obj = get_term_by( 'slug', sanitize_text_field( wp_unslash( $term ) ), $tax );
+                                if ( is_object( $obj ) && isset( $obj->term_id ) ) {
+                                        $valid_tax = (int) $obj->term_id;
+                                        break;
+                                }
+                        }
+                }
+                return $valid_tax;
+        }
+
+        public function update_menu_order_users() {
+                $this->ajax_gate();
+
+                $ids     = $this->parse_order_ids();
+                $referer = isset( $_POST['referer_string'] ) && is_string( $_POST['referer_string'] ) ? wp_unslash( $_POST['referer_string'] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- parsed, every value re-sanitized in current_tax().
+                $params  = array();
+                if ( strlen( $referer ) < 2000 ) {
+                        parse_str( $referer, $params );
+                }
+
+                $valid_tax = $this->current_tax( $params );
+                if ( ! $valid_tax ) {
+                        wp_die();
+                }
+
+                foreach ( $ids as $id ) {
+                        if ( ! current_user_can( 'edit_user', $id ) ) {
+                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                        }
+                }
+
+                do_action( 'wpso_before_order_update', 'user', $ids );
+
+                $user_order     = 'user_order_' . $valid_tax;
+                $menu_order_arr = array();
+                foreach ( $ids as $id ) {
+                        $menu_order_arr[] = get_user_meta( $id, $user_order, true );
+                }
+                sort( $menu_order_arr );
+
+                foreach ( $ids as $position => $id ) {
+                        $value = isset( $menu_order_arr[ $position ] ) && is_numeric( $menu_order_arr[ $position ] ) ? (int) $menu_order_arr[ $position ] : '';
+                        update_user_meta( $id, $user_order, $value );
+                }
+
+                do_action( 'wpso_order_updated', 'user', $ids );
+                wp_die();
+        }
+
+        public function update_menu_order_extras() {
+                $this->ajax_gate( true );
+
+                $ids = array();
+                $raw = isset( $_POST['order'] ) && is_string( $_POST['order'] ) ? wp_unslash( $_POST['order'] ) : ''; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- every value is filtered below.
+                if ( '' !== $raw && strlen( $raw ) < 50000 ) {
+                        parse_str( $raw, $data );
+                        if ( is_array( $data ) ) {
+                                foreach ( $data as $values ) {
+                                        if ( ! is_array( $values ) ) {
                                                 continue;
                                         }
-                                }
-                        
-                                        
-                                if ($wpso_pro && strstr( $_SERVER['REQUEST_URI'], 'wp-admin/users.php' ) && in_array( 'usercategories', $tags ) ) { // if post
-                                        $active = true;
-                                }                               
-                                
-                                
-                        }
-                        
-                        //pree($active);
-                        
-                        return $active;
-                }
-        
-                function load_script_css()
-                {
-                        //$all_plugins = get_plugins();
-                        
-                        $translation_array = array(
-                                'ajaxurl' => admin_url( 'admin-ajax.php' ),     
-                                'this_url' => admin_url('admin.php?page=wpso-settings'),
-                                'wpso_tab' => (isset($_GET['t'])?esc_attr($_GET['t']):'0'),
-                                'nonce'=> wp_create_nonce('wpso_nonce_ensured'),
-
-                        );
-                        
-                        
-                        if ( $this->_check_load_script_css() ) {
-                                wp_enqueue_script( 'jquery' );
-                                wp_enqueue_script( 'jquery-ui-sortable' );
-                                wp_enqueue_script( 'wpsojs', WPSO_URL.'/js/scripts.js', array( 'jquery' ), date('Ymdh'), true );                                
-                                wp_enqueue_style( 'wpso', WPSO_URL.'/css/styles.css', array(), date('Ymdh') );
-                        }
-                        
-                        if(is_admin() && isset($_GET['page']) && $_GET['page'] == 'wpso-settings'){
-
-                                wp_enqueue_style( 'wpso', WPSO_URL.'/css/admin.css', array(), date('Ymdh') );
-                                wp_enqueue_script( 'wpsojs', WPSO_URL.'/js/admin.js', array( 'jquery' ), date('Ymdh'), true );
-
-                                
-                                
-
-                        }               
-                        
-                        wp_localize_script('wpsojs', 'wpso_obj', $translation_array);   
-                }
-                
-                
-                                
-                function refresh()
-                {
-                        
-                        global $wpdb;
-                        $objects = $this->get_wpso_options_objects();
-                        $tags = $this->get_wpso_options_tags();
-                        
-                        //pree($objects);
-                        //pree($tags);
-                        
-                        if ( !empty( $objects ) ) {
-                                foreach( $objects as $object) {
-                                        /*$result = $wpdb->get_results( "
-                                                SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min 
-                                                FROM $wpdb->posts 
-                                                WHERE post_type = '".$object."' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
-                                        " );*/
-                                        $result = $wpdb->get_results( $wpdb->prepare(
-                                                "SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min 
-                                                FROM $wpdb->posts 
-                                                WHERE post_type = %s AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')",
-                                                $object
-                                        ) );
-                                        if ( $result[0]->cnt == 0 || $result[0]->cnt == $result[0]->max ) continue;
-                                        
-                                        $results = $wpdb->get_results( "
-                                                SELECT ID 
-                                                FROM $wpdb->posts 
-                                                WHERE post_type = '".$object."' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future') 
-                                                ORDER BY menu_order ASC
-                                        " );
-                                        foreach( $results as $key => $result ) {
-                                                $wpdb->update( $wpdb->posts, array( 'menu_order' => $key+1 ), array( 'ID' => $result->ID ) );
-                                        }
-                                }
-                        }
-        
-                        $terms = array();
-                        
-                        if ( !empty( $tags ) ) {
-                                foreach( $tags as $taxonomy ) {
-                                        /*$result = $wpdb->get_results( "
-                                                SELECT count(*) as cnt, max(term_order) as max, min(term_order) as min 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."'
-                                        " );*/
-                                        $result = $wpdb->get_results( $wpdb->prepare(
-                                                "SELECT count(*) as cnt, max(term_order) as max, min(term_order) as min 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = %s",
-                                                $taxonomy
-                                        ) );
-                                        //pree($taxonomy);
-                                        //pree($result);//exit;
-                                        $terms[] = $taxonomy;
-                                        $continue = ( $result[0]->cnt == 0 || $result[0]->cnt == $result[0]->max );
-                                        if ($continue) continue;
-                                        
-                                        $results = $wpdb->get_results( "
-                                                SELECT terms.term_id 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."' 
-                                                ORDER BY term_order ASC
-                                        " );
-                                        //pree($results);//exit;
-                                        foreach( $results as $key => $result ) {
-                                                $wpdb->update( $wpdb->terms, array( 'term_order' => $key+1 ), array( 'term_id' => $result->term_id ) );
-                                        }
-                                }
-                        }
-                        
-                        if ( !empty( $terms ) ) {
-                                //pree($terms);
-                                foreach( $terms as $term ) {
-                                        $args = array('taxonomy'=>$term,'hide_empty'=>false);
-                                        $term_items = get_terms($args);
-                                        //pree($term_items);
-                                        //continue;
-                                        if(!empty($term_items)){
-                                                foreach( $term_items as $item ) {
-                                                        if(!is_object($item)){continue;}                                                        
-                                                        $this->refine_terms_relations($item->term_id);
-                                                        $item_child = get_term_children( $item->term_id, $term );
-                                                        if(!empty($item_child)){
-                                                                foreach( $item_child as $child ) {
-                                                                        $this->refine_terms_relations($child);
-
-                                                                }
-                                                        }
-                                                        
-                                                        
+                                        foreach ( $values as $position => $id ) {
+                                                if ( is_scalar( $id ) ) {
+                                                        $ids[ absint( $position ) ] = preg_replace( '/[^A-Za-z0-9_\-\.]/', '', (string) $id );
                                                 }
                                         }
                                 }
                         }
-                        
-                        
-                        
-                }
-                
-
-                
-                function refine_terms_relations($item){
-                        global $wpdb;
-                                                        
-                                                        //pree($item);
-                                                        //pree('\n');
-                                                        
-                                                        //pree($item);
-                                                        //pree($item);
-                                                        //pree($taxonomy);
-                                                        //$objects = get_objects_in_term($item, $taxonomy);
-                                                        //pree($objects);
-                                                        
-                                                        /*$squery = "
-                                                                SELECT count(*) as cnt, max(um.meta_value) as max, min(um.meta_value) as min 
-                                                                FROM
-                                                                        $wpdb->term_relationships AS r,
-                                                                        $wpdb->users AS u,
-                                                                        $wpdb->usermeta AS um                                                           
-                                                                WHERE
-                                                                        r.term_taxonomy_id=$item
-                                                                        AND
-                                                                        u.ID=r.object_id
-                                                                        AND
-                                                                        (um.user_id=r.object_id
-                                                                        AND
-                                                                        um.meta_key=CONCAT('user_order_', r.term_taxonomy_id))
-                                                        ";*/
-                                                        
-                                                        $squery = $wpdb->prepare(
-                                                                "SELECT count(*) as cnt, max(um.meta_value) as max, min(um.meta_value) as min 
-                                                                FROM
-                                                                        $wpdb->term_relationships AS r,
-                                                                        $wpdb->users AS u,
-                                                                        $wpdb->usermeta AS um                                                           
-                                                                WHERE
-                                                                        r.term_taxonomy_id=%d
-                                                                        AND
-                                                                        u.ID=r.object_id
-                                                                        AND
-                                                                        (um.user_id=r.object_id
-                                                                        AND
-                                                                        um.meta_key=CONCAT('user_order_', r.term_taxonomy_id))",
-                                                                $item
-                                                        );
-                                                        $stats = $wpdb->get_results( $squery );
-                                                        //if($item==26)
-                                                        //pree($squery);
-                                                        
-                                                        $stats = $wpdb->get_results( $squery );
-                                                        
-                                                        //pree($stats);
-                                                        $cquery = "SELECT COUNT(*) FROM $wpdb->users u, $wpdb->term_relationships AS r WHERE r.term_taxonomy_id=$item AND u.ID=r.object_id";
-                                                        
-                                                        $user_count1 = $wpdb->get_var( $cquery );
-                                                        
-                                                        /*$cquery = "SELECT COUNT(*) FROM $wpdb->usermeta um WHERE um.meta_key=CONCAT('user_order_', $item)";                                                   
-
-                                                        $user_count2 = $wpdb->get_var( $cquery );*/
-                                                        
-                                                        $cquery = $wpdb->prepare(
-                                                                "SELECT COUNT(*) FROM $wpdb->usermeta um WHERE um.meta_key = %s",
-                                                                'user_order_' . $item
-                                                        );
-                                                        $user_count2 = $wpdb->get_var( $cquery );
-                                                        
-                                                        /*if($item==26){
-                                                                pree($user_count1);
-                                                                pree($user_count2);
-                                                                pree($cquery);
-                                                        }*/
-                                                        //pree($cquery);
-                                                        
-                                                        
-                                                        //pree($user_count.' > '.$stats[0]->cnt);
-                                                        //pree('<br />');
-                                                        if(($user_count1!=$user_count2)){ //|| $user_count1!=$stats[0]->cnt){
-                                                                /*$dquery = "
-                                                                        SELECT 
-                                                                                um.umeta_id,
-                                                                                um.user_id
-                                                                        FROM 
-                                                                                $wpdb->usermeta um
-                                                                        WHERE                                                                           
-                                                                                um.meta_key=CONCAT('user_order_', $item)
-                                                                                
-                                                                ";*/
-                                                                $dquery = $wpdb->prepare(
-                                                                        "SELECT um.umeta_id, um.user_id
-                                                                        FROM $wpdb->usermeta um
-                                                                        WHERE um.meta_key = %s",
-                                                                        'user_order_' . $item
-                                                                );
-                                                                $dres = $wpdb->get_results($dquery);
-                                                                //if($item==26)
-                                                                //pree($dquery);
-                                                                
-                                                                $dres = $wpdb->get_results($dquery);
-                                                                //pree($dres);
-                                                                if(!empty($dres)){
-                                                                        foreach($dres as $res){
-                                                                                if($res->user_id!=$res->object_id){
-                                                                                        $dfquery = "DELETE FROM $wpdb->usermeta WHERE umeta_id=$res->umeta_id";
-                                                                                        //pree($dfquery);
-                                                                                        $wpdb->query($dfquery);
-                                                                                }else{
-                                                                                        //pree($res->user_id.' - '.$item.' - '.$res->umeta_id);
-                                                                                }
-                                                                        }
-                                                                }
-                                                        }
-                                                        
-                                                        //$stats[0]->cnt == 0 || 
-                                                        $continu = ( $stats[0]->cnt == $stats[0]->max );
-                                                        if ($continu) return;
-                                                        
-                                                        
-                                                        
-                                                        $rquery = "
-                                                                
-                                                                SELECT 
-                                                                        um.user_id,
-                                                                        um.meta_value
-                                                                FROM
-                                                                        $wpdb->term_relationships AS r,
-                                                                        $wpdb->users AS u,
-                                                                        $wpdb->usermeta AS um                                                           
-                                                                WHERE
-                                                                        r.term_taxonomy_id=$item
-                                                                        AND
-                                                                        u.ID=r.object_id
-                                                                        AND
-                                                                        (um.user_id=r.object_id
-                                                                        AND
-                                                                        um.meta_key=CONCAT('user_order_', r.term_taxonomy_id))
-                                                                        
-                                                        ";
-                                                        //pree($rquery);
-                                                        $relations = $wpdb->get_results( $rquery );
-                                                        
-                                                        //pree($relations);
-                                                        
-                                                        if(!empty($relations)){
-                                                                foreach( $relations as $k => $res ) {
-                                                                        $user_order = 'user_order_'.$item;
-                                                                        //pree($k);
-                                                                        //pree($res);
-                                                                        //$wpdb->update( $wpdb->users, array( 'user_order' => $k+1 ), array( 'ID' => $res->object_id ) );
-                                                                        update_user_meta(intval($res->user_id), $user_order, $k+1);
-                                                                }
-                                                        }else{
-                                                                $rquery = "
-                                                                
-                                                                SELECT 
-                                                                        u.ID AS user_id
-                                                                FROM
-                                                                        $wpdb->term_relationships AS r,
-                                                                        $wpdb->users AS u                                                       
-                                                                WHERE
-                                                                        r.term_taxonomy_id=$item
-                                                                        AND
-                                                                        u.ID=r.object_id
-                                                                        
-                                                        ";
-                                                                //pree($rquery);
-                                                                $relations = $wpdb->get_results( $rquery );
-                                                                //pree($relations);
-                                                                
-                                                                if(!empty($relations)){
-                                                                        foreach( $relations as $k => $res ) {
-                                                                                $user_order = 'user_order_'.$item;
-                                                                                //pree($k);
-                                                                                //pree($res);
-                                                                                //$wpdb->update( $wpdb->users, array( 'user_order' => $k+1 ), array( 'ID' => $res->object_id ) );
-                                                                                update_user_meta(intval($res->user_id), $user_order, $k+1);
-                                                                        }
-                                                                }
-                                                        }
-                                                        
-                                                                        
-                }
-                
-                function update_menu_order()
-                {
-                        global $wpdb;
-                                
-                        if ( ! current_user_can( 'manage_options' ) ) {
-                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ) );
-                        }
-                        
-                        if (
-                ! isset( $_POST['wpso_nonce'] )
-                || ! wp_verify_nonce( sanitize_text_field( wp_unslash ($_POST['wpso_nonce'])), 'wpso_nonce_ensured' )
-            ) {
-
-                wp_die(esc_html__('Sorry! Your nonce did not verify.', 'wpso-sort-order'));
-
-            }else{
-
-                                parse_str( $_POST['order'], $data );
-                                
-                                if ( !is_array( $data ) ) return false;
-                                        
-                                // get objects per now page
-                                $id_arr = array();
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {
-                                                $id_arr[] = $id;
-                                        }
+                }
+
+                update_option( 'wpso_extras_order', $ids, false );
+                wp_die();
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Settings
+         * ------------------------------------------------------------------ */
+
+        private function settings_redirect( $tab ) {
+                wp_safe_redirect(
+                        add_query_arg(
+                                array(
+                                        'page' => 'wpso-settings',
+                                        'msg'  => 'update',
+                                        't'    => absint( $tab ),
+                                ),
+                                admin_url( 'admin.php' )
+                        )
+                );
+                exit;
+        }
+
+        public function update_options() {
+                if ( ! isset( $_POST['wpso_submit'] ) ) {
+                        return false;
+                }
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                }
+                check_admin_referer( 'nonce_wpso' );
+
+                global $wpso_allowed_pages, $premium_tags_list;
+
+                $objects = isset( $_POST['objects'] ) ? (array) wp_unslash( $_POST['objects'] ) : array(); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- whitelisted below.
+                $tags    = isset( $_POST['tags'] ) ? (array) wp_unslash( $_POST['tags'] ) : array(); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- whitelisted below.
+                $extras  = isset( $_POST['extras'] ) ? (array) wp_unslash( $_POST['extras'] ) : array(); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- whitelisted below.
+
+                $objects = array_values( array_filter( array_unique( array_map( 'sanitize_key', $objects ) ), 'post_type_exists' ) );
+                $tags    = array_values( array_filter( array_unique( array_map( 'sanitize_key', $tags ) ), 'taxonomy_exists' ) );
+                $extras  = array_values( array_intersect( array_map( 'sanitize_text_field', $extras ), array_keys( (array) $wpso_allowed_pages ) ) );
+
+                // Premium taxonomies are saved from the Premium tab - keep them.
+                foreach ( $this->get_wpso_options_tags() as $old_tag ) {
+                        if ( in_array( $old_tag, (array) $premium_tags_list, true ) && ! in_array( $old_tag, $tags, true ) ) {
+                                $tags[] = $old_tag;
+                        }
+                }
+
+                update_option(
+                        'wpso_options',
+                        array(
+                                'objects' => $objects ? $objects : '',
+                                'tags'    => $tags ? $tags : '',
+                                'extras'  => $extras ? $extras : '',
+                        )
+                );
+
+                $this->renumber_objects( $this->get_wpso_options_objects(), 'page' );
+                $this->renumber_taxonomies( $this->get_wpso_options_tags(), 'name' );
+
+                $tab = isset( $_POST['wpso_tn'] ) ? absint( $_POST['wpso_tn'] ) : 0;
+                $this->settings_redirect( $tab );
+        }
+
+        public function update_options_premium() {
+                global $premium_tags_list;
+
+                if ( ! isset( $_POST['wpso_premium_submit'] ) ) {
+                        return false;
+                }
+                if ( ! current_user_can( 'manage_options' ) ) {
+                        wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+                }
+                check_admin_referer( 'nonce_wpso' );
+
+                $tags_old       = $this->get_wpso_options_tags();
+                $input_options  = get_option( 'wpso_options', array() );
+                $input_options  = is_array( $input_options ) ? $input_options : array();
+                $tags_premium   = isset( $_POST['tags'] ) ? (array) wp_unslash( $_POST['tags'] ) : array(); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- whitelisted below.
+                $tags_premium   = array_values( array_intersect( array_map( 'sanitize_key', $tags_premium ), (array) $premium_tags_list ) );
+                $tags_premium   = array_filter( $tags_premium, 'taxonomy_exists' );
+
+                if ( ! empty( $tags_premium ) ) {
+                        $new_tags = array_unique( array_merge( $tags_old, $tags_premium ) );
+                } else {
+                        $new_tags = array_diff( $tags_old, (array) $premium_tags_list );
+                }
+
+                $input_options['tags'] = array_values( $new_tags );
+                update_option( 'wpso_options', $input_options );
+
+                $this->renumber_taxonomies( $this->get_wpso_options_tags(), 'name' );
+
+                $tab = isset( $_POST['wpso_tn'] ) ? absint( $_POST['wpso_tn'] ) : 0;
+                $this->settings_redirect( $tab );
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Front-end ordering
+         * ------------------------------------------------------------------ */
+
+        public function wpso_previous_post_where( $where ) {
+                global $post;
+                $objects = $this->get_wpso_options_objects();
+                if ( empty( $objects ) ) {
+                        return $where;
+                }
+                if ( is_object( $post ) && isset( $post->post_type ) && in_array( $post->post_type, $objects, true ) ) {
+                        $where = str_replace( "p.post_date < '" . $post->post_date . "'", 'p.menu_order > ' . (int) $post->menu_order, $where );
+                }
+                return $where;
+        }
+
+        public function wpso_previous_post_sort( $orderby ) {
+                global $post;
+                $objects = $this->get_wpso_options_objects();
+                if ( empty( $objects ) ) {
+                        return $orderby;
+                }
+                if ( is_object( $post ) && isset( $post->post_type ) && in_array( $post->post_type, $objects, true ) ) {
+                        $orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
+                }
+                return $orderby;
+        }
+
+        public function hocpo_next_post_where( $where ) {
+                global $post;
+                $objects = $this->get_wpso_options_objects();
+                if ( empty( $objects ) ) {
+                        return $where;
+                }
+                if ( is_object( $post ) && isset( $post->post_type ) && in_array( $post->post_type, $objects, true ) ) {
+                        $where = str_replace( "p.post_date > '" . $post->post_date . "'", 'p.menu_order < ' . (int) $post->menu_order, $where );
+                }
+                return $where;
+        }
+
+        public function wpso_next_post_sort( $orderby ) {
+                global $post;
+                $objects = $this->get_wpso_options_objects();
+                if ( empty( $objects ) ) {
+                        return $orderby;
+                }
+                if ( is_object( $post ) && isset( $post->post_type ) && in_array( $post->post_type, $objects, true ) ) {
+                        $orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
+                }
+                return $orderby;
+        }
+
+        public function wpso_pre_get_posts( $wp_query ) {
+                $objects = $this->get_wpso_options_objects();
+                if ( empty( $objects ) ) {
+                        return false;
+                }
+
+                if ( is_admin() ) {
+                        if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                                if ( is_string( $wp_query->query['post_type'] ) && in_array( $wp_query->query['post_type'], $objects, true ) ) {
+                                        $wp_query->set( 'orderby', 'menu_order' );
+                                        $wp_query->set( 'order', 'ASC' );
                                 }
-                                
-                                // get menu_order of objects per now page
-                                $menu_order_arr = array();
-                                foreach( $id_arr as $key => $id ) {
-                                        $results = $wpdb->get_results( "SELECT menu_order FROM $wpdb->posts WHERE ID = ".intval( $id ) );
-                                        foreach( $results as $result ) {
-                                                $menu_order_arr[] = $result->menu_order;
-                                        }
-                                }
-                                
-                                // maintains key association = no
-                                sort( $menu_order_arr );
-                                $counter = 0;
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {
-                                                $counter++;
-                                                $wpdb->update( $wpdb->posts, array( 'menu_order' => $counter ), array( 'ID' => intval( $id ) ) );//$menu_order_arr[$position]
-                                        }
-                                }
-                                
-                        }
-                        
-                        wp_die();
-                }
-                
-                function wpso_increment_order($arr=array(), $order=0){
-                        
-                        if(in_array($order, $arr)){
-                                $order++;
-                                $order = $this->wpso_increment_order($arr, $order);
-                        }
-                        
-                        return $order;
-                }
-                
-                function update_menu_order_tags()
-                {
-                        global $wpdb;
-                        
-                        if ( ! current_user_can( 'manage_options' ) ) {
-                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ) );
-                        }
-                        
-                        if (
-                ! isset( $_POST['wpso_nonce'] )
-                || ! wp_verify_nonce( sanitize_text_field( wp_unslash ($_POST['wpso_nonce'])), 'wpso_nonce_ensured' )
-            ) {
-
-                wp_die(esc_html__('Sorry! Your nonce did not verify.', 'wpso-sort-order'));
-
-            }else{
-                                
-                                
-                        
-                                parse_str( $_POST['order'], $data );
-                                
-                                if ( !is_array( $data ) ) return false;
-                                
-                                $id_arr = array();
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {
-                                                $id_arr[] = $id;
-                                        }
-                                }
-                                
-        
-                                $menu_order_arr = array();
-                                foreach( $id_arr as $key => $id ) {
-                                        $row = $wpdb->get_row( "SELECT term_order FROM $wpdb->terms WHERE term_id = ".intval( $id ) );
-                                        
-                                        if(is_object($row) && !empty($row)){
-                                                $menu_order_arr[] = $this->wpso_increment_order($menu_order_arr, $row->term_order);
-                                        }
-                                }
-                                sort( $menu_order_arr );
-        
-                                
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {                                        
-                                                if(array_key_exists($position, $menu_order_arr)){
-                                                        $term_order = $menu_order_arr[$position];                                               
-                                                        $wpdb->update( $wpdb->terms, array( 'term_order' => $term_order ), array( 'term_id' => intval( $id ) ) );
-        
-                                                }
-                                        }
-                                }
-                        
-                        }
-                        
-                        wp_die();
-                }
-                
-                function current_tax($params){
-    
-                        $valid_tax = 0;
-                        if(!empty($params)){
-                                $tags = $this->get_wpso_options_tags();
-                                foreach($params as $tax=>$term){
-                                        if(in_array($tax, $tags)){
-                                                $obj = get_term_by( 'slug', $term, $tax );
-                                                if ( is_object( $obj ) && isset( $obj->term_id ) ) {
-                                                        $valid_tax = $obj->term_id;
-                                                        break;
-                                                }
-                                        }
-                                }
-                        }    
-                        return $valid_tax;
-                }
-        
-                function update_menu_order_users()
-                {
-                        global $wpdb;
-                        
-                        if ( ! current_user_can( 'manage_options' ) ) {
-                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ) );
-                        }
-                        
-                        if (
-                ! isset( $_POST['wpso_nonce'] )
-                || ! wp_verify_nonce( sanitize_text_field( wp_unslash ($_POST['wpso_nonce'])), 'wpso_nonce_ensured' )
-            ) {
-
-                wp_die(esc_html__('Sorry! Your nonce did not verify.', 'wpso-sort-order'));
-
-            }else{
-                        
-                                parse_str( $_POST['order'], $data );
-                                parse_str( $_POST['referer_string'], $params);
-                                //pree($data);
-                                //pree($params);
-                                $valid_tax = $this->current_tax($params);
-                                //pree($valid_tax);
-                                
-                                if ( !is_array( $data ) ) return false;
-                                
-                                $id_arr = array();
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {
-                                                $id_arr[] = $id;
-                                        }
-                                }
-                                //pree($id_arr);
-                                $user_order = 'user_order_'.$valid_tax;
-                                //pree($user_order);
-                                $menu_order_arr = array();
-                                foreach( $id_arr as $key => $id ) {
-                                        //$results = $wpdb->get_results( "SELECT user_order FROM $wpdb->users WHERE ID = ".intval( $id ) );
-                                        //foreach( $results as $result ) {
-                                                $menu_order_arr[] = get_user_meta( $id, $user_order, true ); //$result->user_order;
-                                        //}
-                                }
-                                sort( $menu_order_arr );
-                                
-                                //pree($data);
-                                //pree($menu_order_arr);
-                                
-                                foreach( $data as $key => $values ) {
-                                        foreach( $values as $position => $id ) {
-                                                //pree($position.' - '.$id.' - '.$menu_order_arr[$position]);
-                                                //pree($menu_order_arr[$position]);
-                                                //$wpdb->update( $wpdb->users, array( 'user_order' => $menu_order_arr[$position] ), array( 'ID' => intval( $id ) ) );
-                                                //pree(intval($id).' - '.$user_order.' - '.$menu_order_arr[$position]);
-                                                //pree(($menu_order_arr[$position]));
-                                                update_user_meta(intval($id), $user_order, sanitize_wpso_data($menu_order_arr[$position]));
-                                        }
-                                }
-                                
-                        }
-                        wp_die();
-                        
-                }       
-                
-                function update_menu_order_extras()
-                {
-                        global $wpdb;
-                        
-                        if ( ! current_user_can( 'manage_options' ) ) {
-                                wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ) );
-                        }
-                        
-                        if (
-                ! isset( $_POST['wpso_nonce'] )
-                || ! wp_verify_nonce( sanitize_text_field( wp_unslash ($_POST['wpso_nonce'])), 'wpso_nonce_ensured' )
-            ) {
-
-                wp_die(esc_html__('Sorry! Your nonce did not verify.', 'wpso-sort-order'));
-
-            }else{
-                        
-                                parse_str( $_POST['order'], $data );
-                                
-                                if ( !is_array( $data ) ) return false;
-                                
-                                $id_arr = array();
-                                foreach( $data as $key => $values ) {
-                                        
-                                        foreach( $values as $position => $id ) {
-                                                $id_arr[$position] = $id;
-                                        }
-                                        
-                                }
-        
-                                update_option('wpso_extras_order', sanitize_wpso_data($id_arr));
-                                
-                        }
-                        
-                        wp_die();
-                        
-                }                       
-                function update_options()
-                {
-                        global $wpdb;
-                        
-                        if ( !isset( $_POST['wpso_submit'] ) ) return false;
-                                
-                        check_admin_referer( 'nonce_wpso' );
-                                
-            $input_options = array();
-                        $input_options['objects'] = isset( $_POST['objects'] ) ? sanitize_wpso_data($_POST['objects']) : '';
-                        $input_options['tags'] = isset( $_POST['tags'] ) ? sanitize_wpso_data($_POST['tags']) : '';
-                        $input_options['extras'] = isset( $_POST['extras'] ) ? sanitize_wpso_data($_POST['extras']) : '';
-                                                
-                        
-                        update_option( 'wpso_options', sanitize_wpso_data($input_options) );
-                        
-                        $objects = $this->get_wpso_options_objects();
-                        $tags = $this->get_wpso_options_tags();
-                        
-                        if ( !empty( $objects ) ) {
-                                foreach( $objects as $object ) {
-                                        $result = $wpdb->get_results( "
-                                                SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min 
-                                                FROM $wpdb->posts 
-                                                WHERE post_type = '".$object."' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
-                                        " );
-                                        if ( $result[0]->cnt == 0 || $result[0]->cnt == $result[0]->max ) continue;
-                                        
-                                        if ( $object == 'page' ) {
-                                                $results = $wpdb->get_results( "
-                                                        SELECT ID 
-                                                        FROM $wpdb->posts 
-                                                        WHERE post_type = '".$object."' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future') 
-                                                        ORDER BY menu_order, post_title ASC
-                                                " );
-                                        } else {
-                                                $results = $wpdb->get_results( "
-                                                        SELECT ID 
-                                                        FROM $wpdb->posts 
-                                                        WHERE post_type = '".$object."' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future') 
-                                                        ORDER BY post_date DESC
-                                                " );
-                                        }
-                                        foreach( $results as $key => $result ) {
-                                                $wpdb->update( $wpdb->posts, array( 'menu_order' => $key+1 ), array( 'ID' => $result->ID ) );
-                                        }
-                                }
-                        }
-                        
-                        if ( !empty( $tags ) ) {
-                                foreach( $tags as $taxonomy ) {
-                                        $result = $wpdb->get_results( "
-                                                SELECT count(*) as cnt, max(term_order) as max, min(term_order) as min 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."'
-                                        " );
-                                        if ( $result[0]->cnt == 0 || $result[0]->cnt == $result[0]->max ) continue;
-                                        
-                                        $results = $wpdb->get_results( "
-                                                SELECT terms.term_id 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."' 
-                                                ORDER BY name ASC
-                                        " );
-                                        foreach( $results as $key => $result ) {
-                                                $wpdb->update( $wpdb->terms, array( 'term_order' => $key+1 ), array( 'term_id' => $result->term_id ) );
-                                        }
-                                }
-                        }
-                        
-            $tab = isset($_POST['wpso_tn']) ? sanitize_wpso_data($_POST['wpso_tn']) : 0;
-            wp_redirect( 'admin.php?page=wpso-settings&msg=update&t='.$tab );
-                        
-                }
-
-       function update_options_premium(){
-            global $wpdb, $premium_tags_list;
-
-            if ( !isset( $_POST['wpso_premium_submit'] ) ) return false;
-                        
-                        check_admin_referer( 'nonce_wpso' );
-                        
-            $tags_old = $this->get_wpso_options_tags();
-            $input_options = get_option('wpso_options', array());
-            $tags_premium = isset( $_POST['tags'] ) ? sanitize_wpso_data($_POST['tags']) : array();
-
-
-            if(!empty($tags_premium)){
-
-                $new_tags = array_merge($tags_old, $tags_premium);
-                $new_tags = array_unique($new_tags);
-
-            }else{
-
-                $new_tags = array_diff($tags_old, $premium_tags_list);
-
-
-            }
-
-
-
-            
-
-            $input_options['tags'] = $new_tags;
-
-
-            update_option( 'wpso_options', sanitize_wpso_data($input_options) );
-
-            $tags = $this->get_wpso_options_tags();
-
-            if ( !empty( $tags ) ) {
-                foreach( $tags as $taxonomy ) {
-                    $result = $wpdb->get_results( "
-                                                SELECT count(*) as cnt, max(term_order) as max, min(term_order) as min 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."'
-                                        " );
-                    if ( $result[0]->cnt == 0 || $result[0]->cnt == $result[0]->max ) continue;
-
-                    $results = $wpdb->get_results( "
-                                                SELECT terms.term_id 
-                                                FROM $wpdb->terms AS terms 
-                                                INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id ) 
-                                                WHERE term_taxonomy.taxonomy = '".$taxonomy."' 
-                                                ORDER BY name ASC
-                                        " );
-                    foreach( $results as $key => $result ) {
-                        $wpdb->update( $wpdb->terms, array( 'term_order' => $key+1 ), array( 'term_id' => $result->term_id ) );
-                    }
-                }
-            }
-
-            $tab = isset($_POST['wpso_tn']) ? sanitize_wpso_data($_POST['wpso_tn']) : 0;
-            wp_redirect( 'admin.php?page=wpso-settings&msg=update&t='.$tab );
-        }
-                                
-                function wpso_previous_post_where( $where )
-                {
-                        global $post;
-        
-                        $objects = $this->get_wpso_options_objects();
-                        if ( empty( $objects ) ) return $where;
-                        
-                        if ( is_object($post) && isset( $post->post_type ) && in_array( $post->post_type, $objects ) ) {
-                                $current_menu_order = $post->menu_order;
-                                $where = str_replace( "p.post_date < '".$post->post_date."'", "p.menu_order > '".$current_menu_order."'", $where );
-                        }
-                        return $where;
-                }
-                
-                function wpso_previous_post_sort( $orderby )
-                {
-                        global $post;
-                        
-                        $objects = $this->get_wpso_options_objects();
-                        if ( empty( $objects ) ) return $orderby;
-                        
-                        if ( is_object($post) && isset( $post->post_type ) && in_array( $post->post_type, $objects ) ) {
-                                $orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
-                        }
+                        }
+                        return;
+                }
+
+                /**
+                 * For Front End
+                 */
+                $home_url    = basename( home_url() );
+                $request_uri = basename( wpso_request_uri() );
+
+                if ( $home_url === $request_uri ) {
+                        return;
+                }
+
+                $active = false;
+                if ( isset( $wp_query->query['post_type'] ) ) {
+                        if ( is_string( $wp_query->query['post_type'] ) && in_array( $wp_query->query['post_type'], $objects, true ) ) {
+                                $active = true;
+                        }
+                } elseif ( in_array( 'post', $objects, true ) ) {
+                        $active = true;
+                }
+
+                if ( ! $active ) {
+                        return false;
+                }
+
+                if ( isset( $wp_query->query['suppress_filters'] ) ) {
+                        if ( 'date' === $wp_query->get( 'orderby' ) ) {
+                                $wp_query->set( 'orderby', 'menu_order' );
+                        }
+                        if ( 'DESC' === $wp_query->get( 'order' ) ) {
+                                $wp_query->set( 'order', 'ASC' );
+                        }
+                } else {
+                        if ( ! $wp_query->get( 'orderby' ) ) {
+                                $wp_query->set( 'orderby', 'menu_order' );
+                        }
+                        if ( ! $wp_query->get( 'order' ) ) {
+                                $wp_query->set( 'order', 'ASC' );
+                        }
+                }
+        }
+
+        public function wpso_get_terms_orderby( $orderby, $args ) {
+                if ( is_admin() ) {
                         return $orderby;
                 }
-                
-                function hocpo_next_post_where( $where )
-                {
-                        global $post;
-        
-                        $objects = $this->get_wpso_options_objects();
-                        if ( empty( $objects ) ) return $where;
-                        
-                        if ( is_object($post) && isset( $post->post_type ) && in_array( $post->post_type, $objects ) ) {
-                                $current_menu_order = $post->menu_order;
-                                $where = str_replace( "p.post_date > '".$post->post_date."'", "p.menu_order < '".$current_menu_order."'", $where );
-                        }
-                        return $where;
-                }
-                
-                function wpso_next_post_sort( $orderby )
-                {
-                        global $post;
-                        
-                        $objects = $this->get_wpso_options_objects();
-                        if ( empty( $objects ) ) return $orderby;
-                        
-                        if ( is_object($post) && isset( $post->post_type ) && in_array( $post->post_type, $objects ) ) {
-                                $orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
-                        }
+                $tags = $this->get_wpso_options_tags();
+                if ( ! isset( $args['taxonomy'] ) || ! is_string( $args['taxonomy'] ) ) {
                         return $orderby;
                 }
-                
-                function wpso_pre_get_posts( $wp_query )
-                {
-                        
-                        
-                        $objects = $this->get_wpso_options_objects();
-                        if ( empty( $objects ) ) return false;
-                        
-
-                        if ( is_admin() ) {
-                                
-                                
-                                if ( isset( $wp_query->query['post_type'] ) && !isset( $_GET['orderby'] ) ) {
-                                        if ( in_array( $wp_query->query['post_type'], $objects ) ) {
-                                                $wp_query->set( 'orderby', 'menu_order' );
-                                                $wp_query->set( 'order', 'ASC' );
-                                        }
-                                }
-                        
-                        /**
-                        * for Front End
-                        */
-                        
-                        } else{ //if(!is_home() && !is_front_page() && !is_feed()) {
-                                
-                                $home_url = (basename(home_url()));
-                                $request_uri = (basename($_SERVER['REQUEST_URI']));
-                                //pree($home_url.' != '.$request_uri);
-                                if($home_url!=$request_uri){
-                                
-                                        
-                                        $debug_backtrace = debug_backtrace();
-                                                
-                                        /*$function = is_feed().' * '.$debug_backtrace[0]['function'];
-                                        $function .= ' / '.$debug_backtrace[1]['function'];
-                                        $function .= ' / '.$debug_backtrace[2]['function'];
-                                        $function .= ' / '.$debug_backtrace[3]['function'];
-                                        $function .= ' / '.$debug_backtrace[4]['function'];
-                                        $function .= ' / '.$debug_backtrace[5]['function'];
-                                        $function .= ' / '.$debug_backtrace[6]['function'].'<br /><br />';
-                                                                        
-                                        $f = fopen('/alpha.html', 'a+');
-                                        fwrite($f, $function);
-                                        foreach($_SERVER as $k=>$v){
-                                                fwrite($f, $k.' = '.$v.'<br />');
-                                        }
-                                        fclose($f);*/
-                                        
-                                        
-                                        $active = false;
-                                        
-                                        // page or custom post types
-                                        if ( isset( $wp_query->query['post_type'] ) ) {
-                                                // exclude array()
-                                                if ( !is_array( $wp_query->query['post_type'] ) ) {
-                                                        if ( in_array( $wp_query->query['post_type'], $objects ) ) {
-                                                                $active = true;
-                                                        }
-                                                }
-                                        // post
-                                        } else {
-                                                if ( in_array( 'post', $objects ) ) {
-                                                        $active = true;
-                                                }
-                                        }
-                                        
-                                        if ( !$active ) return false;
-                                        
-                                        // get_posts()
-                                        if ( isset( $wp_query->query['suppress_filters'] ) ) {
-                                                if ( $wp_query->get( 'orderby' ) == 'date' )  $wp_query->set( 'orderby', 'menu_order' );
-                                                if ( $wp_query->get( 'order' ) == 'DESC' ) $wp_query->set( 'order', 'ASC' );
-                                        // WP_Query( contain main_query )
-                                        } else {
-                                                if ( !$wp_query->get( 'orderby' ) )  $wp_query->set( 'orderby', 'menu_order' );
-                                                if ( !$wp_query->get( 'order' ) ) $wp_query->set( 'order', 'ASC' );
-                                        }
-                                        
-                                }
-                        }
-                }
-                
-                function wpso_get_terms_orderby( $orderby, $args )
-                {
-                        if ( is_admin() ) return $orderby;
-                        
-                        $tags = $this->get_wpso_options_tags();
-                        
-                        if( !isset( $args['taxonomy'] ) ) return $orderby;
-                        
-                        $taxonomy = $args['taxonomy'];
-                        if ( !in_array( $taxonomy, $tags ) ) return $orderby;
-                        
-                        $orderby = 't.term_order';
+                if ( ! in_array( $args['taxonomy'], $tags, true ) ) {
                         return $orderby;
                 }
-                
-        
-                function wpso_get_object_terms( $terms )
-                {
-                        $tags = $this->get_wpso_options_tags();
-                        
-                        if ( is_admin() && isset( $_GET['orderby'] ) ) return $terms;
-                        
-                        foreach( $terms as $key => $term ) {
-                                if ( is_object( $term ) && isset( $term->taxonomy ) ) {
-                                        $taxonomy = $term->taxonomy;
-                                        if ( !in_array( $taxonomy, $tags ) ) return $terms;
-                                } else {
-                                        return $terms;
-                                }
-                        }
-                        
-                        usort( $terms, array( $this, 'taxcmp' ) );
+                return 't.term_order';
+        }
+
+        public function wpso_get_object_terms( $terms ) {
+                if ( ! is_array( $terms ) ) {
                         return $terms;
                 }
-                
-                function taxcmp( $a, $b )
-                {
-                        if ( $a->term_order ==  $b->term_order ) return 0;
-                        return ( $a->term_order < $b->term_order ) ? -1 : 1;
-                }
-                
-                
-                function get_wpso_options_objects()
-                {
-                        $wpso_options = get_option( 'wpso_options' ) ? get_option( 'wpso_options' ) : array();
-                        //pree($wpso_options);
-                        $objects = isset( $wpso_options['objects'] ) && is_array( $wpso_options['objects'] ) ? $wpso_options['objects'] : array();
-                        //pree($objects);
-                        return $objects;
-                }
-                function get_wpso_options_tags()
-                {
-                        $wpso_options = get_option( 'wpso_options' ) ? get_option( 'wpso_options' ) : array();
-                        $tags = isset( $wpso_options['tags'] ) && is_array( $wpso_options['tags'] ) ? $wpso_options['tags'] : array();
-                        return $tags;
-                }
-                function get_wpso_options_extras()
-                {
-                        $wpso_options = get_option( 'wpso_options' ) ? get_option( 'wpso_options' ) : array();
-                        $extras = isset( $wpso_options['extras'] ) && is_array( $wpso_options['extras'] ) ? $wpso_options['extras'] : array();
-                        return $extras;
-                }               
-                
-        }
-        
-        add_action('save_post', 'wpso_updating_new_post_menu_order', 10, 3);
-        
-        function wpso_updating_new_post_menu_order( $post_id, $post, $update ) {        
-                
-                
-                
-                if ( wp_is_post_revision( $post_id ) || $update)
+                $tags = $this->get_wpso_options_tags();
+                if ( is_admin() && isset( $_GET['orderby'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                        return $terms;
+                }
+                foreach ( $terms as $term ) {
+                        if ( ! is_object( $term ) || ! isset( $term->taxonomy ) || ! in_array( $term->taxonomy, $tags, true ) ) {
+                                return $terms;
+                        }
+                }
+                usort( $terms, array( $this, 'taxcmp' ) );
+                return $terms;
+        }
+
+        public function taxcmp( $a, $b ) {
+                $a_order = isset( $a->term_order ) ? (int) $a->term_order : 0;
+                $b_order = isset( $b->term_order ) ? (int) $b->term_order : 0;
+                if ( $a_order === $b_order ) {
+                        return 0;
+                }
+                return ( $a_order < $b_order ) ? -1 : 1;
+        }
+
+        /* ------------------------------------------------------------------ *
+         * Options
+         * ------------------------------------------------------------------ */
+
+        private function get_option_list( $key ) {
+                $wpso_options = get_option( 'wpso_options' );
+                $wpso_options = is_array( $wpso_options ) ? $wpso_options : array();
+                return ( isset( $wpso_options[ $key ] ) && is_array( $wpso_options[ $key ] ) ) ? array_values( array_filter( $wpso_options[ $key ], 'is_string' ) ) : array();
+        }
+
+        public function get_wpso_options_objects() {
+                return $this->get_option_list( 'objects' );
+        }
+
+        public function get_wpso_options_tags() {
+                return $this->get_option_list( 'tags' );
+        }
+
+        public function get_wpso_options_extras() {
+                return $this->get_option_list( 'extras' );
+        }
+}
+
+global $wpso;
+$wpso = new Wpso();
+
+/**
+ * Newly created posts go to the top.
+ */
+function wpso_updating_new_post_menu_order( $post_id, $post, $update ) {
+        global $wpdb;
+
+        if ( wp_is_post_revision( $post_id ) || $update ) {
                 return;
-                
-                if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
-        return;
-
-                // Prevent quick edit from clearing custom fields
-                if (defined('DOING_AJAX') && DOING_AJAX)
+        }
+        if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
                 return;
-                
-                if ( ! current_user_can( 'edit_post', $post_id ) ) {
-                        return;
-                }
-                
-                $wpso_options = get_option( 'wpso_options' );
-                $wpso_objects = isset( $wpso_options['objects'] ) ? $wpso_options['objects'] : array();
-                $wpso_objects = is_array($wpso_objects)?$wpso_objects:array();
-                
-                global $wpdb;
-                
-                if(is_object($post) && !$post->menu_order && in_array( $post->post_type, $wpso_objects )){
-                        
-                        /*$sql = 'SELECT MAX(menu_order) FROM '.$wpdb->posts.'
-                                        WHERE post_type = "'.$post->post_type.'" ';
-                        //$max = $wpdb->get_var($sql);
-                        
-                        $sql = 'SELECT MIN(menu_order) FROM '.$wpdb->posts.'
-                                        WHERE post_type = "'.$post->post_type.'" ';             
-                        $min = (int)$wpdb->get_var($sql); //30/10/2024*/
-                        
-                        $sql = $wpdb->prepare(
-                                'SELECT MIN(menu_order) FROM '.$wpdb->posts.'
-                                WHERE post_type = %s',
-                                $post->post_type
-                        );
-                        $min = (int)$wpdb->get_var($sql);
-                        
-                        /*if($max>0){
-                                wp_update_post(array(
-                                        'ID'=>$post->ID,
-                                        'menu_order'=>$max+1
-                                ));
-                                
-                        }*/
-                        
-                        
-                        wp_update_post(array(
-                                'ID'=>$post->ID,
-                                'menu_order'=>$min-1
-                        )); //30/10/2024
-                        
-                }
-        
-        }
-         
-        add_action('admin_footer', 'wpso_admin_scripts', 100);
-        function wpso_admin_scripts(){
-                global $wpso_allowed_pages;
-                $wpso = new Wpso();
-
-                $wpso_extras_order = array();
-?>
-        <script type="text/javascript" language="javascript">
+        }
+        if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+                return;
+        }
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+                return;
+        }
+
+        $wpso_options = get_option( 'wpso_options' );
+        $wpso_objects = ( is_array( $wpso_options ) && isset( $wpso_options['objects'] ) && is_array( $wpso_options['objects'] ) ) ? $wpso_options['objects'] : array();
+
+        if ( is_object( $post ) && ! $post->menu_order && in_array( $post->post_type, $wpso_objects, true ) ) {
+                $min = (int) $wpdb->get_var(
+                        $wpdb->prepare( "SELECT MIN(menu_order) FROM {$wpdb->posts} WHERE post_type = %s", $post->post_type )
+                );
+                wp_update_post(
+                        array(
+                                'ID'         => $post->ID,
+                                'menu_order' => $min - 1,
+                        )
+                );
+        }
+}
+add_action( 'save_post', 'wpso_updating_new_post_menu_order', 10, 3 );
+
+/**
+ * Apply the saved plugin order on the Plugins screen.
+ */
+function wpso_admin_scripts() {
+        global $wpso;
+
+        if ( ! is_object( $wpso ) || ! current_user_can( 'manage_options' ) || ! $wpso->_check_load_script_css() ) {
+                return;
+        }
+
+        $order = get_option( 'wpso_extras_order' );
+        if ( empty( $order ) || ! is_array( $order ) ) {
+                return;
+        }
+
+        $map = array();
+        foreach ( $order as $position => $key ) {
+                $map[ 'plugin_' . preg_replace( '/[^A-Za-z0-9_\-\.]/', '', (string) $key ) ] = (int) $position;
+        }
+        ?>
+        <script type="text/javascript">
         jQuery(document).ready(function($){
-                <?php 
-                if($wpso->_check_load_script_css()){
-                        $wpso_extras_order = get_option('wpso_extras_order');
-                        if(!empty($wpso_extras_order)){
-?>
-                                setTimeout(function(){
-<?php                           
-                                foreach($wpso_extras_order as $order=>$key){
-?>
-                                $('#plugin_<?php echo $key; ?>').attr('data-order', '<?php echo $order; ?>');
-<?php                                   
-                                }
-                                
-                                
-?>
-                
-                                        var list = $('table.plugins:visible #the-list');
-                                        
-                                        
-                                        
-                                        var listItems = list.find('tr').sort(function (a, b) {
-                                                                                
-                                                var contentA =parseInt( $(a).attr('data-order'));
-                                                var contentB =parseInt( $(b).attr('data-order'));
-                                                return (contentA < contentB) ? -1 : (contentA > contentB) ? 1 : 0;      
-                                                                                        
-                                        });
-                                        list.find('tr').remove();
-                                        list.append(listItems);
-                                        return false;
-                                
-                                }, 200);
-<?php                           
-                        }
-                }
-                ?>
+                setTimeout(function(){
+                        var wpsoMap = <?php echo wp_json_encode( $map ); ?>;
+                        $.each(wpsoMap, function(id, order){
+                                var el = document.getElementById(id);
+                                if (el) { $(el).attr('data-order', order); }
+                        });
+                        var list = $('table.plugins:visible #the-list');
+                        var listItems = list.find('tr').sort(function (a, b) {
+                                var contentA = parseInt($(a).attr('data-order'));
+                                var contentB = parseInt($(b).attr('data-order'));
+                                return (contentA < contentB) ? -1 : (contentA > contentB) ? 1 : 0;
+                        });
+                        list.find('tr').remove();
+                        list.append(listItems);
+                        return false;
+                }, 200);
         });
         </script>
-<?php           
-        }       
+        <?php
+}
+add_action( 'admin_footer', 'wpso_admin_scripts', 100 );

wp-sort-order/trunk/inc/settings.php

@@ -1 +1 @@
 <?php if ( ! defined( 'ABSPATH' ) ) exit; 
+if ( ! current_user_can( 'manage_options' ) ) {
+        wp_die( esc_html__( 'Unauthorized.', 'wpso-sort-order' ), '', array( 'response' => 403 ) );
+}
 global $wpdb, $wpso_data, $wpso_pro, $wpso_premium_link, $premium_click, $wpso_allowed_pages, $premium_tags_list;
+$wpso_pro      = wpso_is_pro();
+$premium_click = $wpso_pro ? '' : '<small class="premium">(' . esc_html__( 'Premium Feature', 'wpso-sort-order' ) . ')</small>';
 
 $wpso_options = get_option( 'wpso_options' );
-$wpso_objects = isset( $wpso_options['objects'] ) ? $wpso_options['objects'] : array();
-$wpso_tags = isset( $wpso_options['tags'] ) ? $wpso_options['tags'] : array();
-$wpso_extras = isset( $wpso_options['extras'] ) ? $wpso_options['extras'] : array();
+$wpso_options = is_array( $wpso_options ) ? $wpso_options : array();
+$wpso_objects = ( isset( $wpso_options['objects'] ) && is_array( $wpso_options['objects'] ) ) ? $wpso_options['objects'] : array();
+$wpso_tags = ( isset( $wpso_options['tags'] ) && is_array( $wpso_options['tags'] ) ) ? $wpso_options['tags'] : array();
+$wpso_extras = ( isset( $wpso_options['extras'] ) && is_array( $wpso_options['extras'] ) ) ? $wpso_options['extras'] : array();
 $term_order_exists = $wpdb->query( "DESCRIBE $wpdb->terms `term_order`" );
 ?>
@@ -13 +19 @@
 <?php //screen_icon( 'plugins' ); ?>
 
-<h2><?php echo esc_html($wpso_data['Name']).' ('.esc_html($wpso_data['Version']).($wpso_pro?') '.__('Pro', 'wpso-sort-order').'':')'); ?> - <?php echo __('Settings','wpso-sort-order'); ?> <?php echo ($wpso_pro?'':'<a href="'.esc_url($wpso_premium_link).'" target="_blank" class="premium">'.__('Go Premium', 'wpso-sort-order').'</a>'); ?></h2>
+<h2><?php echo esc_html( $wpso_data['Name'] ) . ' (' . esc_html( $wpso_data['Version'] ) . ( $wpso_pro ? ') ' . esc_html__( 'Pro', 'wpso-sort-order' ) : ')' ); ?> - <?php echo esc_html__( 'Settings', 'wpso-sort-order' ); ?> <?php if ( ! $wpso_pro ) : ?><a href="<?php echo esc_url( $wpso_premium_link ); ?>" target="_blank" rel="noopener noreferrer" class="premium"><?php echo esc_html__( 'Go Premium', 'wpso-sort-order' ); ?></a><?php endif; ?></h2>
 
     <h2 class="nav-tab-wrapper">
 
-        <a class="nav-tab nav-tab-active"><?php _e("General", 'wpso-sort-order'); ?> <i class="far fa-check-square"></i></a>
-        <a class="nav-tab"><?php _e("Premium", 'wpso-sort-order'); ?> <i class="far fa-star"></i></a>
-        <a class="nav-tab" data-tab="help" data-type="free" style="float:right"><i class="far fa-question-circle"></i>&nbsp;<?php _e("Help", 'wp-sort-order'); ?></a>
+        <a class="nav-tab nav-tab-active"><?php echo esc_html__( 'General', 'wpso-sort-order' ); ?> <i class="far fa-check-square"></i></a>
+        <a class="nav-tab"><?php echo esc_html__( 'Premium', 'wpso-sort-order' ); ?> <i class="far fa-star"></i></a>
+        <a class="nav-tab" data-tab="help" data-type="free" style="float:right"><i class="far fa-question-circle"></i>&nbsp;<?php echo esc_html__( 'Help', 'wpso-sort-order' ); ?></a>
 
     </h2>
     
-<?php if ( isset($_GET['msg'] )) : ?>
+<?php if ( 'update' === wpso_get( 'msg' ) ) : ?>
 <div id="message" class="updated below-h2">
-        <?php if ( $_GET['msg'] == 'update' ) : ?>
-                <p><?php _e( 'Settings saved.', 'wpso-sort-order'); ?></p>
-        <?php endif; ?>
+                <p><?php echo esc_html__( 'Settings saved.', 'wpso-sort-order' ); ?></p>
 </div>
 <?php endif; ?>
@@ -40 +44 @@
 </div>
 <div id="wpso_select_extras">
-<label class="clickable"><input type="checkbox" id="wpso_allcheck_extras" class="hide" /> <?php _e( 'Check/Uncheck', 'wpso-sort-order') ?></label>
+<label class="clickable"><input type="checkbox" id="wpso_allcheck_extras" class="hide" /> <?php echo esc_html__( 'Check/Uncheck', 'wpso-sort-order' ); ?></label>
 <table class="form-table">
         <tbody>
                 <tr valign="top">
-                        <th scope="row"><h4><?php _e('Pages', 'wpso-sort-order') ?></h4><small>menu_order</small></th>
+                        <th scope="row"><h4><?php echo esc_html__( 'Pages', 'wpso-sort-order' ); ?></h4><small>menu_order</small></th>
                         <td class="options1">
             <ul>
@@ -67 +71 @@
 </div>
 <div id="wpso_select_objects">
-<label class="clickable"><input type="checkbox" id="wpso_allcheck_objects" class="hide" /> <?php _e( 'Check/Uncheck', 'wpso-sort-order') ?></label>
+<label class="clickable"><input type="checkbox" id="wpso_allcheck_objects" class="hide" /> <?php echo esc_html__( 'Check/Uncheck', 'wpso-sort-order' ); ?></label>
 <table class="form-table">
         <tbody>
                 <tr valign="top">
-                        <th scope="row"><h4><?php _e( 'Post Types', 'wpso-sort-order') ?></h4><small>menu_order</small></th>
+                        <th scope="row"><h4><?php echo esc_html__( 'Post Types', 'wpso-sort-order' ); ?></h4><small>menu_order</small></th>
                         <td class="options1">
             <ul>
@@ -114 +118 @@
 
 <div id="wpso_select_tags">
-<label class="clickable"><input class="hide" type="checkbox" id="wpso_allcheck_tags"> <?php _e( 'Check/Uncheck', 'wpso-sort-order') ?></label>
+<label class="clickable"><input class="hide" type="checkbox" id="wpso_allcheck_tags"> <?php echo esc_html__( 'Check/Uncheck', 'wpso-sort-order' ); ?></label>
 <table class="form-table">
         <tbody>
                 <tr valign="top">
-                        <th scope="row"><h4><?php _e( 'Taxonomies', 'wpso-sort-order') ?></h4><small>term_order<?php if(!empty($term_order_exists)){ ?> <i title="<?php _e( 'term_order field added to terms database table correctly!', 'wpso-sort-order') ?>" class="fas fa-check-circle"></i><?php } ?></small></th>
+                        <th scope="row"><h4><?php echo esc_html__( 'Taxonomies', 'wpso-sort-order' ); ?></h4><small>term_order<?php if(!empty($term_order_exists)){ ?> <i title=\"<?php echo esc_attr__( 'term_order field added to terms database table correctly!', 'wpso-sort-order' ); ?>\" class="fas fa-check-circle"></i><?php } ?></small></th>
                         <td class="options2">
             <ul>
@@ -146 +150 @@
 
                 <?php if(!$wpso_pro): ?>
-                <li><label><input disabled="disabled" type="checkbox">&nbsp;<?php echo __('User Categories', 'wpso-sort-order'); ?></label>&nbsp;<?php //echo $premium_click; ?></li>
+                <li><label><input disabled="disabled" type="checkbox">&nbsp;<?php echo esc_html__( 'User Categories', 'wpso-sort-order' ); ?></label>&nbsp;<?php //echo $premium_click; ?></li>
                 <?php endif; ?>
             </ul>
@@ -154 +158 @@
         <th></th>
         <td><p class="submit">
-        <input type="submit" class="button-primary" name="wpso_submit" value="<?php _e('Save Changes', 'wpso-sort-order'); ?>">
+        <input type="submit" class="button-primary" name="wpso_submit" value="<?php echo esc_html__( 'Save Changes', 'wpso-sort-order' ); ?>">
 </p></td>
         </tr>
@@ -174 +178 @@
 
             <?php if ( function_exists( 'wp_nonce_field' ) ) wp_nonce_field( 'nonce_wpso' ); ?>
-            <input type="hidden" name="wpso_tn" value="<?php echo isset($_GET['t']) ? esc_attr($_GET['t']) : '0'; ?>"/>
+            <input type="hidden" name="wpso_tn" value="<?php echo esc_attr( absint( wpso_get( 't', '0' ) ) ); ?>"/>
 
             <div class="accordion_wrapper">
 
-                <button class="accordion first"><?php _e('Users List Shortcode','wpso-sort-order'); ?> <span class="dashicons dashicons-plus plus"></span><span class="dashicons dashicons-minus minus"></span></button>
+                <button class="accordion first"><?php echo esc_html__( 'Users List Shortcode', 'wpso-sort-order' ); ?> <span class="dashicons dashicons-plus plus"></span><span class="dashicons dashicons-minus minus"></span></button>
                 <div class="panel first">
                     <div>
@@ -186 +190 @@
                                 <?php if(!$wpso_pro): ?>
                                     <li>
-                                        <label><?php echo __('User categories required?', 'wpso-sort-order'); ?></label><?php echo $premium_click; ?>
+                                        <label><?php echo esc_html__( 'User categories required?', 'wpso-sort-order' ); ?></label><?php echo $premium_click; ?>
                                         <br />
                                         <br />
@@ -192 +196 @@
                                 <?php endif; ?>
                                 <li>
-                                    <label><?php echo __('A shortcode to list users under taxonomy, terms and children.', 'wpso-sort-order'); ?> <span>[</span>WPSO_USERS <span>slug="</span><?php echo __('taxonomy or term slug', 'wpso-sort-order').'<span>"</span> <span>id="</span>'.__('taxonomy or term id', 'wpso-sort-order'); ?><span>"]</span><?php echo $premium_click; ?></label>
+                                    <label><?php echo esc_html__( 'A shortcode to list users under taxonomy, terms and children.', 'wpso-sort-order' ); ?> <span>[</span>WPSO_USERS <span>slug="</span><?php echo __('taxonomy or term slug', 'wpso-sort-order').'<span>"</span> <span>id="</span>'.__('taxonomy or term id', 'wpso-sort-order'); ?><span>"]</span><?php echo $premium_click; ?></label>
                                 </li>
                             </ul>
@@ -205 +209 @@
                 </div>
 
-                <button class="accordion"><?php _e('User Categories','wpso-sort-order'); ?> <span class="dashicons dashicons-plus plus"></span><span class="dashicons dashicons-minus minus"></span></button>
+                <button class="accordion"><?php echo esc_html__( 'User Categories', 'wpso-sort-order' ); ?> <span class="dashicons dashicons-plus plus"></span><span class="dashicons dashicons-minus minus"></span></button>
                 <div class="panel">
 
 
                     <div id="wpso_select_premium_tags">
-                        <label class="clickable"><input class="hide" type="checkbox" id="wpso_allcheck_premium_tags"> <?php _e( 'Check/Uncheck', 'wpso-sort-order') ?></label>
+                        <label class="clickable"><input class="hide" type="checkbox" id="wpso_allcheck_premium_tags"> <?php echo esc_html__( 'Check/Uncheck', 'wpso-sort-order' ); ?></label>
                         <table class="form-table">
                             <tbody>
                             <tr valign="top">
-                                <th scope="row"><h4><?php _e( 'Taxonomies', 'wpso-sort-order') ?></h4><small>term_order</small></th>
+                                <th scope="row"><h4><?php echo esc_html__( 'Taxonomies', 'wpso-sort-order' ); ?></h4><small>term_order</small></th>
                                 <td class="options2">
                                     <ul>
@@ -243 +247 @@
 
                                         <?php if(!$wpso_pro): ?>
-                                            <li><label><input disabled="disabled" type="checkbox">&nbsp;<?php echo __('User Categories', 'wpso-sort-order'); ?></label>&nbsp;<?php echo $premium_click; ?></li>
+                                            <li><label><input disabled="disabled" type="checkbox">&nbsp;<?php echo esc_html__( 'User Categories', 'wpso-sort-order' ); ?></label>&nbsp;<?php echo $premium_click; ?></li>
                                         <?php endif; ?>
                                     </ul>
@@ -251 +255 @@
                                 <th></th>
                                 <td><p class="submit">
-                                        <input type="submit" class="button-primary" name="wpso_premium_submit" value="<?php _e('Save Changes', 'wpso-sort-order'); ?>">
+                                        <input type="submit" class="button-primary" name="wpso_premium_submit" value="<?php echo esc_html__( 'Save Changes', 'wpso-sort-order' ); ?>">
                                     </p></td>
                             </tr>
@@ -276 +280 @@
 
         </form>
+        <?php
+        if ( $wpso_pro ) {
+            /**
+             * Pro add-on renders its own accordion panels here (button.accordion + div.panel).
+             */
+            do_action( 'wpso_premium_panels' );
+        } else {
+            ?>
+            <div class="accordion_wrapper wpso-premium-teaser">
+                <button class="accordion" type="button"><?php echo esc_html__( 'Premium features', 'wpso-sort-order' ); ?> <span class="dashicons dashicons-plus plus"></span><span class="dashicons dashicons-minus minus"></span></button>
+                <div class="panel">
+                    <ul style="list-style:disc;margin:18px 0 18px 24px;">
+                        <li><?php echo esc_html__( 'Order history with one-click undo', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'Backup, export and import of every sort order (JSON)', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'Quick reset: alphabetical, newest, oldest or reversed', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'Let editors and other roles drag & drop what they can edit', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'Order column in post and term list tables', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'Shortcodes to list posts and terms in your sorted order', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'REST API endpoints for headless sites', 'wpso-sort-order' ); ?></li>
+                        <li><?php echo esc_html__( 'User Categories and the WPSO_USERS shortcode', 'wpso-sort-order' ); ?></li>
+                    </ul>
+                    <p><a class="button button-primary" href="<?php echo esc_url( $wpso_premium_link ); ?>" target="_blank" rel="noopener noreferrer"><?php echo esc_html__( 'Go Premium', 'wpso-sort-order' ); ?></a></p>
+                    <br />
+                </div>
+            </div>
+            <?php
+        }
+        ?>
+
 
     </div>
@@ -284 +317 @@
         <div class="row mt-3">
                 <ul class="position-relative">
-                <li class="mb-4"><a class="btn btn-sm btn-info" href="https://wordpress.org/support/plugin/wp-sort-order/" target="_blank"><?php _e('Open a Ticket on Support Forums', 'wp-sort-order'); ?></a></li>
-                <li class="mb-4"><a class="btn btn-sm btn-warning mr-2" href="http://demo.androidbubble.com/contact/" target="_blank"><?php _e('Contact Developer', 'wp-sort-order'); ?></a><i class="fas fa-headset"></i></li>
-                <li><iframe width="560" height="315" src="https://www.youtube.com/embed/4ZiHUSBDJwY" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></li>
+                <li class="mb-4"><a class="btn btn-sm btn-info" href="https://wordpress.org/support/plugin/wp-sort-order/" target="_blank" rel="noopener noreferrer"><?php echo esc_html__( 'Open a Ticket on Support Forums', 'wpso-sort-order' ); ?></a></li>
+                <li class="mb-4"><a class="btn btn-sm btn-warning mr-2" href="https://demo.androidbubble.com/contact/" target="_blank" rel="noopener noreferrer"><?php echo esc_html__( 'Contact Developer', 'wpso-sort-order' ); ?></a><i class="fas fa-headset"></i></li>
+                <li><iframe width="560" height="315" loading="lazy" referrerpolicy="strict-origin-when-cross-origin" title="WP Sort Order" src="https://www.youtube-nocookie.com/embed/4ZiHUSBDJwY" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></li>
                         </ul>                
                 </div>
@@ -299 +332 @@
 
 
-<?php if (isset($_GET['t']) || isset($_POST['wpso_tn'])):
-
-
-        $wpso_tn = isset($_POST['wpso_tn']) ? intval($_POST['wpso_tn']) : intval($_GET['t']);
+<?php if ( '' !== wpso_get( 't' ) ) :
+
+
+        $wpso_tn = absint( wpso_get( 't', '0' ) );
 
         ?>

wp-sort-order/trunk/index.php

@@ -1 @@
-<?php if ( ! defined( 'ABSPATH' ) ) exit; 
+<?php
+/**
+ * WP Sort Order
+ *
+ * @package           WPSortOrder
+ * @author            Fahad Mahmood
+ * @license           GPL-2.0-or-later
+ *
+ * @wordpress-plugin
+ * Plugin Name:       WP Sort Order
+ * Plugin URI:        https://androidbubble.com/blog/wordpress/plugins/wp-sort-order
+ * Description:       Order plugins, terms (Users, Posts, Pages, Custom Post Types and Custom Taxonomies) using Drag and Drop with jQuery UI Sortable.
+ * Version:           1.3.7
+ * Requires at least: 6.0
+ * Tested up to:      7.1
+ * Requires PHP:      7.4
+ * Author:            Fahad Mahmood
+ * Author URI:        https://www.androidbubble.com
+ * Text Domain:       wpso-sort-order
+ * Domain Path:       /languages
+ * License:           GPL v2 or later
+ * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+}
+
+if ( ! defined( 'WPSO_VERSION' ) ) {
+        define( 'WPSO_VERSION', '1.3.7' );
+}
+if ( ! defined( 'WPSO_FILE' ) ) {
+        define( 'WPSO_FILE', __FILE__ );
+}
+if ( ! defined( 'WPSO_URL' ) ) {
+        define( 'WPSO_URL', untrailingslashit( plugins_url( '', __FILE__ ) ) );
+}
+if ( ! defined( 'WPSO_DIR' ) ) {
+        define( 'WPSO_DIR', plugin_dir_path( __FILE__ ) );
+}
+
+global $wpso_data, $wpso_pro, $wpso_premium_link, $wpso_premium, $premium_click, $wpso_allowed_pages, $premium_tags_list;
+
+if ( ! function_exists( 'get_plugin_data' ) ) {
+        require_once ABSPATH . 'wp-admin/includes/plugin.php';
+}
+
+require_once WPSO_DIR . 'inc/functions.php';
+
+$wpso_allowed_pages = array( 'plugins.php' => 'Plugins' );
+$wpso_data          = get_plugin_data( __FILE__, true, false );
+$premium_tags_list  = array( 'usercategories' );
+
 /*
-Plugin Name: WP Sort Order
-Plugin URI: http://androidbubble.com/blog/wordpress/plugins/wp-sort-order
-Description: Order plugins, terms (Users, Posts, Pages, Custom Post Types and Custom Taxonomies) using a Drag and Drop with jQuery ui Sortable.
-Version: 1.3.6
-Author: Fahad Mahmood 
-Author URI: http://www.androidbubble.com
-Text Domain: wpso-sort-order
-Domain Path: /languages/
-License: GPL2
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ * PRO "plug and play" switch.
+ *
+ * If the /pro directory ships with a loader (pro/wpso_pro.php) or the legacy
+ * pro/wpso_extended.php, premium features are enabled. If the directory is
+ * missing, the free version simply keeps working - nothing is ever required
+ * from /pro by the free code.
+ */
+$wpso_premium      = WPSO_DIR . 'pro/wpso_pro.php';
+$wpso_premium_old  = WPSO_DIR . 'pro/wpso_extended.php';
+$wpso_pro          = ( is_readable( $wpso_premium ) || is_readable( $wpso_premium_old ) );
+$wpso_premium_link = 'https://shop.androidbubbles.com/product/wp-sort-order-pro';
 
-This WordPress Plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. This free software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this software. If not, see http://www.gnu.org/licenses/gpl-2.0.html.
-*/ 
+// Built lazily in settings.php (translations must not be called before "init").
+$premium_click = '';
 
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
-        include(plugin_dir_path(__FILE__) . 'inc/functions.php');
+if ( is_admin() ) {
+        add_filter( 'plugin_action_links_' . plugin_basename( __FILE__ ), 'wpso_plugin_links' );
+}
 
-        
-        global $wpso_data, $wpso_pro, $wpso_premium_link, $wpso_premium, $premium_click, $wpso_allowed_pages, $premium_tags_list;
-        $wpso_allowed_pages = array('plugins.php'=>'Plugins');
-        $wpso_data = get_plugin_data(__FILE__, true, false);
-        $wpso_dir = plugin_dir_path( __FILE__ );
-        $premium_tags_list = array('usercategories');
-        define( 'WPSO_URL', plugins_url( '', __FILE__ ) );
-        define( 'WPSO_DIR', $wpso_dir );
-        $wpso_premium = $wpso_dir.'pro/wpso_extended.php';
-        $wpso_pro = file_exists($wpso_premium);
-        $wpso_premium_link = 'https://shop.androidbubbles.com/product/wp-sort-order-pro';//https://shop.androidbubble.com/products/wordpress-plugin?variant=36439508713627';//
-        
-        $premium_click = $wpso_pro?'':'<small class="premium">('.__('Premium Feature','wpso-sort-order').')</small>';
-        
-        if(is_admin()){
-                $plugin = plugin_basename(__FILE__); 
-                add_filter("plugin_action_links_$plugin", 'wpso_plugin_links' );        
-                
-        }       
-        
-                
-                
-        function wpso_activate() {                      
-                
+/**
+ * Load translations.
+ */
+function wpso_textdomain() {
+        load_plugin_textdomain( 'wpso-sort-order', false, dirname( plugin_basename( WPSO_FILE ) ) . '/languages' );
+}
+add_action( 'init', 'wpso_textdomain' );
+
+function wpso_activate() {
+        // Schema changes are handled lazily by Wpso::wpso_activation().
+}
+register_activation_hook( __FILE__, 'wpso_activate' );
+
+require_once WPSO_DIR . 'inc/hooks.php';
+
+/*
+ * Pro loader - last, so it can use every free hook. Wrapped so that a broken or
+ * partial /pro folder can never take the free plugin (or the site) down.
+ */
+if ( $wpso_pro ) {
+        if ( is_readable( $wpso_premium ) ) {
+                require_once $wpso_premium;
+        } elseif ( is_readable( $wpso_premium_old ) ) {
+                require_once $wpso_premium_old;
         }
-        register_activation_hook( __FILE__, 'wpso_activate' );
-        
-        if($wpso_pro)
-        include(plugin_dir_path(__FILE__) . 'pro/wpso_extended.php');
-        
-        //echo $wpso_premium;
-        
-        include(plugin_dir_path(__FILE__) . 'inc/hooks.php');
-        
+        /**
+         * Fires once the pro folder has been loaded.
+         */
+        do_action( 'wpso_pro_loaded' );
+}

wp-sort-order/trunk/js/admin.js

@@ -102 +102 @@
                 });             
                 $('small.premium').on('click', function(){
-                        window.open($('a.premium').attr('href'));
+                        window.open($('a.premium').attr('href'), '_blank', 'noopener,noreferrer');
                         
                 });

wp-sort-order/trunk/js/scripts.js

@@ -1 +1 @@
 (function($){
-        
-        // posts
 
-        $('table.posts #the-list, table.pages #the-list').sortable({
-                'items': 'tr',
-                'axis': 'y',
-                'helper': fixHelper,
-                'update' : function(e, ui) {
-                        $.post( wpso_obj.ajaxurl, {
-                                action: 'update-menu-order',
-                                order: $('#the-list').sortable('serialize'),
-                                'wpso_nonce': wpso_obj.nonce,
-                        });
-                }
-        });
-        //$("#the-list").disableSelection();
-        
-        // tags
-        
-        $('table.tags #the-list').sortable({
-                'items': 'tr',
-                'axis': 'y',
-                'helper': fixHelper,
-                'update' : function(e, ui) {
-                        $.post( wpso_obj.ajaxurl, {
-                                action: 'update-menu-order-tags',
-                                order: $('#the-list').sortable('serialize'),
-                                'wpso_nonce': wpso_obj.nonce,
-                        });
-                }
-        });
-        
-        $('table.users #the-list').sortable({
-                'items': 'tr',
-                'axis': 'y',
-                'helper': fixHelper,
-                'update' : function(e, ui) {
-                        var ref = $('input[name="_wp_http_referer"]').val().split('?');
-                        $.post( wpso_obj.ajaxurl, {
-                                action: 'update-menu-order-users',
-                                order: $('#the-list').sortable('serialize'),
-                                referer_string: ref[1],
-                                'wpso_nonce': wpso_obj.nonce,
-                        });
-                }
-        });     
-        
-        $.each($('table.plugins:visible #the-list > tr'), function(i,j){
-                var tid = 'plugin_'+$(this).find('input[name="checked[]"]').attr('id').replace('checkbox_', '');
-                $(this).attr('id', tid);
-        });
-        
-        $('table.plugins:visible #the-list').sortable({
-                'items': 'tr',
-                'axis': 'y',
-                'helper': fixHelper,
-                'refreshPositions': true,
-                'update' : function(e, ui) {            
-                        $.post( wpso_obj.ajaxurl, {
-                                action: 'update-menu-order-extras',
-                                order: $('#the-list').sortable('serialize'),
-                                'wpso_nonce': wpso_obj.nonce,
-                        });
-                }
-        });             
-        //$("#the-list").disableSelection();
-        
+        if ( typeof wpso_obj === 'undefined' ) {
+                return;
+        }
+
         var fixHelper = function(e, ui) {
                 ui.children().children().each(function() {
@@ -73 +11 @@
                 return ui;
         };
-        
 
-        
-})(jQuery)
+        var post_order = function(action, extra) {
+                var data = $.extend({
+                        action: action,
+                        order: $('#the-list').sortable('serialize'),
+                        'wpso_nonce': wpso_obj.nonce
+                }, extra || {});
+                $.post( wpso_obj.ajaxurl, data );
+        };
+
+        // posts
+        $('table.posts #the-list, table.pages #the-list').sortable({
+                'items': 'tr',
+                'axis': 'y',
+                'helper': fixHelper,
+                'update' : function(e, ui) {
+                        post_order('update-menu-order');
+                }
+        });
+
+        // tags
+        $('table.tags #the-list').sortable({
+                'items': 'tr',
+                'axis': 'y',
+                'helper': fixHelper,
+                'update' : function(e, ui) {
+                        post_order('update-menu-order-tags');
+                }
+        });
+
+        // users
+        $('table.users #the-list').sortable({
+                'items': 'tr',
+                'axis': 'y',
+                'helper': fixHelper,
+                'update' : function(e, ui) {
+                        var referer = $('input[name="_wp_http_referer"]').val() || '';
+                        var ref = referer.split('?');
+                        post_order('update-menu-order-users', { referer_string: ref[1] || '' });
+                }
+        });
+
+        // plugins
+        $.each($('table.plugins:visible #the-list > tr'), function(i,j){
+                var cb = $(this).find('input[name="checked[]"]');
+                if ( cb.length && cb.attr('id') ) {
+                        $(this).attr('id', 'plugin_' + cb.attr('id').replace('checkbox_', ''));
+                }
+        });
+
+        $('table.plugins:visible #the-list').sortable({
+                'items': 'tr',
+                'axis': 'y',
+                'helper': fixHelper,
+                'refreshPositions': true,
+                'update' : function(e, ui) {
+                        post_order('update-menu-order-extras');
+                }
+        });
+
+})(jQuery);

wp-sort-order/trunk/readme.txt

@@ -2 +2 @@
 Contributors: fahadmahmood, invoicepress
 Tags: taxonomy order, user order, plugins order, post order
-Requires at least: 3.5.0
+Requires at least: 6.0
 Tested up to: 7.1
-Stable tag: 1.3.6
-Requires PHP: 7.0
+Stable tag: 1.3.7
+Requires PHP: 7.4
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17 +17 @@
 * Project URI: <http://androidbubble.com/blog/wordpress/plugins/wp-sort-order>
 
-* License: GPL 3. See License below for copyright jots and titles.
+* License: GPLv2 or later. See License below.
 
 
@@ -104 +104 @@
 
 == Changelog ==
+= 1.3.7 =
+* Tested up to WordPress 7.1. Requires WordPress 6.0 and PHP 7.4 or newer.
+* Security: every SQL query is prepared; capability + nonce checks on all settings and AJAX actions; per-item permission checks (edit_post / edit_term / edit_user); whitelisted settings input; safe redirects; escaped output; no nonce exposed on the front end.
+* Fix: settings saved from the General tab no longer drop Premium taxonomies.
+* Fix: PHP 8.x notices and a fatal error risk on front-end user queries.
+* Fix: plugin translations now load (text domain wpso-sort-order); uninstall cleanup moved to uninstall.php.
+* Assets are versioned with the plugin version instead of changing every minute (better caching).
+* New: optional "pro" add-on folder. If /pro exists, premium features switch on automatically (history and undo, backup, quick reset, role access, order column, shortcodes, REST API). Without it the free plugin works exactly as before.
 = 1.3.6 =
 Security: Hardened plugin against SQL injection, XSS, CSRF, LFI, and privilege escalation vulnerabilities with comprehensive input validation, output escaping, and capability checks. [05/09/2026]
@@ -155 +163 @@
 
 == Upgrade Notice ==
+= 1.3.7 =
+Security hardening, WordPress 7.1 compatibility and fixes. Requires WordPress 6.0+ and PHP 7.4+.
 = 1.3.6 =
 Security hardening release: This update fixes multiple security vulnerabilities including SQL injection, XSS, CSRF, file inclusion, and privilege escalation issues. All users are strongly recommended to update immediately.
@@ -204 +214 @@
 A few improvements related to WordPress 4.5.0.
 
+== External services ==
+The Help tab of the settings page embeds an optional video from YouTube (youtube-nocookie.com). It loads only when an administrator opens that tab. See https://policies.google.com/privacy.
+
 == License ==
 This WordPress Plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version. This free software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this software. If not, see http://www.gnu.org/licenses/gpl-2.0.html.