Changeset 1163814

Timestamp:

05/20/2015 05:17:00 AM (11 years ago)

Author:

themeavenue

Message:

Update files to 3.1.10

Location:

awesome-support/trunk

Files:

• awesome-support.php (modified) (2 diffs)
• includes/admin/settings/settings-general.php (modified) (1 diff)
• includes/functions-general.php (modified) (1 diff)
• includes/functions-post.php (modified) (2 diffs)
• includes/functions-user.php (modified) (6 diffs)
• readme.txt (modified) (2 diffs)

awesome-support/trunk/awesome-support.php

@@ -11 +11 @@
  * Plugin URI:        http://getawesomesupport.com
  * Description:       Awesome Support is a great ticketing system that will help you improve your customer satisfaction by providing a unique customer support experience.
- * Version:           3.1.8
+ * Version:           3.1.10
  * Author:            ThemeAvenue
  * Author URI:        http://themeavenue.net
@@ -29 +29 @@
  *----------------------------------------------------------------------------*/
 
-define( 'WPAS_VERSION',           '3.1.8' );
+define( 'WPAS_VERSION',           '3.1.10' );
 define( 'WPAS_DB_VERSION',        '1' );
 define( 'WPAS_URL',               trailingslashit( plugin_dir_url( __FILE__ ) ) );

awesome-support/trunk/includes/admin/settings/settings-general.php

@@ -28 +28 @@
                     'type'    => 'select',
                     'desc'    => __( 'Who to assign tickets to by default (if auto-assignment is enabled, this will only be used in case an assignment rule is incorrect).', 'wpas' ),
-                    'options' => wpas_list_users( 'edit_ticket' ),
+                    'options' => isset( $_GET['post_type'] ) && 'ticket' === $_GET['post_type'] && isset( $_GET['page'] ) && 'settings' === $_GET['page'] ? wpas_list_users( 'edit_ticket' ) : array(),
                     'default' => ''
                 ),

awesome-support/trunk/includes/functions-general.php

@@ -568 +568 @@
 
 }
+
+/**
+ * Shuffle an associative array.
+ *
+ * @param array $list The array to shuffle
+ *
+ * @return array Shuffled array
+ *
+ * @link  http://php.net/manual/en/function.shuffle.php#99624
+ * @since 3.1.10
+ */
+function shuffle_assoc( $list ) {
+
+    if ( ! is_array( $list ) ) {
+        return $list;
+    }
+
+    $keys   = array_keys( $list );
+    $random = array();
+
+    shuffle( $keys );
+
+    foreach ( $keys as $key ) {
+        $random[ $key ] = $list[ $key ];
+    }
+
+    return $random;
+
+}

awesome-support/trunk/includes/functions-post.php

@@ -733 +733 @@
     }
 
-    $users = get_transient( 'wpas_list_agents' );
-
-    if ( false === $users ) {
-        $users = get_users( array( 'orderby' => 'wpas_random' ) ); // We use a unique and non-existing orderby parameter so that we can identify the query in pre_user_query
-        set_transient( 'wpas_list_agents', $users, 24 * 60 * 60 );
-    }
-
+    $users = shuffle_assoc( wpas_get_users( array( 'cap' => 'edit_ticket' ) ) );
     $agent = array();
 
     foreach ( $users as $user ) {
 
-        if ( array_key_exists( 'edit_ticket', $user->allcaps ) ) {
-
-            $posts_args = array(
-                'post_type'              => 'ticket',
-                'post_status'            => 'any',
-                'posts_per_page'         => -1,
-                'no_found_rows'          => true,
-                'cache_results'          => false,
-                'update_post_term_cache' => false,
-                'update_post_meta_cache' => false,
-                'meta_query'             => array(
-                    array(
-                        'key'     => '_wpas_status',
-                        'value'   => 'open',
-                        'type'    => 'CHAR',
-                        'compare' => '='
-                    ),
-                    array(
-                        'key'     => '_wpas_assignee',
-                        'value'   => $user->ID,
-                        'type'    => 'NUMERIC',
-                        'compare' => '='
-                    ),
-                )
-            );
-
-            $open_tickets = new WP_Query( $posts_args );
-            $count        = count( $open_tickets->posts ); // Total number of open tickets for this agent
-
-            if ( empty( $agent ) ) {
+        $posts_args = array(
+            'post_type'              => 'ticket',
+            'post_status'            => 'any',
+            'posts_per_page'         => - 1,
+            'no_found_rows'          => true,
+            'cache_results'          => false,
+            'update_post_term_cache' => false,
+            'update_post_meta_cache' => false,
+            'meta_query'             => array(
+                array(
+                    'key'     => '_wpas_status',
+                    'value'   => 'open',
+                    'type'    => 'CHAR',
+                    'compare' => '='
+                ),
+                array(
+                    'key'     => '_wpas_assignee',
+                    'value'   => $user->ID,
+                    'type'    => 'NUMERIC',
+                    'compare' => '='
+                ),
+            )
+        );
+
+        $open_tickets = new WP_Query( $posts_args );
+        $count        = count( $open_tickets->posts ); // Total number of open tickets for this agent
+
+        if ( empty( $agent ) ) {
+            $agent = array( 'tickets' => $count, 'user_id' => $user->ID );
+        } else {
+
+            if ( $count < $agent['tickets'] ) {
                 $agent = array( 'tickets' => $count, 'user_id' => $user->ID );
-            } else {
-
-                if ( $count < $agent['tickets'] ) {
-                    $agent = array( 'tickets' => $count, 'user_id' => $user->ID );
-                }
-
             }
 
@@ -1077 +1067 @@
     );
 
-    $editor = wp_editor( $editor_content, $editor_id, $settings );
-
-    echo $editor;
+    wp_editor( $editor_content, $editor_id, $settings );
+
     die();
 

awesome-support/trunk/includes/functions-user.php

@@ -357 +357 @@
 
     /* Get the hash of the arguments that's used for caching the result. */
-    $hash = md5( serialize( $args ) );
+    $hash = substr( md5( serialize( $args ) ), 0, 10 ); // Limit the length of the hash in order to avoid issues with option_name being too long in the database (https://core.trac.wordpress.org/ticket/15058)
 
     /* Check if we have a result already cached. */
@@ -364 +364 @@
     /* If there is a cached result we return it and don't run the expensive query. */
     if ( false !== $result ) {
-        return apply_filters( 'wpas_get_users', $result );
+        if ( is_object( $result[0] ) && is_a( $result[0], 'WP_User' ) ) {
+            delete_transient( "wpas_list_users_$hash" ); // Invalidate the previous cache
+        } else {
+            return apply_filters( 'wpas_get_users', get_users( array( 'include' => (array) $result ) ) );
+        }
     }
 
@@ -370 +374 @@
     $all_users = get_users();
 
+    /**
+     * Store the selected user IDs for caching.
+     *
+     * On database with a lot of users, storing the entire WP_User
+     * object causes issues (eg. "Got a packet bigger than ‘max_allowed_packet’ bytes").
+     * In order to avoid that we only store the user IDs and then get the users list
+     * later on only including those IDs.
+     *
+     * @since 3.1.10
+     */
+    $users_ids = array();
+
     /* Loop through the users list and filter them */
     foreach ( $all_users as $user ) {
 
         /* Check for required capability */
-        if ( ! empty( $cap ) ) {
-            if ( ! $user->has_cap( $args['cap'] ) ) {
+        if ( ! empty( $args['cap'] ) ) {
+            if ( ! array_key_exists( $args['cap'], $user->allcaps ) ) {
                 continue;
             }
@@ -381 +397 @@
 
         /* Check for excluded capability */
-        if ( ! empty( $cap_exclude ) ) {
-            if ( $user->has_cap( $args['cap_exclude'] ) ) {
+        if ( ! empty( $args['cap_exclude'] ) ) {
+            if ( array_key_exists( $args['cap_exclude'], $user->allcaps ) ) {
                 continue;
             }
@@ -394 +410 @@
         /* Now we add this user to our final list. */
         array_push( $list, $user );
+        array_push( $users_ids, $user->ID );
 
     }
 
     /* Let's cache the result so that we can avoid running this query too many times. */
-    set_transient( "wpas_list_users_$hash", $list, apply_filters( 'wpas_list_users_cache_expiration', 60 * 60 * 24 ) );
+    set_transient( "wpas_list_users_$hash", $users_ids, apply_filters( 'wpas_list_users_cache_expiration', 60 * 60 * 24 ) );
 
     return apply_filters( 'wpas_get_users', $list );
@@ -543 +560 @@
 function wpas_support_users_dropdown( $args = array() ) {
     $args['cap_exclude'] = 'edit_ticket';
+    $args['cap']         = 'create_ticket';
     echo wpas_users_dropdown( $args );
 }

awesome-support/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.5.1
 Tested up to: 4.3
-Stable tag: 3.1.9
+Stable tag: 3.1.10
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -152 +152 @@
 
 == Changelog ==
+
+= 3.1.10 - 2015-05-20 =
+
+* More performance improvements
+* Fixes "Got a packet bigger than ‘max_allowed_packet’ bytes" issue on sites with lots of users
 
 = 3.1.9 - 2015-05-20 =