Changeset 2304

Timestamp:

01/16/2016 12:39:01 AM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets Dashboard: Fall back to default section if none is requested.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes

Files:

• sponsor-invoices-dashboard.php (modified) (3 diffs)
• sponsor-invoices-list-table.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-dashboard.php

@@ -64 +64 @@
     $list_table->prepare_items();
 
-    switch ( $_GET['section'] ) {
+    switch ( get_current_section() ) {
         case 'submitted':
             $section_explanation = 'These invoices have been completed by the organizer, but need to be approved by a deputy before being sent to the sponsor.';
@@ -82 +82 @@
 
 /**
+ * Get the current section
+ *
+ * @return string
+ */
+function get_current_section() {
+    $sections        = array( 'submitted', 'approved', 'paid' );
+    $current_section = 'submitted';
+
+    if ( isset( $_GET['section'] ) && in_array( $_GET['section'], $sections, true ) ) {
+        $current_section = $_GET['section'];
+    }
+
+    return $current_section;
+}
+
+/**
  * Get all the data needed to render the section tabs
  *
@@ -89 +105 @@
     $statuses        = \WordCamp\Budgets\Sponsor_Invoices\get_custom_statuses();
     $sections        = array();
-    $current_section = sanitize_text_field( $_GET['section'] );
+    $current_section = get_current_section();
 
     foreach ( $statuses as $status_slug => $status_name ) {

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-list-table.php

@@ -19 +19 @@
         );
 
-        if ( 'submitted' === $_GET['section'] ) {
+        if ( 'submitted' === get_current_section() ) {
             $columns['approve_invoice'] = 'Approve';
         }
@@ -49 +49 @@
 
         $table_name = get_index_table_name();
-        $status     = 'wcbsi_' . $_GET['section'];
+        $status     = 'wcbsi_' . get_current_section();
         $paged      = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
         $limit      = 30;