From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Mar 2018 15:55:38 +0000 (-0400)
Subject: Update list views for sessions
X-Git-Tag: v1.0.0^2~137
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d12cccf5c04699242b7602b14d891dfdfa104f78;p=WP-Plugins%2Fglm-member-db-billing.git

Update list views for sessions

Turn off the php sessions for paging for now.
Need to redo these.
---

diff --git a/models/admin/billing/accounts.php b/models/admin/billing/accounts.php
index 03a1045..f81ad90 100644
--- a/models/admin/billing/accounts.php
+++ b/models/admin/billing/accounts.php
@@ -289,21 +289,21 @@ class GlmMembersAdmin_billing_accounts extends GlmDataAccounts
             $where_params = array( 'true' );
 
             // Check for paging
-            if ( isset( $_REQUEST['pageSelect'] ) ) {
-                $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
-                unset( $_SESSION['search']['pageSelect'] );
-            }
-            if ( isset( $_REQUEST['nextStart'] ) ) {
-                $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
-                unset( $_SESSION['search']['nextStart'] );
-            }
-            if ( isset( $_REQUEST['prevStart'] ) ) {
-                $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
-                unset( $_SESSION['search']['prevStart'] );
-            }
+            // if ( isset( $_REQUEST['pageSelect'] ) ) {
+            //     $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
+            //     unset( $_SESSION['search']['pageSelect'] );
+            // }
+            // if ( isset( $_REQUEST['nextStart'] ) ) {
+            //     $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
+            //     unset( $_SESSION['search']['nextStart'] );
+            // }
+            // if ( isset( $_REQUEST['prevStart'] ) ) {
+            //     $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
+            //     unset( $_SESSION['search']['prevStart'] );
+            // }
 
             // Check if we're doing paging
             if (isset($_REQUEST['pageSelect'])) {
@@ -321,19 +321,19 @@ class GlmMembersAdmin_billing_accounts extends GlmDataAccounts
                 }
             }
 
-            if( isset($_SESSION['search']['pageSelect']) ){
-                 // If request is for Next
-                if ($_SESSION['search']['pageSelect'][0] == 'N') {
-                    $newStart = $_SESSION['search']['nextStart'] - 0;
-
-                // Otherwise it must be Previous
-                } else {
-                    $newStart = $_SESSION['search']['prevStart'] - 0;
-                }
-                if ($newStart > 0) {
-                    $start = $newStart;
-                }
-            }
+            // if( isset($_SESSION['search']['pageSelect']) ){
+            //      // If request is for Next
+            //     if ($_SESSION['search']['pageSelect'][0] == 'N') {
+            //         $newStart = $_SESSION['search']['nextStart'] - 0;
+            //
+            //     // Otherwise it must be Previous
+            //     } else {
+            //         $newStart = $_SESSION['search']['prevStart'] - 0;
+            //     }
+            //     if ($newStart > 0) {
+            //         $start = $newStart;
+            //     }
+            // }
             // Get any search parameters.
             $reg_options = array(
                 'options' => array(
diff --git a/models/admin/billing/index.php b/models/admin/billing/index.php
index d25cbc0..454f327 100644
--- a/models/admin/billing/index.php
+++ b/models/admin/billing/index.php
@@ -258,21 +258,21 @@ class GlmMembersAdmin_billing_index extends GlmDataInvoices
             $where_params = array( 'true' );
 
             // Check for paging
-            if ( isset( $_REQUEST['pageSelect'] ) ) {
-                $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
-                unset( $_SESSION['search']['pageSelect'] );
-            }
-            if ( isset( $_REQUEST['nextStart'] ) ) {
-                $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
-                unset( $_SESSION['search']['nextStart'] );
-            }
-            if ( isset( $_REQUEST['prevStart'] ) ) {
-                $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
-                unset( $_SESSION['search']['prevStart'] );
-            }
+            // if ( isset( $_REQUEST['pageSelect'] ) ) {
+            //     $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
+            //     unset( $_SESSION['search']['pageSelect'] );
+            // }
+            // if ( isset( $_REQUEST['nextStart'] ) ) {
+            //     $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
+            //     unset( $_SESSION['search']['nextStart'] );
+            // }
+            // if ( isset( $_REQUEST['prevStart'] ) ) {
+            //     $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
+            //     unset( $_SESSION['search']['prevStart'] );
+            // }
 
             // Check if we're doing paging
             if (isset($_REQUEST['pageSelect'])) {
@@ -290,19 +290,19 @@ class GlmMembersAdmin_billing_index extends GlmDataInvoices
                 }
             }
 
-            if( isset($_SESSION['search']['pageSelect']) ){
-                 // If request is for Next
-                if ($_SESSION['search']['pageSelect'][0] == 'N') {
-                    $newStart = $_SESSION['search']['nextStart'] - 0;
-
-                // Otherwise it must be Previous
-                } else {
-                    $newStart = $_SESSION['search']['prevStart'] - 0;
-                }
-                if ($newStart > 0) {
-                    $start = $newStart;
-                }
-            }
+            // if( isset($_SESSION['search']['pageSelect']) ){
+            //      // If request is for Next
+            //     if ($_SESSION['search']['pageSelect'][0] == 'N') {
+            //         $newStart = $_SESSION['search']['nextStart'] - 0;
+            //
+            //     // Otherwise it must be Previous
+            //     } else {
+            //         $newStart = $_SESSION['search']['prevStart'] - 0;
+            //     }
+            //     if ($newStart > 0) {
+            //         $start = $newStart;
+            //     }
+            // }
 
             // Get any search parameters.
             $reg_options = array(
diff --git a/models/admin/billing/invoices.php b/models/admin/billing/invoices.php
index 5926369..2756f5e 100644
--- a/models/admin/billing/invoices.php
+++ b/models/admin/billing/invoices.php
@@ -336,21 +336,21 @@ class GlmMembersAdmin_billing_invoices extends GlmDataInvoices
             $where_params = array( 'true' );
 
             // Check for paging
-            if ( isset( $_REQUEST['pageSelect'] ) ) {
-                $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
-                unset( $_SESSION['search']['pageSelect'] );
-            }
-            if ( isset( $_REQUEST['nextStart'] ) ) {
-                $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
-                unset( $_SESSION['search']['nextStart'] );
-            }
-            if ( isset( $_REQUEST['prevStart'] ) ) {
-                $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
-                unset( $_SESSION['search']['prevStart'] );
-            }
+            // if ( isset( $_REQUEST['pageSelect'] ) ) {
+            //     $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
+            //     unset( $_SESSION['search']['pageSelect'] );
+            // }
+            // if ( isset( $_REQUEST['nextStart'] ) ) {
+            //     $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
+            //     unset( $_SESSION['search']['nextStart'] );
+            // }
+            // if ( isset( $_REQUEST['prevStart'] ) ) {
+            //     $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
+            //     unset( $_SESSION['search']['prevStart'] );
+            // }
 
             // Check if we're doing paging
             if (isset($_REQUEST['pageSelect'])) {
@@ -368,19 +368,19 @@ class GlmMembersAdmin_billing_invoices extends GlmDataInvoices
                 }
             }
 
-            if( isset($_SESSION['search']['pageSelect']) ){
-                 // If request is for Next
-                if ($_SESSION['search']['pageSelect'][0] == 'N') {
-                    $newStart = $_SESSION['search']['nextStart'] - 0;
-
-                // Otherwise it must be Previous
-                } else {
-                    $newStart = $_SESSION['search']['prevStart'] - 0;
-                }
-                if ($newStart > 0) {
-                    $start = $newStart;
-                }
-            }
+            // if( isset($_SESSION['search']['pageSelect']) ){
+            //      // If request is for Next
+            //     if ($_SESSION['search']['pageSelect'][0] == 'N') {
+            //         $newStart = $_SESSION['search']['nextStart'] - 0;
+            //
+            //     // Otherwise it must be Previous
+            //     } else {
+            //         $newStart = $_SESSION['search']['prevStart'] - 0;
+            //     }
+            //     if ($newStart > 0) {
+            //         $start = $newStart;
+            //     }
+            // }
 
             // Get any search parameters.
             $reg_options = array(
diff --git a/models/admin/billing/payments.php b/models/admin/billing/payments.php
index 28fa74b..4fbf705 100644
--- a/models/admin/billing/payments.php
+++ b/models/admin/billing/payments.php
@@ -197,21 +197,21 @@ class GlmMembersAdmin_billing_payments extends GlmDataPayments
             $where = 'true';
 
             // Check for paging
-            if ( isset( $_REQUEST['pageSelect'] ) ) {
-                $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
-                unset( $_SESSION['search']['pageSelect'] );
-            }
-            if ( isset( $_REQUEST['nextStart'] ) ) {
-                $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
-                unset( $_SESSION['search']['nextStart'] );
-            }
-            if ( isset( $_REQUEST['prevStart'] ) ) {
-                $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
-            } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
-                unset( $_SESSION['search']['prevStart'] );
-            }
+            // if ( isset( $_REQUEST['pageSelect'] ) ) {
+            //     $_SESSION['search']['pageSelect'] = $_REQUEST['pageSelect'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['pageSelect'] ) ) {
+            //     unset( $_SESSION['search']['pageSelect'] );
+            // }
+            // if ( isset( $_REQUEST['nextStart'] ) ) {
+            //     $_SESSION['search']['nextStart'] = $_REQUEST['nextStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['nextStart'] ) ) {
+            //     unset( $_SESSION['search']['nextStart'] );
+            // }
+            // if ( isset( $_REQUEST['prevStart'] ) ) {
+            //     $_SESSION['search']['prevStart'] = $_REQUEST['prevStart'];
+            // } else if ( isset( $_REQUEST['searched'] ) && !isset( $_REQUEST['prevStart'] ) ) {
+            //     unset( $_SESSION['search']['prevStart'] );
+            // }
 
             // Check if we're doing paging
             if (isset($_REQUEST['pageSelect'])) {
@@ -229,19 +229,19 @@ class GlmMembersAdmin_billing_payments extends GlmDataPayments
                 }
             }
 
-            if( isset($_SESSION['search']['pageSelect']) ){
-                 // If request is for Next
-                if ($_SESSION['search']['pageSelect'][0] == 'N') {
-                    $newStart = $_SESSION['search']['nextStart'] - 0;
-
-                // Otherwise it must be Previous
-                } else {
-                    $newStart = $_SESSION['search']['prevStart'] - 0;
-                }
-                if ($newStart > 0) {
-                    $start = $newStart;
-                }
-            }
+            // if( isset($_SESSION['search']['pageSelect']) ){
+            //      // If request is for Next
+            //     if ($_SESSION['search']['pageSelect'][0] == 'N') {
+            //         $newStart = $_SESSION['search']['nextStart'] - 0;
+            //
+            //     // Otherwise it must be Previous
+            //     } else {
+            //         $newStart = $_SESSION['search']['prevStart'] - 0;
+            //     }
+            //     if ($newStart > 0) {
+            //         $start = $newStart;
+            //     }
+            // }
 
             // Get the list of payments and determine number of payments in list
             $orderBy = 'transaction_time asc';