From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 20 Nov 2018 13:11:14 +0000 (-0500)
Subject: Merge tag 'v1.2.21' into develop
X-Git-Tag: v1.3.0^2~2^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8d9a285285d03b755b32a09e021eef444fcfd9fd;p=WP-Plugins%2Fglm-member-db-packaging.git

Merge tag 'v1.2.21' into develop

Version 1.2.21
---

8d9a285285d03b755b32a09e021eef444fcfd9fd
diff --cc index.php
index e4ddd02,5040a9e..1a37698
--- a/index.php
+++ b/index.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /**
 - * Plugin Name: GLM Members Database Packaging
 + * Plugin Name: GLM Assoicate - Packaging Add-On
   * Plugin URI: http://www.gaslightmedia.com/
   * Description: Gaslight Media Members Database.
-  * Version: 1.2.20
+  * Version: 1.2.21
   * Author: Gaslight Media
   * Author URI: http://www.gaslightmedia.com/
   * License: GPL2
@@@ -43,8 -43,8 +43,8 @@@ if (!defined('ABSPATH')) 
   *  so that we're sure the other add-ons see an up to date
   *  version from this plugin.
   */
- define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.20');
+ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.21');
 -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.7');
 +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.8');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.9.15');
diff --cc models/front/packaging/list.php
index 441e91a,cd320eb..7f75b84
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@@ -216,65 -216,19 +216,19 @@@ class GlmMembersFront_packaging_list ex
              // Drop the data organized by packages
              $packages = false;
  
-             // Determine how to sort the package list
-             // The sort order config values compared are the ones from Member DB plugin.ini
-             switch ($this->config['settings']['package_list_order']) {
- 
-                 // Pseudo-Random list order
-                 case $this->config['sort_order_numb']['Pseudo-Random']:
- 
-                     /*
-                      * Sort members by pseudo-random sequence
-                      *
-                      * WARNING: shuffle() will create new keys for the array!
-                      * The $members keys will no longer match the member IDs.
-                      * This should not be a problem, but be aware of it.
-                      *
-                      */
-                     $cookieName = 'GLM_PACKAGE_SORT_SEED';
-                     $cookieTime = 86400;
- 
-                     // Get browser cookie if it exists or otherwise generate one
-                     if (isset($_COOKIE[$cookieName])) {
-                         $seed = ($_COOKIE[$cookieName]);
-                     } else {
-                         $seed = intval(time()*1000000+microtime()*1000000);
 -            // Sort by member name
 -            reset( $members );
 -            uasort(
 -                $members,
 -                function($a, $b) {
 -                    if ( $a['member'] == $b['member'] ) {
 -                        return 0;
--                    }
- 
-                     // Enforce seed as positive integer
-                     $seed = abs(intval($seed -0));
- 
-                     // Store or update seed in browser cookie
-                     setcookie($cookieName, $seed, time() + $cookieTime);
- 
-                     // Use the seed to order the Member list - Note that shuffle() will produce the same results if strand() has the same seed.
-                     srand($seed);
-                     shuffle($members);
- 
-                     break;
- 
-                 // Default is alpha-numeric list order
-                 default:
-                 case $this->config['sort_order_numb']['Alpha-Numeric']:
- 
 -                    return ( $a['member'] < $b['member'] ) ? -1 : 1;
 -                }
 -            );
 +                    // Sort by member name
 +                    reset( $members );
 +                    uasort(
 +                        $members,
 +                        function($a, $b) {
 +                            if ( $a['member'] == $b['member'] ) {
 +                                return 0;
 +                            }
 +                            return ( $a['member'] < $b['member'] ) ? -1 : 1;
 +                        }
 +                    );
  
-                     break;
- 
-             }
- 
              $byMember = true;
- 
          }
  
          // Check for alternate template requests