AyeCode / invoicing

includes/class-getpaid-customers-query.php

Indentation +497 added lines, -497 removed lines

@@ -16,502 +16,502 @@
  */
 class GetPaid_Customers_Query {
 
-	/**
-	 * Query vars, after parsing
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	public $query_vars = array();
-
-	/**
-	 * List of found customers.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	private $results;
-
-	/**
-	 * Total number of found customers for the current query
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	private $total_customers = 0;
-
-	/**
-	 * The SQL query used to fetch matching customers.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $request;
-
-	// SQL clauses
-
-	/**
-	 * Contains the 'FIELDS' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_fields;
-
-	/**
-	 * Contains the 'FROM' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_from;
-
-	/**
-	 * Contains the 'WHERE' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_where;
-
-	/**
-	 * Contains the 'ORDER BY' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_orderby;
-
-	/**
-	 * Contains the 'LIMIT' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_limit;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param null|string|array $query Optional. The query variables.
-	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
-			$this->query();
-		}
-	}
-
-	/**
-	 * Fills in missing query variables with default values.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
-	 * @return array Complete query variables with undefined ones filled in with defaults.
-	 */
-	public static function fill_query_vars( $args ) {
-		$defaults = array(
-			'include'     => array(),
-			'exclude'     => array(),
-			'orderby'     => 'id',
-			'order'       => 'DESC',
-			'offset'      => '',
-			'number'      => 10,
-			'paged'       => 1,
-			'count_total' => true,
-			'fields'      => 'all',
-			's'           => '',
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
-
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
-			}
-		}
-
-		return wp_parse_args( $args, $defaults );
-	}
-
-	/**
-	 * Prepare the query variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @see self::fill_query_vars() For allowede args and their defaults.
-	 */
-	public function prepare_query( $query = array() ) {
-		global $wpdb;
-
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
-			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
-		}
-
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
-		}
-
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
-
-		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
-		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
-		$table             = $wpdb->prefix . 'getpaid_customers';
-		$this->query_from  = "FROM $table";
-
-		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
-
-		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
-
-		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
-
-		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
-			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
-			}
-		}
-
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
-	}
-
-	/**
-	 * Prepares the query fields.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_fields( &$qv, $table ) {
-
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
-
-			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
-					continue;
-				}
-
-				$field          = sanitize_key( $field );
-				$query_fields[] = "$table.`$field`";
-			}
-			$this->query_fields = implode( ',', $query_fields );
-		} else {
-			$this->query_fields = "$table.*";
-		}
-
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
-		}
-
-	}
-
-	/**
-	 * Prepares the query where.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_where( &$qv, $table ) {
-		global $wpdb;
-		$this->query_where = 'WHERE 1=1';
-
-		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
-
-				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
-				}
-			}
-
-			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
-				}
-
-				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
-				}
-			}
-		}
-
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
-			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
-			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
-		}
-
-		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
-			$this->query_where .= $date_created_query->get_sql();
-		}
-
-		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
-		}
-	}
-
-	/**
-	 * Used internally to generate an SQL string for searching across multiple columns
-	 *
-	 * @since 1.2.7
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param string $string The string to search for.
-	 * @return string
-	 */
-	protected function get_search_sql( $string ) {
-		global $wpdb;
-
-		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
-
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
-			}
-		}
-
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
-	}
-
-	/**
-	 * Prepares the query order.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_order( &$qv, $table ) {
-
-		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
-
-		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
-		}
-
-		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
-
-		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-
-			if ( is_int( $_key ) ) {
-				// Integer key means this is a flat array of 'orderby' fields.
-				$_orderby = $_value;
-				$_order   = $order;
-			} else {
-				// Non-integer key means that the key is the field and the value is ASC/DESC.
-				$_orderby = $_key;
-				$_order   = $_value;
-			}
-
-			$parsed = $this->parse_orderby( $_orderby, $table );
-
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
-			}
-		}
-
-		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
-			$orderby_array[] = "id $order";
-		}
-
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
-
-	}
-
-	/**
-	 * Execute the query, with the current variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 */
-	public function query() {
-		global $wpdb;
-
-		$qv =& $this->query_vars;
-
-		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
-		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
-
-		if ( null === $this->results ) {
-			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
-
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
-			} else {
-				$this->results = $wpdb->get_col( $this->request );
-			}
-
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
-			}
-		}
-
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
-			}
-		}
-
-	}
-
-	/**
-	 * Set cache
-	 *
-	 * @param string  $id
-	 * @param mixed   $data
-	 * @param string  $group
-	 * @param integer $expire
-	 * @return boolean
-	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
-
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		wp_cache_set( $key, $data, $group, $expire );
-	}
-
-	/**
-	 * Retrieve query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @return mixed
-	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
-	}
-
-	/**
-	 * Return the list of customers.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return GetPaid_Customer[]|array Found customers.
-	 */
-	public function get_results() {
-		return $this->results;
-	}
-
-	/**
-	 * Return the total number of customers for the current query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return int Number of total customers.
-	 */
-	public function get_total() {
-		return $this->total_customers;
-	}
-
-	/**
-	 * Parse and sanitize 'orderby' keys passed to the customers query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $orderby Alias for the field to order by.
-	 *  @param string $table The current table.
-	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
-	 */
-	protected function parse_orderby( $orderby, $table ) {
-
-		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
-			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
-			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
-			$_orderby    = "FIELD( $table.id, $include_sql )";
-		}
-
-		return $_orderby;
-	}
-
-	/**
-	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $order The 'order' query variable.
-	 * @return string The sanitized 'order' query variable.
-	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
-			return 'DESC';
-		}
-
-		if ( 'ASC' === strtoupper( $order ) ) {
-			return 'ASC';
-		} else {
-			return 'DESC';
-		}
-	}
+    /**
+     * Query vars, after parsing
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    public $query_vars = array();
+
+    /**
+     * List of found customers.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    private $results;
+
+    /**
+     * Total number of found customers for the current query
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    private $total_customers = 0;
+
+    /**
+     * The SQL query used to fetch matching customers.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $request;
+
+    // SQL clauses
+
+    /**
+     * Contains the 'FIELDS' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_fields;
+
+    /**
+     * Contains the 'FROM' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_from;
+
+    /**
+     * Contains the 'WHERE' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_where;
+
+    /**
+     * Contains the 'ORDER BY' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_orderby;
+
+    /**
+     * Contains the 'LIMIT' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_limit;
+
+    /**
+     * Class constructor.
+     *
+     * @since 1.0.19
+     *
+     * @param null|string|array $query Optional. The query variables.
+     */
+    public function __construct( $query = null ) {
+        if ( ! is_null( $query ) ) {
+            $this->prepare_query( $query );
+            $this->query();
+        }
+    }
+
+    /**
+     * Fills in missing query variables with default values.
+     *
+     * @since 1.0.19
+     *
+     * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
+     * @return array Complete query variables with undefined ones filled in with defaults.
+     */
+    public static function fill_query_vars( $args ) {
+        $defaults = array(
+            'include'     => array(),
+            'exclude'     => array(),
+            'orderby'     => 'id',
+            'order'       => 'DESC',
+            'offset'      => '',
+            'number'      => 10,
+            'paged'       => 1,
+            'count_total' => true,
+            'fields'      => 'all',
+            's'           => '',
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $defaults[ $field ] = 'any';
+
+            if ( '%f' === $type || '%d' === $type ) {
+                $defaults[ $field . '_min' ] = '';
+                $defaults[ $field . '_max' ] = '';
+            }
+        }
+
+        return wp_parse_args( $args, $defaults );
+    }
+
+    /**
+     * Prepare the query variables.
+     *
+     * @since 1.0.19
+     *
+     * @see self::fill_query_vars() For allowede args and their defaults.
+     */
+    public function prepare_query( $query = array() ) {
+        global $wpdb;
+
+        if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+            $this->query_limit = null;
+            $this->query_vars  = $this->fill_query_vars( $query );
+        }
+
+        if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
+            $this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+        }
+
+        do_action( 'getpaid_pre_get_customers', array( &$this ) );
+
+        // Ensure that query vars are filled after 'getpaid_pre_get_customers'.
+        $qv                = & $this->query_vars;
+        $qv                = $this->fill_query_vars( $qv );
+        $table             = $wpdb->prefix . 'getpaid_customers';
+        $this->query_from  = "FROM $table";
+
+        // Prepare query fields.
+        $this->prepare_query_fields( $qv, $table );
+
+        // Prepare query where.
+        $this->prepare_query_where( $qv, $table );
+
+        // Prepare query order.
+        $this->prepare_query_order( $qv, $table );
+
+        // limit
+        if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
+            if ( $qv['offset'] ) {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+            } else {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+            }
+        }
+
+        do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+    }
+
+    /**
+     * Prepares the query fields.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_fields( &$qv, $table ) {
+
+        if ( is_array( $qv['fields'] ) ) {
+            $qv['fields']   = array_unique( $qv['fields'] );
+            $allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+
+            $query_fields = array();
+            foreach ( $qv['fields'] as $field ) {
+                if ( ! in_array( $field, $allowed_fields ) ) {
+                    continue;
+                }
+
+                $field          = sanitize_key( $field );
+                $query_fields[] = "$table.`$field`";
+            }
+            $this->query_fields = implode( ',', $query_fields );
+        } else {
+            $this->query_fields = "$table.*";
+        }
+
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+            $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+        }
+
+    }
+
+    /**
+     * Prepares the query where.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_where( &$qv, $table ) {
+        global $wpdb;
+        $this->query_where = 'WHERE 1=1';
+
+        // Fields.
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            if ( 'any' !== $qv[ $field ] ) {
+
+                // In.
+                if ( is_array( $qv[ $field ] ) ) {
+                    $in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
+                    $this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
+                } elseif ( ! empty( $qv[ $field ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+                }
+            }
+
+            // Min/Max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                // Min.
+                if ( is_numeric( $qv[ $field . '_min' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+                }
+
+                // Max.
+                if ( is_numeric( $qv[ $field . '_max' ] ) ) {
+                    $this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+                }
+            }
+        }
+
+        if ( ! empty( $qv['include'] ) ) {
+            $include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+            $this->query_where .= " AND $table.`id` IN ($include)";
+        } elseif ( ! empty( $qv['exclude'] ) ) {
+            $exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+            $this->query_where .= " AND $table.`id` NOT IN ($exclude)";
+        }
+
+        // Date queries are allowed for the customer creation date.
+        if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
+            $date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+            $this->query_where .= $date_created_query->get_sql();
+        }
+
+        // Search.
+        if ( ! empty( $qv['s'] ) ) {
+            $this->query_where .= $this->get_search_sql( $qv['s'] );
+        }
+    }
+
+    /**
+     * Used internally to generate an SQL string for searching across multiple columns
+     *
+     * @since 1.2.7
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
+     * @param string $string The string to search for.
+     * @return string
+     */
+    protected function get_search_sql( $string ) {
+        global $wpdb;
+
+        $searches = array();
+        $string   = trim( $string, '%' );
+        $like     = '%' . $wpdb->esc_like( $string ) . '%';
+
+        foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
+            if ( 'id' === $col || 'user_id' === $col ) {
+                $searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            } else {
+                $searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            }
+        }
+
+        return ' AND (' . implode( ' OR ', $searches ) . ')';
+    }
+
+    /**
+     * Prepares the query order.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_order( &$qv, $table ) {
+
+        // sorting.
+        $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
+        $order       = $this->parse_order( $qv['order'] );
+
+        // Default order is by 'id' (latest customers).
+        if ( empty( $qv['orderby'] ) ) {
+            $qv['orderby'] = array( 'id' );
+        }
+
+        // 'orderby' values may be an array, comma- or space-separated list.
+        $ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+
+        $orderby_array = array();
+        foreach ( $ordersby as $_key => $_value ) {
+
+            if ( is_int( $_key ) ) {
+                // Integer key means this is a flat array of 'orderby' fields.
+                $_orderby = $_value;
+                $_order   = $order;
+            } else {
+                // Non-integer key means that the key is the field and the value is ASC/DESC.
+                $_orderby = $_key;
+                $_order   = $_value;
+            }
+
+            $parsed = $this->parse_orderby( $_orderby, $table );
+
+            if ( $parsed ) {
+                $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+            }
+        }
+
+        // If no valid clauses were found, order by id.
+        if ( empty( $orderby_array ) ) {
+            $orderby_array[] = "id $order";
+        }
+
+        $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+
+    }
+
+    /**
+     * Execute the query, with the current variables.
+     *
+     * @since 1.0.19
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     */
+    public function query() {
+        global $wpdb;
+
+        $qv =& $this->query_vars;
+
+        // Return a non-null value to bypass the default GetPaid customers query and remember to set the
+        // total_customers property.
+        $this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+
+        if ( null === $this->results ) {
+            $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
+
+            if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
+                $this->results = $wpdb->get_results( $this->request );
+            } else {
+                $this->results = $wpdb->get_col( $this->request );
+            }
+
+            if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+                $found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
+                $this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+            }
+        }
+
+        if ( 'all' === $qv['fields'] ) {
+            foreach ( $this->results as $key => $customer ) {
+                $this->set_cache( $customer->id, $customer, 'getpaid_customers' );
+                $this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
+                $this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
+                $this->results[ $key ] = new GetPaid_Customer( $customer );
+            }
+        }
+
+    }
+
+    /**
+     * Set cache
+     *
+     * @param string  $id
+     * @param mixed   $data
+     * @param string  $group
+     * @param integer $expire
+     * @return boolean
+     */
+    public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        wp_cache_set( $key, $data, $group, $expire );
+    }
+
+    /**
+     * Retrieve query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @return mixed
+     */
+    public function get( $query_var ) {
+        if ( isset( $this->query_vars[ $query_var ] ) ) {
+            return $this->query_vars[ $query_var ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Set query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @param mixed $value Query variable value.
+     */
+    public function set( $query_var, $value ) {
+        $this->query_vars[ $query_var ] = $value;
+    }
+
+    /**
+     * Return the list of customers.
+     *
+     * @since 1.0.19
+     *
+     * @return GetPaid_Customer[]|array Found customers.
+     */
+    public function get_results() {
+        return $this->results;
+    }
+
+    /**
+     * Return the total number of customers for the current query.
+     *
+     * @since 1.0.19
+     *
+     * @return int Number of total customers.
+     */
+    public function get_total() {
+        return $this->total_customers;
+    }
+
+    /**
+     * Parse and sanitize 'orderby' keys passed to the customers query.
+     *
+     * @since 1.0.19
+     *
+     * @param string $orderby Alias for the field to order by.
+     *  @param string $table The current table.
+     * @return string Value to use in the ORDER clause, if `$orderby` is valid.
+     */
+    protected function parse_orderby( $orderby, $table ) {
+
+        $_orderby = '';
+        if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+            $_orderby = "$table.`$orderby`";
+        } elseif ( 'id' === strtolower( $orderby ) ) {
+            $_orderby = "$table.id";
+        } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
+            $include     = wp_parse_id_list( $this->query_vars['include'] );
+            $include_sql = implode( ',', $include );
+            $_orderby    = "FIELD( $table.id, $include_sql )";
+        }
+
+        return $_orderby;
+    }
+
+    /**
+     * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
+     *
+     * @since 1.0.19
+     *
+     * @param string $order The 'order' query variable.
+     * @return string The sanitized 'order' query variable.
+     */
+    protected function parse_order( $order ) {
+        if ( ! is_string( $order ) || empty( $order ) ) {
+            return 'DESC';
+        }
+
+        if ( 'ASC' === strtoupper( $order ) ) {
+            return 'ASC';
+        } else {
+            return 'DESC';
+        }
+    }
 
 }

Spacing +108 added lines, -108 removed lines

@@ -97,9 +97,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if (!is_null($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -112,7 +112,7 @@ 
 	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'include'     => array(),
 			'exclude'     => array(),
@@ -126,16 +126,16 @@ 
 			's'           => '',
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$defaults[ $field ] = 'any';
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$defaults[$field] = 'any';
 
-			if ( '%f' === $type || '%d' === $type ) {
-				$defaults[ $field . '_min' ] = '';
-				$defaults[ $field . '_max' ] = '';
+			if ('%f' === $type || '%d' === $type) {
+				$defaults[$field . '_min'] = '';
+				$defaults[$field . '_max'] = '';
 			}
 		}
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -145,45 +145,45 @@ 
 	 *
 	 * @see self::fill_query_vars() For allowede args and their defaults.
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || !empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
+			$this->query_vars  = $this->fill_query_vars($query);
 		}
 
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+		if (!empty($this->query_vars['fields']) && 'all' !== $this->query_vars['fields']) {
+			$this->query_vars['fields'] = wpinv_parse_list($this->query_vars['fields']);
 		}
 
-		do_action( 'getpaid_pre_get_customers', array( &$this ) );
+		do_action('getpaid_pre_get_customers', array(&$this));
 
 		// Ensure that query vars are filled after 'getpaid_pre_get_customers'.
 		$qv                = & $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
+		$qv                = $this->fill_query_vars($qv);
 		$table             = $wpdb->prefix . 'getpaid_customers';
 		$this->query_from  = "FROM $table";
 
 		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
+		$this->prepare_query_fields($qv, $table);
 
 		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
+		$this->prepare_query_where($qv, $table);
 
 		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
+		$this->prepare_query_order($qv, $table);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
-		do_action_ref_array( 'getpaid_after_customers_query', array( &$this ) );
+		do_action_ref_array('getpaid_after_customers_query', array(&$this));
 	}
 
 	/**
@@ -194,27 +194,27 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_fields( &$qv, $table ) {
+	protected function prepare_query_fields(&$qv, $table) {
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields']   = array_unique( $qv['fields'] );
-			$allowed_fields = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+		if (is_array($qv['fields'])) {
+			$qv['fields']   = array_unique($qv['fields']);
+			$allowed_fields = array_keys(GetPaid_Customer_Data_Store::get_database_fields());
 
 			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				if ( ! in_array( $field, $allowed_fields ) ) {
+			foreach ($qv['fields'] as $field) {
+				if (!in_array($field, $allowed_fields)) {
 					continue;
 				}
 
-				$field          = sanitize_key( $field );
+				$field          = sanitize_key($field);
 				$query_fields[] = "$table.`$field`";
 			}
-			$this->query_fields = implode( ',', $query_fields );
+			$this->query_fields = implode(',', $query_fields);
 		} else {
 			$this->query_fields = "$table.*";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+		if (isset($qv['count_total']) && $qv['count_total']) {
 			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 		}
 
@@ -228,55 +228,55 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_where( &$qv, $table ) {
+	protected function prepare_query_where(&$qv, $table) {
 		global $wpdb;
 		$this->query_where = 'WHERE 1=1';
 
 		// Fields.
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			if ( 'any' !== $qv[ $field ] ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			if ('any' !== $qv[$field]) {
 
 				// In.
-				if ( is_array( $qv[ $field ] ) ) {
-					$in                 = join( ',', array_fill( 0, count( $qv[ $field ] ), $type ) );
-					$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $in )", $qv[ $field ] );
-				} elseif ( ! empty( $qv[ $field ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` = $type", $qv[ $field ] );
+				if (is_array($qv[$field])) {
+					$in                 = join(',', array_fill(0, count($qv[$field]), $type));
+					$this->query_where .= $wpdb->prepare(" AND $table.`status` IN ( $in )", $qv[$field]);
+				} elseif (!empty($qv[$field])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` = $type", $qv[$field]);
 				}
 			}
 
 			// Min/Max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
 				// Min.
-				if ( is_numeric( $qv[ $field . '_min' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` >= $type", $qv[ $field . '_min' ] );
+				if (is_numeric($qv[$field . '_min'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` >= $type", $qv[$field . '_min']);
 				}
 
 				// Max.
-				if ( is_numeric( $qv[ $field . '_max' ] ) ) {
-					$this->query_where .= $wpdb->prepare( " AND $table.`$field` <= $type", $qv[ $field . '_max' ] );
+				if (is_numeric($qv[$field . '_max'])) {
+					$this->query_where .= $wpdb->prepare(" AND $table.`$field` <= $type", $qv[$field . '_max']);
 				}
 			}
 		}
 
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+		if (!empty($qv['include'])) {
+			$include            = implode(',', wp_parse_id_list($qv['include']));
 			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif (!empty($qv['exclude'])) {
+			$exclude            = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
 		}
 
 		// Date queries are allowed for the customer creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.date_created" );
+		if (!empty($qv['date_created_query']) && is_array($qv['date_created_query'])) {
+			$date_created_query = new WP_Date_Query($qv['date_created_query'], "$table.date_created");
 			$this->query_where .= $date_created_query->get_sql();
 		}
 
 		// Search.
-		if ( ! empty( $qv['s'] ) ) {
-			$this->query_where .= $this->get_search_sql( $qv['s'] );
+		if (!empty($qv['s'])) {
+			$this->query_where .= $this->get_search_sql($qv['s']);
 		}
 	}
 
@@ -290,22 +290,22 @@ 
 	 * @param string $string The string to search for.
 	 * @return string
 	 */
-	protected function get_search_sql( $string ) {
+	protected function get_search_sql($string) {
 		global $wpdb;
 
 		$searches = array();
-		$string   = trim( $string, '%' );
-		$like     = '%' . $wpdb->esc_like( $string ) . '%';
+		$string   = trim($string, '%');
+		$like     = '%' . $wpdb->esc_like($string) . '%';
 
-		foreach ( array_keys( GetPaid_Customer_Data_Store::get_database_fields() ) as $col ) {
-			if ( 'id' === $col || 'user_id' === $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		foreach (array_keys(GetPaid_Customer_Data_Store::get_database_fields()) as $col) {
+			if ('id' === $col || 'user_id' === $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );  // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 			}
 		}
 
-		return ' AND (' . implode( ' OR ', $searches ) . ')';
+		return ' AND (' . implode(' OR ', $searches) . ')';
 	}
 
 	/**
@@ -316,24 +316,24 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_order( &$qv, $table ) {
+	protected function prepare_query_order(&$qv, $table) {
 
 		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order       = $this->parse_order($qv['order']);
 
 		// Default order is by 'id' (latest customers).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
+		if (empty($qv['orderby'])) {
+			$qv['orderby'] = array('id');
 		}
 
 		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list( $qv['orderby'] ) );
+		$ordersby      = array_filter(wpinv_parse_list($qv['orderby']));
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
+		foreach ($ordersby as $_key => $_value) {
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order   = $order;
@@ -343,19 +343,19 @@ 
 				$_order   = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby, $table );
+			$parsed = $this->parse_orderby($_orderby, $table);
 
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			if ($parsed) {
+				$orderby_array[] = $parsed . ' ' . $this->parse_order($_order);
 			}
 		}
 
 		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "id $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY ' . implode(', ', $orderby_array);
 
 	}
 
@@ -369,33 +369,33 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		// Return a non-null value to bypass the default GetPaid customers query and remember to set the
 		// total_customers property.
-		$this->results = apply_filters_ref_array( 'getpaid_customers_pre_query', array( null, &$this ) );
+		$this->results = apply_filters_ref_array('getpaid_customers_pre_query', array(null, &$this));
 
-		if ( null === $this->results ) {
+		if (null === $this->results) {
 			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-			if ( ( is_array( $qv['fields'] ) && 1 !== count( $qv['fields'] ) ) || 'all' === $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
+			if ((is_array($qv['fields']) && 1 !== count($qv['fields'])) || 'all' === $qv['fields']) {
+				$this->results = $wpdb->get_results($this->request);
 			} else {
-				$this->results = $wpdb->get_col( $this->request );
+				$this->results = $wpdb->get_col($this->request);
 			}
 
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_customers_query = apply_filters( 'getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_customers = (int) $wpdb->get_var( $found_customers_query );
+			if (isset($qv['count_total']) && $qv['count_total']) {
+				$found_customers_query = apply_filters('getpaid_found_customers_query', 'SELECT FOUND_ROWS()', $this);
+				$this->total_customers = (int) $wpdb->get_var($found_customers_query);
 			}
 		}
 
-		if ( 'all' === $qv['fields'] ) {
-			foreach ( $this->results as $key => $customer ) {
-				$this->set_cache( $customer->id, $customer, 'getpaid_customers' );
-				$this->set_cache( $customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id' );
-				$this->set_cache( $customer->email, $customer->id, 'getpaid_customer_ids_by_email' );
-				$this->results[ $key ] = new GetPaid_Customer( $customer );
+		if ('all' === $qv['fields']) {
+			foreach ($this->results as $key => $customer) {
+				$this->set_cache($customer->id, $customer, 'getpaid_customers');
+				$this->set_cache($customer->user_id, $customer->id, 'getpaid_customer_ids_by_user_id');
+				$this->set_cache($customer->email, $customer->id, 'getpaid_customer_ids_by_email');
+				$this->results[$key] = new GetPaid_Customer($customer);
 			}
 		}
 
@@ -410,13 +410,13 @@ 
 	 * @param integer $expire
 	 * @return boolean
 	 */
-	public function set_cache( $key, $data, $group = '', $expire = 0 ) {
+	public function set_cache($key, $data, $group = '', $expire = 0) {
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		wp_cache_set( $key, $data, $group, $expire );
+		wp_cache_set($key, $data, $group, $expire);
 	}
 
 	/**
@@ -427,9 +427,9 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return null;
@@ -443,8 +443,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
+	public function set($query_var, $value) {
+		$this->query_vars[$query_var] = $value;
 	}
 
 	/**
@@ -478,16 +478,16 @@ 
 	 *  @param string $table The current table.
 	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby, $table ) {
+	protected function parse_orderby($orderby, $table) {
 
 		$_orderby = '';
-		if ( in_array( $orderby, array_keys( GetPaid_Customer_Data_Store::get_database_fields() ), true ) ) {
+		if (in_array($orderby, array_keys(GetPaid_Customer_Data_Store::get_database_fields()), true)) {
 			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
+		} elseif ('id' === strtolower($orderby)) {
 			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && !empty($this->query_vars['include'])) {
+			$include     = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby    = "FIELD( $table.id, $include_sql )";
 		}
 
@@ -502,12 +502,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if (!is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

includes/admin/class-wpinv-customers-table.php

Indentation +296 added lines, -296 removed lines

@@ -11,7 +11,7 @@ 
 
 // Load WP_List_Table if not loaded
 if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,303 +23,303 @@ 
  */
 class WPInv_Customers_Table extends WP_List_Table {
 
-	/**
-	 * @var int Number of items per page
-	 * @since 1.0.19
-	 */
-	public $per_page = 25;
-
-	/**
-	 * @var int Number of items
-	 * @since 1.0.19
-	 */
-	public $total_count = 0;
-
-	public $query;
-
-	/**
-	 * Get things started
-	 *
-	 * @since 1.0.19
-	 * @see WP_List_Table::__construct()
-	 */
-	public function __construct() {
-
-		// Set parent defaults
-		parent::__construct(
+    /**
+     * @var int Number of items per page
+     * @since 1.0.19
+     */
+    public $per_page = 25;
+
+    /**
+     * @var int Number of items
+     * @since 1.0.19
+     */
+    public $total_count = 0;
+
+    public $query;
+
+    /**
+     * Get things started
+     *
+     * @since 1.0.19
+     * @see WP_List_Table::__construct()
+     */
+    public function __construct() {
+
+        // Set parent defaults
+        parent::__construct(
             array(
-				'singular' => 'id',
-				'plural'   => 'ids',
-				'ajax'     => false,
+                'singular' => 'id',
+                'plural'   => 'ids',
+                'ajax'     => false,
             )
         );
 
-	}
-
-	/**
-	 * Gets the name of the primary column.
-	 *
-	 * @since 1.0.19
-	 * @access protected
-	 *
-	 * @return string Name of the primary column.
-	 */
-	protected function get_primary_column_name() {
-		return 'customer';
-	}
-
-	/**
-	 * This function renders most of the columns in the list table.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 * @param string $column_name The name of the column
-	 *
-	 * @return string Column Name
-	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
-	}
-
-	/**
-	 * Displays the country column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
-		}
-		return esc_html( $country );
-	}
-
-	/**
-	 * Displays the state column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
-		}
-
-		return esc_html( $state );
-	}
-
-	/**
-	 * Displays the signup column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
-	}
-
-	/**
-	 * Displays the total spent column.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param GetPaid_Customer $customer
-	 *
-	 * @return string Column Name
-	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
-
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
-
-	}
-
-	/**
-	 * Displays the customers name
-	 *
-	 * @param  GetPaid_Customer $customer customer.
-	 * @return string
-	 */
-	public function column_customer( $customer ) {
-
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
-
-		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
-		$row_actions = $view_url ? $this->row_actions(
-			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
-			)
-		) : '';
-
-		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
-
-		if ( ! empty( $name ) ) {
-			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
-		}
-
-		$email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
-
-		return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
-
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @since 1.0.19
-	 * @return int Current page number
-	 */
-	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Returns bulk actions.
-	 *
-	 * @since 1.0.19
-	 * @return void
-	 */
-	public function bulk_actions( $which = '' ) {
-		return array();
-	}
-
-	/**
-	 *  Prepares the display query
-	 */
-	public function prepare_query() {
-
-		// Prepare query args.
-		$query = array(
-			'number' => $this->per_page,
-			'paged'  => $this->get_paged(),
-		);
-
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-		}
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
-
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				}
-			}
-		}
-
-		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
-		$this->total_count = $this->query->get_total();
-		$this->items       = $this->query->get_results();
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 */
-	public function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array();
-		$sortable = $this->get_sortable_columns();
-		$this->prepare_query();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$this->set_pagination_args(
-			array(
-				'total_items' => $this->total_count,
-				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
-			)
-		);
-	}
-
-	/**
-	 * Sortable table columns.
-	 *
-	 * @return array
-	 */
-	public function get_sortable_columns() {
-		$sortable = array(
-			'customer' => array( 'first_name', true ),
-		);
-
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
-		}
-
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
-	}
-
-	/**
-	 * Table columns
-	 *
-	 * @return array
-	 */
-	public function get_columns() {
-		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
-		);
-
-		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
-
-			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
-			}
-		}
-
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
-
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
-	}
+    }
+
+    /**
+     * Gets the name of the primary column.
+     *
+     * @since 1.0.19
+     * @access protected
+     *
+     * @return string Name of the primary column.
+     */
+    protected function get_primary_column_name() {
+        return 'customer';
+    }
+
+    /**
+     * This function renders most of the columns in the list table.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     * @param string $column_name The name of the column
+     *
+     * @return string Column Name
+     */
+    public function column_default( $customer, $column_name ) {
+        $value = esc_html( $customer->get( $column_name ) );
+        return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+    }
+
+    /**
+     * Displays the country column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_country( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        if ( $country ) {
+            $country = wpinv_country_name( $country );
+        }
+        return esc_html( $country );
+    }
+
+    /**
+     * Displays the state column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_state( $customer ) {
+        $country = wpinv_sanitize_country( $customer->get( 'country' ) );
+        $state   = $customer->get( 'state' );
+        if ( $state ) {
+            $state = wpinv_state_name( $state, $country );
+        }
+
+        return esc_html( $state );
+    }
+
+    /**
+     * Displays the signup column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_date_created( $customer ) {
+        return getpaid_format_date_value( $customer->get( 'date_created' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_value( $customer ) {
+        return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+    }
+
+    /**
+     * Displays the total spent column.
+     *
+     * @since 1.0.19
+     *
+     * @param GetPaid_Customer $customer
+     *
+     * @return string Column Name
+     */
+    public function column_purchase_count( $customer ) {
+        $value = $customer->get( 'purchase_count' );
+        $url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+
+        return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+
+    }
+
+    /**
+     * Displays the customers name
+     *
+     * @param  GetPaid_Customer $customer customer.
+     * @return string
+     */
+    public function column_customer( $customer ) {
+
+        $first_name = $customer->get( 'first_name' );
+        $last_name  = $customer->get( 'last_name' );
+        $email      = $customer->get( 'email' );
+        $avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+
+        // Customer view URL.
+        $view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+        $row_actions = $view_url ? $this->row_actions(
+            array(
+                'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+            )
+        ) : '';
+
+        // Customer's name.
+        $name   = esc_html( trim( "$first_name $last_name" ) );
+
+        if ( ! empty( $name ) ) {
+            $name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
+        }
+
+        $email = "<div class='row-title'><a href='mailto:$email'>$email</a></div>";
+
+        return "<div style='display: flex;'><div>$avatar</div><div style='margin-left: 10px;'>$name<strong>$email</strong>$row_actions</div></div>";
+
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @since 1.0.19
+     * @return int Current page number
+     */
+    public function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Returns bulk actions.
+     *
+     * @since 1.0.19
+     * @return void
+     */
+    public function bulk_actions( $which = '' ) {
+        return array();
+    }
+
+    /**
+     *  Prepares the display query
+     */
+    public function prepare_query() {
+
+        // Prepare query args.
+        $query = array(
+            'number' => $this->per_page,
+            'paged'  => $this->get_paged(),
+        );
+
+        foreach ( array( 'orderby', 'order', 's' ) as $field ) {
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+        }
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+
+            if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            // Min max.
+            if ( '%f' === $type || '%d' === $type ) {
+
+                if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+
+                if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                    $query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                }
+            }
+        }
+
+        // Prepare class properties.
+        $this->query       = getpaid_get_customers( $query, 'query' );
+        $this->total_count = $this->query->get_total();
+        $this->items       = $this->query->get_results();
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     */
+    public function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array();
+        $sortable = $this->get_sortable_columns();
+        $this->prepare_query();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $this->set_pagination_args(
+            array(
+                'total_items' => $this->total_count,
+                'per_page'    => $this->per_page,
+                'total_pages' => ceil( $this->total_count / $this->per_page ),
+            )
+        );
+    }
+
+    /**
+     * Sortable table columns.
+     *
+     * @return array
+     */
+    public function get_sortable_columns() {
+        $sortable = array(
+            'customer' => array( 'first_name', true ),
+        );
+
+        foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+            $sortable[ $field ] = array( $field, true );
+        }
+
+        return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+    }
+
+    /**
+     * Table columns
+     *
+     * @return array
+     */
+    public function get_columns() {
+        $columns = array(
+            'customer' => __( 'Customer', 'invoicing' ),
+        );
+
+        // Add address fields.
+        foreach ( getpaid_user_address_fields() as $key => $value ) {
+
+            // Skip id, user_id and email.
+            if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
+                $columns[ $key ] = $value;
+            }
+        }
+
+        $columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
+        $columns['purchase_count'] = __( 'Invoices', 'invoicing' );
+        $columns['date_created']   = __( 'Date created', 'invoicing' );
+
+        return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+    }
 }

Spacing +61 added lines, -61 removed lines

@@ -5,12 +5,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -78,9 +78,9 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $customer, $column_name ) {
-		$value = esc_html( $customer->get( $column_name ) );
-		return apply_filters( 'wpinv_customers_table_column' . $column_name, $value, $customer );
+	public function column_default($customer, $column_name) {
+		$value = esc_html($customer->get($column_name));
+		return apply_filters('wpinv_customers_table_column' . $column_name, $value, $customer);
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_country( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		if ( $country ) {
-			$country = wpinv_country_name( $country );
+	public function column_country($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		if ($country) {
+			$country = wpinv_country_name($country);
 		}
-		return esc_html( $country );
+		return esc_html($country);
 	}
 
 	/**
@@ -109,14 +109,14 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_state( $customer ) {
-		$country = wpinv_sanitize_country( $customer->get( 'country' ) );
-		$state   = $customer->get( 'state' );
-		if ( $state ) {
-			$state = wpinv_state_name( $state, $country );
+	public function column_state($customer) {
+		$country = wpinv_sanitize_country($customer->get('country'));
+		$state   = $customer->get('state');
+		if ($state) {
+			$state = wpinv_state_name($state, $country);
 		}
 
-		return esc_html( $state );
+		return esc_html($state);
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_date_created( $customer ) {
-		return getpaid_format_date_value( $customer->get( 'date_created' ) );
+	public function column_date_created($customer) {
+		return getpaid_format_date_value($customer->get('date_created'));
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_value( $customer ) {
-		return wpinv_price( (float) $customer->get( 'purchase_value' ) );
+	public function column_purchase_value($customer) {
+		return wpinv_price((float) $customer->get('purchase_value'));
 	}
 
 	/**
@@ -154,11 +154,11 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_purchase_count( $customer ) {
-		$value = $customer->get( 'purchase_count' );
-		$url   = $customer->get( 'user_id' ) ? add_query_arg( array( 'post_type' => 'wpi_invoice', 'author' => $customer->get( 'user_id' ), ), admin_url( 'edit.php' ) ) : '';
+	public function column_purchase_count($customer) {
+		$value = $customer->get('purchase_count');
+		$url   = $customer->get('user_id') ? add_query_arg(array('post_type' => 'wpi_invoice', 'author' => $customer->get('user_id'),), admin_url('edit.php')) : '';
 
-		return ( empty( $value ) || empty( $url ) ) ? (int) $value : '<a href="' . esc_url( $url ) . '">' . absint( $value ) . '</a>';
+		return (empty($value) || empty($url)) ? (int) $value : '<a href="' . esc_url($url) . '">' . absint($value) . '</a>';
 
 	}
 
@@ -168,25 +168,25 @@ 
 	 * @param  GetPaid_Customer $customer customer.
 	 * @return string
 	 */
-	public function column_customer( $customer ) {
+	public function column_customer($customer) {
 
-		$first_name = $customer->get( 'first_name' );
-		$last_name  = $customer->get( 'last_name' );
-		$email      = $customer->get( 'email' );
-		$avatar     = get_avatar( $customer->get( 'user_id' ) ? $customer->get( 'user_id' ) : $email, 32 );
+		$first_name = $customer->get('first_name');
+		$last_name  = $customer->get('last_name');
+		$email      = $customer->get('email');
+		$avatar     = get_avatar($customer->get('user_id') ? $customer->get('user_id') : $email, 32);
 
 		// Customer view URL.
-		$view_url    = $customer->get( 'user_id' ) ? esc_url( add_query_arg( 'user_id', $customer->get( 'user_id' ), admin_url( 'user-edit.php' ) ) ) : false;
+		$view_url    = $customer->get('user_id') ? esc_url(add_query_arg('user_id', $customer->get('user_id'), admin_url('user-edit.php'))) : false;
 		$row_actions = $view_url ? $this->row_actions(
 			array(
-				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __( 'Edit Details', 'invoicing' ) . '</a>',
+				'view' => '<a href="' . $view_url . '#getpaid-fieldset-billing">' . __('Edit Details', 'invoicing') . '</a>',
 			)
 		) : '';
 
 		// Customer's name.
-		$name   = esc_html( trim( "$first_name $last_name" ) );
+		$name = esc_html(trim("$first_name $last_name"));
 
-		if ( ! empty( $name ) ) {
+		if (!empty($name)) {
 			$name = "<div style='overflow: hidden;height: 18px;'>$name</div>";
 		}
 
@@ -203,7 +203,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -212,7 +212,7 @@ 
 	 * @since 1.0.19
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		return array();
 	}
 
@@ -227,33 +227,33 @@ 
 			'paged'  => $this->get_paged(),
 		);
 
-		foreach ( array( 'orderby', 'order', 's' ) as $field ) {
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		foreach (array('orderby', 'order', 's') as $field) {
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 		}
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
 
-			if ( isset( $_GET[ $field ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$query[ $field ] = wpinv_clean( rawurlencode_deep( $_GET[ $field ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if (isset($_GET[$field])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$query[$field] = wpinv_clean(rawurlencode_deep($_GET[$field])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 
 			// Min max.
-			if ( '%f' === $type || '%d' === $type ) {
+			if ('%f' === $type || '%d' === $type) {
 
-				if ( isset( $_GET[ $field . '_min' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_min' ] = floatval( $_GET[ $field . '_min' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_min'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_min'] = floatval($_GET[$field . '_min']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 
-				if ( isset( $_GET[ $field . '_max' ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-					$query[ $field . '_max' ] = floatval( $_GET[ $field . '_max' ] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				if (isset($_GET[$field . '_max'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					$query[$field . '_max'] = floatval($_GET[$field . '_max']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 				}
 			}
 		}
 
 		// Prepare class properties.
-		$this->query       = getpaid_get_customers( $query, 'query' );
+		$this->query       = getpaid_get_customers($query, 'query');
 		$this->total_count = $this->query->get_total();
 		$this->items       = $this->query->get_results();
 	}
@@ -269,13 +269,13 @@ 
 		$sortable = $this->get_sortable_columns();
 		$this->prepare_query();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->set_pagination_args(
 			array(
 				'total_items' => $this->total_count,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $this->total_count / $this->per_page ),
+				'total_pages' => ceil($this->total_count / $this->per_page),
 			)
 		);
 	}
@@ -287,14 +287,14 @@ 
 	 */
 	public function get_sortable_columns() {
 		$sortable = array(
-			'customer' => array( 'first_name', true ),
+			'customer' => array('first_name', true),
 		);
 
-		foreach ( GetPaid_Customer_Data_Store::get_database_fields() as $field => $type ) {
-			$sortable[ $field ] = array( $field, true );
+		foreach (GetPaid_Customer_Data_Store::get_database_fields() as $field => $type) {
+			$sortable[$field] = array($field, true);
 		}
 
-		return apply_filters( 'manage_getpaid_customers_sortable_table_columns', $sortable );
+		return apply_filters('manage_getpaid_customers_sortable_table_columns', $sortable);
 	}
 
 	/**
@@ -304,22 +304,22 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'customer' => __( 'Customer', 'invoicing' ),
+			'customer' => __('Customer', 'invoicing'),
 		);
 
 		// Add address fields.
-		foreach ( getpaid_user_address_fields() as $key => $value ) {
+		foreach (getpaid_user_address_fields() as $key => $value) {
 
 			// Skip id, user_id and email.
-			if ( ! in_array( $key, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name' ), true ) ) {
-				$columns[ $key ] = $value;
+			if (!in_array($key, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid', 'first_name', 'last_name'), true)) {
+				$columns[$key] = $value;
 			}
 		}
 
-		$columns['purchase_value'] = __( 'Total Spend', 'invoicing' );
-		$columns['purchase_count'] = __( 'Invoices', 'invoicing' );
-		$columns['date_created']   = __( 'Date created', 'invoicing' );
+		$columns['purchase_value'] = __('Total Spend', 'invoicing');
+		$columns['purchase_count'] = __('Invoices', 'invoicing');
+		$columns['date_created']   = __('Date created', 'invoicing');
 
-		return apply_filters( 'manage_getpaid_customers_table_columns', $columns );
+		return apply_filters('manage_getpaid_customers_table_columns', $columns);
 	}
 }

templates/payment-forms-admin/edit/discount.php

Spacing +17 added lines, -17 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Input Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Input Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.input_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Button Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Button Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.button_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
-    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Button Type', 'invoicing' ); ?></label>
+    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Button Type', 'invoicing'); ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option disabled><?php esc_html_e( 'Select button type', 'invoicing' ); ?></option>
-        <option value='btn-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='btn-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='btn-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='btn-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='btn-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='btn-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='btn-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='btn-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='btn-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option disabled><?php esc_html_e('Select button type', 'invoicing'); ?></option>
+        <option value='btn-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='btn-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='btn-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='btn-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='btn-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='btn-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='btn-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='btn-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='btn-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php esc_html_e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php esc_html_e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>

templates/payment-forms/elements/discount.php

Spacing +9 added lines, -9 removed lines

@@ -8,35 +8,35 @@
  * @var GetPaid_Payment_Form $form The current payment form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( ! getpaid_has_published_discount() ) {
+if (!getpaid_has_published_discount()) {
     return;
 }
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     $description = "<small class='form-text text-muted'>$description</small>";
 } else {
     $description = '';
 }
 
 $discount_code = '';
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
     $discount_code = $form->invoice->get_discount_code();
 }
 
-$class = empty( $class ) ? 'btn-secondary' : sanitize_html_class( $class );
+$class = empty($class) ? 'btn-secondary' : sanitize_html_class($class);
 ?>
 
 <div class="form-group mb-3">
     <div class="getpaid-discount-field  border rounded p-3">
         <div class="getpaid-discount-field-inner d-flex flex-column flex-md-row">
-            <input name="discount" placeholder="<?php echo esc_attr( $input_label ); ?>" value="<?php echo esc_attr( $discount_code ); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
-            <a href="#" class="btn <?php echo esc_attr( $class ); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html( $button_label ); ?></a>
+            <input name="discount" placeholder="<?php echo esc_attr($input_label); ?>" value="<?php echo esc_attr($discount_code); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
+            <a href="#" class="btn <?php echo esc_attr($class); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html($button_label); ?></a>
         </div>
-        <?php echo wp_kses_post( $description ); ?>
+        <?php echo wp_kses_post($description); ?>
         <div class="getpaid-custom-payment-form-errors alert alert-danger d-none"></div>
-        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e( 'Discount code applied!', 'invoicing' ); ?></div>
+        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e('Discount code applied!', 'invoicing'); ?></div>
     </div>
 </div>
 

templates/emails/wpinv-email-subscription_active.php

Spacing +4 added lines, -4 removed lines

@@ -8,15 +8,15 @@
  * @var WPInv_Subscription $object
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $invoice = $object->get_parent_payment();
 
 // Print the email header.
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
 // Generate the custom message body.
-echo wp_kses_post( $message_body );
+echo wp_kses_post($message_body);
 
 // Print the email footer.
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-pagination.php

Indentation +108 added lines, -108 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,112 +11,112 @@ 
  */
 class AUI_Component_Pagination {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function get( $args = array() ) {
-		global $wp_query, $aui_bs5;
-
-		$defaults = array(
-			'class'              => '',
-			'mid_size'           => 2,
-			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
-			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
-			'before_paging'      => '',
-			'after_paging'       => '',
-			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
-			'links'              => array(), // an array of links if using custom links, this includes the a tag.
-			'rounded_style'      => false,
-			'custom_next_text'   => '', // Custom next page text
-			'custom_prev_text'   => '', // Custom prev page text
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
-			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
-
-			$class = !empty($args['class']) ? $args['class'] : '';
-
-			$custom_prev_link = '';
-			$custom_next_link = '';
-
-			// make the output bootstrap ready
-			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
-					$_link = $link;
-
-					if ( $aui_bs5 ) {
-						$link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
-						$link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
-						$links_html .= "<li class='page-item mx-0'>";
-						$link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-						$links_html .=  $link;
-						$links_html .= "</li>";
-					} else {
-						$active = strpos( $link, 'current' ) !== false ? 'active' : '';
-						$links_html .= "<li class='page-item $active'>";
-						$links_html .= str_replace( "page-numbers", "page-link", $link );
-						$links_html .= "</li>";
-					}
-
-					if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
-						$link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-
-						if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
-							$custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
-						} else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
-							$custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
-						}
-					}
-				}
-			}
-			$links_html .= "</ul>";
-
-			if ( $links ) {
-				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
-				$output .= '</section>';
-			}
-
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
-		}
-
-		if ( $output ) {
-			if ( $custom_next_link || $custom_prev_link ) {
-				$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-				$current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
-
-				$output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
-			}
-
-			if ( ! empty( $args['before_paging'] ) ) {
-				$output = $args['before_paging'] . $output;
-			}
-
-			if ( ! empty( $args['after_paging'] ) ) {
-				$output = $output . $args['after_paging'];
-			}
-		}
-
-		return $output;
-	}
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function get( $args = array() ) {
+        global $wp_query, $aui_bs5;
+
+        $defaults = array(
+            'class'              => '',
+            'mid_size'           => 2,
+            'prev_text'          => '<i class="fas fa-chevron-left"></i>',
+            'next_text'          => '<i class="fas fa-chevron-right"></i>',
+            'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
+            'before_paging'      => '',
+            'after_paging'       => '',
+            'type'               => 'array',
+            'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+            'links'              => array(), // an array of links if using custom links, this includes the a tag.
+            'rounded_style'      => false,
+            'custom_next_text'   => '', // Custom next page text
+            'custom_prev_text'   => '', // Custom prev page text
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // Don't print empty markup if there's only one page.
+        if ( $args['total'] > 1 ) {
+            // Set up paginated links.
+            $links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+
+            $class = !empty($args['class']) ? $args['class'] : '';
+
+            $custom_prev_link = '';
+            $custom_next_link = '';
+
+            // make the output bootstrap ready
+            $links_html = "<ul class='pagination m-0 p-0 $class'>";
+            if ( ! empty( $links ) ) {
+                foreach ( $links as $link ) {
+                    $_link = $link;
+
+                    if ( $aui_bs5 ) {
+                        $link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
+                        $link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
+                        $links_html .= "<li class='page-item mx-0'>";
+                        $link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
+                        $link = str_replace( 'text-dark link-primary current', 'current', $link );
+                        $links_html .=  $link;
+                        $links_html .= "</li>";
+                    } else {
+                        $active = strpos( $link, 'current' ) !== false ? 'active' : '';
+                        $links_html .= "<li class='page-item $active'>";
+                        $links_html .= str_replace( "page-numbers", "page-link", $link );
+                        $links_html .= "</li>";
+                    }
+
+                    if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
+                        $link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
+                        $link = str_replace( 'text-dark link-primary current', 'current', $link );
+
+                        if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
+                            $custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
+                        } else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
+                            $custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
+                        }
+                    }
+                }
+            }
+            $links_html .= "</ul>";
+
+            if ( $links ) {
+                $output .= '<section class="px-0 py-2 w-100">';
+                $output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+                $output .= '</section>';
+            }
+
+            $output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
+            $output = str_replace( "nav-links", "aui-nav-links", $output );
+        }
+
+        if ( $output ) {
+            if ( $custom_next_link || $custom_prev_link ) {
+                $total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
+                $current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
+
+                $output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
+            }
+
+            if ( ! empty( $args['before_paging'] ) ) {
+                $output = $args['before_paging'] . $output;
+            }
+
+            if ( ! empty( $args['after_paging'] ) ) {
+                $output = $output . $args['after_paging'];
+            }
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get( $args = array() ) {
+	public static function get($args = array()) {
 		global $wp_query, $aui_bs5;
 
 		$defaults = array(
@@ -26,11 +26,11 @@ 
 			'mid_size'           => 2,
 			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
 			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
+			'screen_reader_text' => __('Posts navigation', 'ayecode-connect'),
 			'before_paging'      => '',
 			'after_paging'       => '',
 			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+			'total'              => isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1,
 			'links'              => array(), // an array of links if using custom links, this includes the a tag.
 			'rounded_style'      => false,
 			'custom_next_text'   => '', // Custom next page text
@@ -40,14 +40,14 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
 		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
+		if ($args['total'] > 1) {
 			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+			$links = !empty($args['links']) ? $args['links'] : paginate_links($args);
 
 			$class = !empty($args['class']) ? $args['class'] : '';
 
@@ -56,62 +56,62 @@ 
 
 			// make the output bootstrap ready
 			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
+			if (!empty($links)) {
+				foreach ($links as $link) {
 					$_link = $link;
 
-					if ( $aui_bs5 ) {
+					if ($aui_bs5) {
 						$link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
 						$link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
 						$links_html .= "<li class='page-item mx-0'>";
-						$link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-						$links_html .=  $link;
+						$link = str_replace(array("page-numbers", " current"), array($link_class, $link_class_active), $link);
+						$link = str_replace('text-dark link-primary current', 'current', $link);
+						$links_html .= $link;
 						$links_html .= "</li>";
 					} else {
-						$active = strpos( $link, 'current' ) !== false ? 'active' : '';
+						$active = strpos($link, 'current') !== false ? 'active' : '';
 						$links_html .= "<li class='page-item $active'>";
-						$links_html .= str_replace( "page-numbers", "page-link", $link );
+						$links_html .= str_replace("page-numbers", "page-link", $link);
 						$links_html .= "</li>";
 					}
 
-					if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
-						$link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
+					if (strpos($_link, 'next page-numbers') || strpos($_link, 'prev page-numbers')) {
+						$link = str_replace(array("page-numbers", " current"), array('btn btn-outline-primary rounded' . ($args['rounded_style'] ? '-pill' : '') . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill'), $_link);
+						$link = str_replace('text-dark link-primary current', 'current', $link);
 
-						if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
-							$custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
-						} else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
-							$custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
+						if (strpos($_link, 'next page-numbers') && !empty($args['custom_next_text'])) {
+							$custom_next_link = str_replace($args['next_text'], $args['custom_next_text'], $link);
+						} else if (strpos($_link, 'prev page-numbers') && !empty($args['custom_prev_text'])) {
+							$custom_prev_link = str_replace($args['prev_text'], $args['custom_prev_text'], $link);
 						}
 					}
 				}
 			}
 			$links_html .= "</ul>";
 
-			if ( $links ) {
+			if ($links) {
 				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+				$output .= _navigation_markup($links_html, 'aui-pagination', $args['screen_reader_text']);
 				$output .= '</section>';
 			}
 
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
+			$output = str_replace("screen-reader-text", "screen-reader-text sr-only", $output);
+			$output = str_replace("nav-links", "aui-nav-links", $output);
 		}
 
-		if ( $output ) {
-			if ( $custom_next_link || $custom_prev_link ) {
-				$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-				$current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
+		if ($output) {
+			if ($custom_next_link || $custom_prev_link) {
+				$total   = isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1;
+				$current = get_query_var('paged') ? (int) get_query_var('paged') : 1;
 
 				$output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
 			}
 
-			if ( ! empty( $args['before_paging'] ) ) {
+			if (!empty($args['before_paging'])) {
 				$output = $args['before_paging'] . $output;
 			}
 
-			if ( ! empty( $args['after_paging'] ) ) {
+			if (!empty($args['after_paging'])) {
 				$output = $output . $args['after_paging'];
 			}
 		}

vendor/ayecode/wp-ayecode-ui/includes/inc/bs5-js.php

Indentation +2 added lines, -2 removed lines

@@ -1001,8 +1001,8 @@
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+    // FSE tweaks.
+    if(!empty($_REQUEST['postType'])){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -1013,7 +1013,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+	if (!empty($_REQUEST['postType'])) { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +302 added lines, -302 removed lines

@@ -1,264 +1,264 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.4";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.4";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
+                    'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
+                    'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
+                    'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -305,9 +305,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -353,23 +353,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -435,38 +435,38 @@ 
 					});
 				} 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
-			}
-
-			return $show;
-		}
-	}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
+            }
+
+            return $show;
+        }
+    }
 }

Spacing +78 added lines, -78 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
+if (!class_exists("AyeCode_Connect_Helper")) {
 	/**
 	 * Allow the quick setup and connection of our AyeCode Connect plugin.
 	 *
@@ -28,50 +28,50 @@ 
 		 * @param array $strings
 		 * @param array $pages
 		 */
-		public function __construct( $strings = array(), $pages = array() ) {
+		public function __construct($strings = array(), $pages = array()) {
 			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+			if (!$this->is_localhost() && current_user_can('manage_options')) {
 				// set default strings
 				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+					'connect_title'     => __("Thanks for choosing an AyeCode Product!", 'ayecode-connect'),
+					'connect_external'  => __("Please confirm you wish to connect your site?", 'ayecode-connect'),
+					'connect'           => wp_sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect'), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+					'connect_button'    => __("Connect Site", 'ayecode-connect'),
+					'connecting_button' => __("Connecting...", 'ayecode-connect'),
+					'error_localhost'   => __("This service will only work with a live domain, not a localhost.", 'ayecode-connect'),
+					'error'             => __("Something went wrong, please refresh and try again.", 'ayecode-connect'),
 				);
-				$this->strings   = array_merge( $default_strings, $strings );
+				$this->strings = array_merge($default_strings, $strings);
 
 				// set default pages
 				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
+				$this->pages   = array_merge($default_pages, $pages);
 
 				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+				add_action('admin_notices', array($this, 'ayecode_connect_install_notice'));
 
 				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+				if (!has_action('wp_ajax_ayecode_connect_helper')) {
+					add_action('wp_ajax_ayecode_connect_helper', array($this, 'ayecode_connect_install'));
 				}
 			}
 
 			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+			if (!has_action('wp_ajax_nopriv_ayecode_connect_helper_installed')) {
+				add_action('wp_ajax_nopriv_ayecode_connect_helper_installed', array($this, 'ayecode_connect_helper_installed'));
 			}
 		}
 
 		/**
 		 * Give a way to check we can connect via a external redirect.
 		 */
-		public function ayecode_connect_helper_installed(){
+		public function ayecode_connect_helper_installed() {
 			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION, '2.0.0.79', '>') ? 1 : 0,
+				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION, '1.2.1.5', '>') ? 1 : 0,
+				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION, '1.0.14', '>') ? 1 : 0,
 			);
-			wp_send_json_success( $active );
+			wp_send_json_success($active);
 			wp_die();
 		}
 
@@ -82,9 +82,9 @@ 
 		 *
 		 * @return string
 		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
+		private function format_plugin_slug($key) {
+			$slug = explode('/', $key);
+			$slug = explode('.', end($slug));
 
 			return $slug[0];
 		}
@@ -94,45 +94,45 @@ 
 		 */
 		public function ayecode_connect_install() {
 			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
+			if ($this->is_localhost()) {
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 
 			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+			wp_clear_scheduled_hook('geodir_plugin_background_installer', func_get_args());
 
 			$success     = true;
 			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+			if (!empty($plugin_slug)) {
+				require_once(ABSPATH . 'wp-admin/includes/file.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
+				require_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 				WP_Filesystem();
 
 				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+				$upgrader          = new WP_Upgrader($skin);
+				$installed_plugins = array_map(array($this, 'format_plugin_slug'), array_keys(get_plugins()));
 				$plugin_slug       = $plugin_slug;
 				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
 				$installed         = false;
 				$activate          = false;
 
 				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
+				if (in_array($plugin_slug, $installed_plugins)) {
 					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
+					$activate  = !is_plugin_active($plugin);
 				}
 
 				// Install this thing!
-				if ( ! $installed ) {
+				if (!$installed) {
 
 					// Suppress feedback
 					ob_start();
 
 					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
+						$plugin_information = plugins_api('plugin_information', array(
 							'slug'   => $plugin_slug,
 							'fields' => array(
 								'short_description' => false,
@@ -149,26 +149,26 @@ 
 								'author_profile'    => false,
 								'author'            => false,
 							),
-						) );
+						));
 
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
+						if (is_wp_error($plugin_information)) {
+							throw new Exception($plugin_information->get_error_message());
 						}
 
 						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
+						$download = $upgrader->download_package($package);
 
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
+						if (is_wp_error($download)) {
+							throw new Exception($download->get_error_message());
 						}
 
-						$working_dir = $upgrader->unpack_package( $download, true );
+						$working_dir = $upgrader->unpack_package($download, true);
 
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
+						if (is_wp_error($working_dir)) {
+							throw new Exception($working_dir->get_error_message());
 						}
 
-						$result = $upgrader->install_package( array(
+						$result = $upgrader->install_package(array(
 							'source'                      => $working_dir,
 							'destination'                 => WP_PLUGIN_DIR,
 							'clear_destination'           => false,
@@ -178,15 +178,15 @@ 
 								'type'   => 'plugin',
 								'action' => 'install',
 							),
-						) );
+						));
 
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
+						if (is_wp_error($result)) {
+							throw new Exception($result->get_error_message());
 						}
 
 						$activate = true;
 
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 
@@ -197,30 +197,30 @@ 
 				wp_clean_plugins_cache();
 
 				// Activate this thing
-				if ( $activate ) {
+				if ($activate) {
 					try {
-						$result = activate_plugin( $plugin );
+						$result = activate_plugin($plugin);
 
-						if ( is_wp_error( $result ) ) {
+						if (is_wp_error($result)) {
 							$success = false;
 						} else {
 							$success = true;
 						}
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 				}
 			}
 
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
+			if ($success && function_exists('ayecode_connect_args')) {
+				ayecode_connect(); // init
 				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
+				$client      = new AyeCode_Connect($args);
+				$redirect_to = !empty($_POST['redirect_to']) ? esc_url_raw($_POST['redirect_to']) : '';
+				$redirect    = $client->build_connect_url($redirect_to);
+				wp_send_json_success(array('connect_url' => $redirect));
 			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 			wp_die();
 		}
@@ -233,7 +233,7 @@ 
 		public function is_localhost() {
 			$localhost = false;
 
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+			$host              = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
 			$localhost_domains = array(
 				'localhost',
 				'localhost.localdomain',
@@ -241,7 +241,7 @@ 
 				'::1'
 			);
 
-			if ( in_array( $host, $localhost_domains ) ) {
+			if (in_array($host, $localhost_domains)) {
 				$localhost = true;
 			}
 
@@ -252,7 +252,7 @@ 
 		 * Show notice to connect site.
 		 */
 		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
+			if ($this->maybe_show()) {
 				$connect_title_string     = $this->strings['connect_title'];
 				$connect_external_string  = $this->strings['connect_external'];
 				$connect_string           = $this->strings['connect'];
@@ -294,19 +294,19 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_title_string); ?></h3>
 					<p><?php echo $connect_string; ?>
 					</p>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 				</div>
 
 				<?php
 				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 					?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
@@ -344,11 +344,11 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_external_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_external_string); ?></h3>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 						</div>
 					</div>
@@ -366,7 +366,7 @@ 
 		public function script() {
 
 			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+			if (!empty($_REQUEST['external-connect-request'])) {
 				add_thickbox();
 			}
 			?>
@@ -417,7 +417,7 @@ 
 						url: ajaxurl,
 						data: {
 							action: 'ayecode_connect_helper',
-							security: '<?php echo wp_create_nonce( 'ayecode-connect-helper' );?>',
+							security: '<?php echo wp_create_nonce('ayecode-connect-helper'); ?>',
 							redirect_to: $current_url
 						},
 						beforeSend: function () {
@@ -436,7 +436,7 @@ 
 				} 
 				<?php
 				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 				?>
 				jQuery(function () {
 					setTimeout(function () {
@@ -459,9 +459,9 @@ 
 			$show = false;
 
 			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+			if (isset($_REQUEST['page']) && in_array($_REQUEST['page'], $this->pages)) {
 				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+				if (!defined('AYECODE_CONNECT_VERSION') || !get_option('ayecode_connect_blog_token')) {
 					$show = true;
 				}
 			}

vendor/ayecode/wp-deactivation-survey/wp-deactivation-survey.php

Indentation +75 added lines, -75 removed lines

@@ -1,99 +1,99 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
 
-	class AyeCode_Deactivation_Survey {
+    class AyeCode_Deactivation_Survey {
 
-		/**
-		 * AyeCode_Deactivation_Survey instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_Deactivation_Survey There can be only one!
-		 */
-		private static $instance = null;
+        /**
+         * AyeCode_Deactivation_Survey instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_Deactivation_Survey There can be only one!
+         */
+        private static $instance = null;
 
-		public static $plugins;
+        public static $plugins;
 
-		public $version = "1.0.7";
+        public $version = "1.0.7";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
-				self::$instance = new AyeCode_Deactivation_Survey;
-				self::$plugins = array();
+        public static function instance( $plugin = array() ) {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+                self::$instance = new AyeCode_Deactivation_Survey;
+                self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+                add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
-			}
+                do_action( 'ayecode_deactivation_survey_loaded' );
+            }
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
-			}
+            if(!empty($plugin)){
+                self::$plugins[] = (object)$plugin;
+            }
 
-			return self::$instance;
-		}
+            return self::$instance;
+        }
 
-		public function scripts() {
-			global $pagenow;
+        public function scripts() {
+            global $pagenow;
 
-			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
-				return;
-			}
+            // Bail if we are not on the plugins page
+            if ( $pagenow != "plugins.php" ) {
+                return;
+            }
 
-			// Enqueue scripts
-			add_thickbox();
-			wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
+            // Enqueue scripts
+            add_thickbox();
+            wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
 
-			/*
+            /*
 			 * Localized strings. Strings can be localised by plugins using this class.
 			 * We deliberately don't add textdomains here so that double textdomain warning is not given in theme review.
 			 */
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
-				'quick_feedback'			=> __( 'Quick Feedback', 'ayecode-connect' ),
-				'foreword'					=> __( 'If you would be kind enough, please tell us why you\'re deactivating?', 'ayecode-connect' ),
-				'better_plugins_name'		=> __( 'Please tell us which plugin?', 'ayecode-connect' ),
-				'please_tell_us'			=> __( 'Please tell us the reason so we can improve the plugin', 'ayecode-connect' ),
-				'do_not_attach_email'		=> __( 'Do not send my e-mail address with this feedback', 'ayecode-connect' ),
-				'brief_description'			=> __( 'Please give us any feedback that could help us improve', 'ayecode-connect' ),
-				'cancel'					=> __( 'Cancel', 'ayecode-connect' ),
-				'skip_and_deactivate'		=> __( 'Skip &amp; Deactivate', 'ayecode-connect' ),
-				'submit_and_deactivate'		=> __( 'Submit &amp; Deactivate', 'ayecode-connect' ),
-				'please_wait'				=> __( 'Please wait', 'ayecode-connect' ),
-				'get_support'				=> __( 'Get Support', 'ayecode-connect' ),
-				'documentation'				=> __( 'Documentation', 'ayecode-connect' ),
-				'thank_you'					=> __( 'Thank you!', 'ayecode-connect' ),
-			));
-
-			// Plugins
-			$plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
-
-			// Reasons
-			$defaultReasons = array(
-				'suddenly-stopped-working'	=> __( 'The plugin suddenly stopped working', 'ayecode-connect' ),
-				'plugin-broke-site'			=> __( 'The plugin broke my site', 'ayecode-connect' ),
-				'plugin-setup-difficult'	=> __( 'Too difficult to setup', 'ayecode-connect' ),
-				'plugin-design-difficult'	=> __( 'Too difficult to get the design i want', 'ayecode-connect' ),
-				'no-longer-needed'			=> __( 'I don\'t need this plugin any more', 'ayecode-connect' ),
-				'found-better-plugin'		=> __( 'I found a better plugin', 'ayecode-connect' ),
-				'temporary-deactivation'	=> __( 'It\'s a temporary deactivation, I\'m troubleshooting', 'ayecode-connect' ),
-				'other'						=> __( 'Other', 'ayecode-connect' ),
-			);
-
-			foreach( $plugins as $plugin ) {
-				$plugin->reasons = apply_filters( 'ayecode_deactivation_survey_reasons', $defaultReasons, $plugin );
-				$plugin->url = home_url();
-				$plugin->activated = 0;
-			}
-
-			// Send plugin data
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
-		}
-	}
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
+                'quick_feedback'			=> __( 'Quick Feedback', 'ayecode-connect' ),
+                'foreword'					=> __( 'If you would be kind enough, please tell us why you\'re deactivating?', 'ayecode-connect' ),
+                'better_plugins_name'		=> __( 'Please tell us which plugin?', 'ayecode-connect' ),
+                'please_tell_us'			=> __( 'Please tell us the reason so we can improve the plugin', 'ayecode-connect' ),
+                'do_not_attach_email'		=> __( 'Do not send my e-mail address with this feedback', 'ayecode-connect' ),
+                'brief_description'			=> __( 'Please give us any feedback that could help us improve', 'ayecode-connect' ),
+                'cancel'					=> __( 'Cancel', 'ayecode-connect' ),
+                'skip_and_deactivate'		=> __( 'Skip &amp; Deactivate', 'ayecode-connect' ),
+                'submit_and_deactivate'		=> __( 'Submit &amp; Deactivate', 'ayecode-connect' ),
+                'please_wait'				=> __( 'Please wait', 'ayecode-connect' ),
+                'get_support'				=> __( 'Get Support', 'ayecode-connect' ),
+                'documentation'				=> __( 'Documentation', 'ayecode-connect' ),
+                'thank_you'					=> __( 'Thank you!', 'ayecode-connect' ),
+            ));
+
+            // Plugins
+            $plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
+
+            // Reasons
+            $defaultReasons = array(
+                'suddenly-stopped-working'	=> __( 'The plugin suddenly stopped working', 'ayecode-connect' ),
+                'plugin-broke-site'			=> __( 'The plugin broke my site', 'ayecode-connect' ),
+                'plugin-setup-difficult'	=> __( 'Too difficult to setup', 'ayecode-connect' ),
+                'plugin-design-difficult'	=> __( 'Too difficult to get the design i want', 'ayecode-connect' ),
+                'no-longer-needed'			=> __( 'I don\'t need this plugin any more', 'ayecode-connect' ),
+                'found-better-plugin'		=> __( 'I found a better plugin', 'ayecode-connect' ),
+                'temporary-deactivation'	=> __( 'It\'s a temporary deactivation, I\'m troubleshooting', 'ayecode-connect' ),
+                'other'						=> __( 'Other', 'ayecode-connect' ),
+            );
+
+            foreach( $plugins as $plugin ) {
+                $plugin->reasons = apply_filters( 'ayecode_deactivation_survey_reasons', $defaultReasons, $plugin );
+                $plugin->url = home_url();
+                $plugin->activated = 0;
+            }
+
+            // Send plugin data
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
+        }
+    }
 
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
+if (!class_exists('AyeCode_Deactivation_Survey')) {
 
 	class AyeCode_Deactivation_Survey {
 
@@ -21,18 +21,18 @@ 
 
 		public $version = "1.0.7";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+		public static function instance($plugin = array()) {
+			if (!isset(self::$instance) && !(self::$instance instanceof AyeCode_Deactivation_Survey)) {
 				self::$instance = new AyeCode_Deactivation_Survey;
 				self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+				add_action('admin_enqueue_scripts', array(self::$instance, 'scripts'));
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
+				do_action('ayecode_deactivation_survey_loaded');
 			}
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
+			if (!empty($plugin)) {
+				self::$plugins[] = (object) $plugin;
 			}
 
 			return self::$instance;
@@ -42,7 +42,7 @@ 
 			global $pagenow;
 
 			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
+			if ($pagenow != "plugins.php") {
 				return;
 			}
 
@@ -55,19 +55,19 @@ 
 			 * We deliberately don't add textdomains here so that double textdomain warning is not given in theme review.
 			 */
 			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
-				'quick_feedback'			=> __( 'Quick Feedback', 'ayecode-connect' ),
-				'foreword'					=> __( 'If you would be kind enough, please tell us why you\'re deactivating?', 'ayecode-connect' ),
-				'better_plugins_name'		=> __( 'Please tell us which plugin?', 'ayecode-connect' ),
-				'please_tell_us'			=> __( 'Please tell us the reason so we can improve the plugin', 'ayecode-connect' ),
-				'do_not_attach_email'		=> __( 'Do not send my e-mail address with this feedback', 'ayecode-connect' ),
-				'brief_description'			=> __( 'Please give us any feedback that could help us improve', 'ayecode-connect' ),
-				'cancel'					=> __( 'Cancel', 'ayecode-connect' ),
-				'skip_and_deactivate'		=> __( 'Skip &amp; Deactivate', 'ayecode-connect' ),
-				'submit_and_deactivate'		=> __( 'Submit &amp; Deactivate', 'ayecode-connect' ),
-				'please_wait'				=> __( 'Please wait', 'ayecode-connect' ),
-				'get_support'				=> __( 'Get Support', 'ayecode-connect' ),
-				'documentation'				=> __( 'Documentation', 'ayecode-connect' ),
-				'thank_you'					=> __( 'Thank you!', 'ayecode-connect' ),
+				'quick_feedback'			=> __('Quick Feedback', 'ayecode-connect'),
+				'foreword'					=> __('If you would be kind enough, please tell us why you\'re deactivating?', 'ayecode-connect'),
+				'better_plugins_name'		=> __('Please tell us which plugin?', 'ayecode-connect'),
+				'please_tell_us'			=> __('Please tell us the reason so we can improve the plugin', 'ayecode-connect'),
+				'do_not_attach_email'		=> __('Do not send my e-mail address with this feedback', 'ayecode-connect'),
+				'brief_description'			=> __('Please give us any feedback that could help us improve', 'ayecode-connect'),
+				'cancel'					=> __('Cancel', 'ayecode-connect'),
+				'skip_and_deactivate'		=> __('Skip &amp; Deactivate', 'ayecode-connect'),
+				'submit_and_deactivate'		=> __('Submit &amp; Deactivate', 'ayecode-connect'),
+				'please_wait'				=> __('Please wait', 'ayecode-connect'),
+				'get_support'				=> __('Get Support', 'ayecode-connect'),
+				'documentation'				=> __('Documentation', 'ayecode-connect'),
+				'thank_you'					=> __('Thank you!', 'ayecode-connect'),
 			));
 
 			// Plugins
@@ -75,18 +75,18 @@ 
 
 			// Reasons
 			$defaultReasons = array(
-				'suddenly-stopped-working'	=> __( 'The plugin suddenly stopped working', 'ayecode-connect' ),
-				'plugin-broke-site'			=> __( 'The plugin broke my site', 'ayecode-connect' ),
-				'plugin-setup-difficult'	=> __( 'Too difficult to setup', 'ayecode-connect' ),
-				'plugin-design-difficult'	=> __( 'Too difficult to get the design i want', 'ayecode-connect' ),
-				'no-longer-needed'			=> __( 'I don\'t need this plugin any more', 'ayecode-connect' ),
-				'found-better-plugin'		=> __( 'I found a better plugin', 'ayecode-connect' ),
-				'temporary-deactivation'	=> __( 'It\'s a temporary deactivation, I\'m troubleshooting', 'ayecode-connect' ),
-				'other'						=> __( 'Other', 'ayecode-connect' ),
+				'suddenly-stopped-working'	=> __('The plugin suddenly stopped working', 'ayecode-connect'),
+				'plugin-broke-site'			=> __('The plugin broke my site', 'ayecode-connect'),
+				'plugin-setup-difficult'	=> __('Too difficult to setup', 'ayecode-connect'),
+				'plugin-design-difficult'	=> __('Too difficult to get the design i want', 'ayecode-connect'),
+				'no-longer-needed'			=> __('I don\'t need this plugin any more', 'ayecode-connect'),
+				'found-better-plugin'		=> __('I found a better plugin', 'ayecode-connect'),
+				'temporary-deactivation'	=> __('It\'s a temporary deactivation, I\'m troubleshooting', 'ayecode-connect'),
+				'other'						=> __('Other', 'ayecode-connect'),
 			);
 
-			foreach( $plugins as $plugin ) {
-				$plugin->reasons = apply_filters( 'ayecode_deactivation_survey_reasons', $defaultReasons, $plugin );
+			foreach ($plugins as $plugin) {
+				$plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
 				$plugin->url = home_url();
 				$plugin->activated = 0;
 			}