AyeCode / invoicing

includes/libraries/wp-session/class-wp-session-utils.php

Indentation +130 added lines, -130 removed lines

@@ -6,134 +6,134 @@
  * THIS CLASS SHOULD NEVER BE INSTANTIATED
  */
 class WP_Session_Utils {
-	/**
-	 * Count the total sessions in the database.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int
-	 */
-	public static function count_sessions() {
-		global $wpdb;
-
-		$query = "SELECT COUNT(*) FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'";
-
-		/**
-		 * Filter the query in case tables are non-standard.
-		 *
-		 * @param string $query Database count query
-		 */
-		$query = apply_filters( 'wp_session_count_query', $query );
-
-		$sessions = $wpdb->get_var( $query );
-
-		return absint( $sessions );
-	}
-
-	/**
-	 * Create a new, random session in the database.
-	 *
-	 * @param null|string $date
-	 */
-	public static function create_dummy_session( $date = null ) {
-		// Generate our date
-		if ( null !== $date ) {
-			$time = strtotime( $date );
-
-			if ( false === $time ) {
-				$date = null;
-			} else {
-				$expires = date( 'U', strtotime( $date ) );
-			}
-		}
-
-		// If null was passed, or if the string parsing failed, fall back on a default
-		if ( null === $date ) {
-			/**
-			 * Filter the expiration of the session in the database
-			 *
-			 * @param int
-			 */
-			$expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
-		}
-
-		$session_id = self::generate_id();
-
-		// Store the session
-		add_option( "_wp_session_{$session_id}", array(), '', 'no' );
-		add_option( "_wp_session_expires_{$session_id}", $expires, '', 'no' );
-	}
-
-	/**
-	 * Delete old sessions from the database.
-	 *
-	 * @param int $limit Maximum number of sessions to delete.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int Sessions deleted.
-	 */
-	public static function delete_old_sessions( $limit = 1000 ) {
-		global $wpdb;
-
-		$limit = absint( $limit );
-		$keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%' ORDER BY option_value ASC LIMIT 0, {$limit}" );
-
-		$now = time();
-		$expired = array();
-		$count = 0;
-
-		foreach( $keys as $expiration ) {
-			$key = $expiration->option_name;
-			$expires = $expiration->option_value;
-
-			if ( $now > $expires ) {
-				$session_id = preg_replace("/[^A-Za-z0-9_]/", '', substr( $key, 20 ) );
-
-				$expired[] = $key;
-				$expired[] = "_wp_session_{$session_id}";
-
-				$count += 1;
-			}
-		}
-
-		// Delete expired sessions
-		if ( ! empty( $expired ) ) {
-		    $placeholders = array_fill( 0, count( $expired ), '%s' );
-		    $format = implode( ', ', $placeholders );
-		    $query = "DELETE FROM $wpdb->options WHERE option_name IN ($format)";
-
-		    $prepared = $wpdb->prepare( $query, $expired );
-			$wpdb->query( $prepared );
-		}
-
-		return $count;
-	}
-
-	/**
-	 * Remove all sessions from the database, regardless of expiration.
-	 *
-	 * @global wpdb $wpdb
-	 *
-	 * @return int Sessions deleted
-	 */
-	public static function delete_all_sessions() {
-		global $wpdb;
-
-		$count = $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'" );
-
-		return (int) ( $count / 2 );
-	}
-
-	/**
-	 * Generate a new, random session ID.
-	 *
-	 * @return string
-	 */
-	public static function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php' );
-		$hash = new PasswordHash( 8, false );
-
-		return md5( $hash->get_random_bytes( 32 ) );
-	}
+    /**
+     * Count the total sessions in the database.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int
+     */
+    public static function count_sessions() {
+        global $wpdb;
+
+        $query = "SELECT COUNT(*) FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%'";
+
+        /**
+         * Filter the query in case tables are non-standard.
+         *
+         * @param string $query Database count query
+         */
+        $query = apply_filters( 'wp_session_count_query', $query );
+
+        $sessions = $wpdb->get_var( $query );
+
+        return absint( $sessions );
+    }
+
+    /**
+     * Create a new, random session in the database.
+     *
+     * @param null|string $date
+     */
+    public static function create_dummy_session( $date = null ) {
+        // Generate our date
+        if ( null !== $date ) {
+            $time = strtotime( $date );
+
+            if ( false === $time ) {
+                $date = null;
+            } else {
+                $expires = date( 'U', strtotime( $date ) );
+            }
+        }
+
+        // If null was passed, or if the string parsing failed, fall back on a default
+        if ( null === $date ) {
+            /**
+             * Filter the expiration of the session in the database
+             *
+             * @param int
+             */
+            $expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+        }
+
+        $session_id = self::generate_id();
+
+        // Store the session
+        add_option( "_wp_session_{$session_id}", array(), '', 'no' );
+        add_option( "_wp_session_expires_{$session_id}", $expires, '', 'no' );
+    }
+
+    /**
+     * Delete old sessions from the database.
+     *
+     * @param int $limit Maximum number of sessions to delete.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int Sessions deleted.
+     */
+    public static function delete_old_sessions( $limit = 1000 ) {
+        global $wpdb;
+
+        $limit = absint( $limit );
+        $keys = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE option_name LIKE '_wp_session_expires_%' ORDER BY option_value ASC LIMIT 0, {$limit}" );
+
+        $now = time();
+        $expired = array();
+        $count = 0;
+
+        foreach( $keys as $expiration ) {
+            $key = $expiration->option_name;
+            $expires = $expiration->option_value;
+
+            if ( $now > $expires ) {
+                $session_id = preg_replace("/[^A-Za-z0-9_]/", '', substr( $key, 20 ) );
+
+                $expired[] = $key;
+                $expired[] = "_wp_session_{$session_id}";
+
+                $count += 1;
+            }
+        }
+
+        // Delete expired sessions
+        if ( ! empty( $expired ) ) {
+            $placeholders = array_fill( 0, count( $expired ), '%s' );
+            $format = implode( ', ', $placeholders );
+            $query = "DELETE FROM $wpdb->options WHERE option_name IN ($format)";
+
+            $prepared = $wpdb->prepare( $query, $expired );
+            $wpdb->query( $prepared );
+        }
+
+        return $count;
+    }
+
+    /**
+     * Remove all sessions from the database, regardless of expiration.
+     *
+     * @global wpdb $wpdb
+     *
+     * @return int Sessions deleted
+     */
+    public static function delete_all_sessions() {
+        global $wpdb;
+
+        $count = $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'" );
+
+        return (int) ( $count / 2 );
+    }
+
+    /**
+     * Generate a new, random session ID.
+     *
+     * @return string
+     */
+    public static function generate_id() {
+        require_once( ABSPATH . 'wp-includes/class-phpass.php' );
+        $hash = new PasswordHash( 8, false );
+
+        return md5( $hash->get_random_bytes( 32 ) );
+    }
 } 
\ No newline at end of file

includes/wpinv-email-functions.php

Indentation +3 added lines, -3 removed lines

@@ -688,9 +688,9 @@
         $overdue_days_options[$i]   = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
     }
 
-	// Default, built-in gateways
-	$emails = array(
-		'new_invoice' => array(
+    // Default, built-in gateways
+    $emails = array(
+        'new_invoice' => array(
             'email_new_invoice_header' => array(
                 'id'   => 'email_new_invoice_header',
                 'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',

includes/class-wpinv-session.php

Indentation +274 added lines, -274 removed lines

@@ -8,291 +8,291 @@
  * @since 1.0.0
  */
 class WPInv_Session {
-	/**
-	 * Holds our session data.
-	 *
-	 * @var array
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $session;
-
-	/**
-	 * Whether to use PHP $_SESSION or WP_Session.
-	 *
-	 * @var bool
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $use_php_sessions = false;
-
-	/**
-	 * Session index prefix.
-	 *
-	 * @var string
-	 * @access private
-	 * @since 1.0.0
-	 */
-	private $prefix = '';
-
-	/**
-	 * Get things started.
-	 *
-	 * Defines our WP_Session constants, includes the necessary libraries and
-	 * retrieves the WP Session instance.
-	 *
-	 * @since 1.0.0
-	 */
-	public function __construct() {
-		$this->use_php_sessions = $this->use_php_sessions();
-
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
-			}
-
-			// Use PHP SESSION (must be enabled via the WPINV_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
-		} else {
-			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'wpinv_wp_session' );
-			}
-
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-recursive-arrayaccess.php';
-			}
+    /**
+     * Holds our session data.
+     *
+     * @var array
+     * @access private
+     * @since 1.0.0
+     */
+    private $session;
+
+    /**
+     * Whether to use PHP $_SESSION or WP_Session.
+     *
+     * @var bool
+     * @access private
+     * @since 1.0.0
+     */
+    private $use_php_sessions = false;
+
+    /**
+     * Session index prefix.
+     *
+     * @var string
+     * @access private
+     * @since 1.0.0
+     */
+    private $prefix = '';
+
+    /**
+     * Get things started.
+     *
+     * Defines our WP_Session constants, includes the necessary libraries and
+     * retrieves the WP Session instance.
+     *
+     * @since 1.0.0
+     */
+    public function __construct() {
+        $this->use_php_sessions = $this->use_php_sessions();
+
+        if ( $this->use_php_sessions ) {
+            if ( is_multisite() ) {
+                $this->prefix = '_' . get_current_blog_id();
+            }
+
+            // Use PHP SESSION (must be enabled via the WPINV_USE_PHP_SESSIONS constant)
+            add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+        } else {
+            // Use WP_Session (default)
+            if ( !defined( 'WP_SESSION_COOKIE' ) ) {
+                define( 'WP_SESSION_COOKIE', 'wpinv_wp_session' );
+            }
+
+            if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-recursive-arrayaccess.php';
+            }
             
-			if ( !class_exists( 'WP_Session_Utils' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session-utils.php';
-			}
+            if ( !class_exists( 'WP_Session_Utils' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session-utils.php';
+            }
             
-			if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-cli.php';
-			}
-
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session.php';
-				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-session.php';
-			}
-
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
-		}
-
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
-		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
-		}
-	}
-
-	/**
-	 * Setup the WP_Session instance.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return void
-	 */
-	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['wpi' . $this->prefix ] ) && is_array( $_SESSION['wpi' . $this->prefix ] ) ? $_SESSION['wpi' . $this->prefix ] : array();
-		} else {
-			$this->session = WP_Session::get_instance();
-		}
-
-		return $this->session;
-	}
-
-	/**
-	 * Retrieve session ID.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return string Session ID
-	 */
-	public function get_id() {
-		if ( $this->use_php_sessions ) {
-			$session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
-		} else {
-			$session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
-		}
-		return $session_id;
-	}
-
-	/**
-	 * Retrieve a session variable.
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param string $key Session key
-	 * @return string Session variable
-	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
-	}
-
-	/**
-	 * Set a session variable
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $key Session key
-	 * @param integer $value Session variable
-	 * @return string Session variable
-	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
-
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
-		} else {
-			$this->session[ $key ] = $value;
-		}
-
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
-		}
-
-		return $this->session[ $key ];
-	}
+            if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-cli.php';
+            }
+
+            if ( !class_exists( 'WP_Session' ) ) {
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session.php';
+                require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-session.php';
+            }
+
+            add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
+            add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+        }
+
+        if ( empty( $this->session ) && ! $this->use_php_sessions ) {
+            add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+        } else {
+            add_action( 'init', array( $this, 'init' ), -1 );
+        }
+    }
+
+    /**
+     * Setup the WP_Session instance.
+     *
+     * @access public
+     * @since 1.0.0
+     * @return void
+     */
+    public function init() {
+        if ( $this->use_php_sessions ) {
+            $this->session = isset( $_SESSION['wpi' . $this->prefix ] ) && is_array( $_SESSION['wpi' . $this->prefix ] ) ? $_SESSION['wpi' . $this->prefix ] : array();
+        } else {
+            $this->session = WP_Session::get_instance();
+        }
+
+        return $this->session;
+    }
+
+    /**
+     * Retrieve session ID.
+     *
+     * @access public
+     * @since 1.0.0
+     * @return string Session ID
+     */
+    public function get_id() {
+        if ( $this->use_php_sessions ) {
+            $session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
+        } else {
+            $session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
+        }
+        return $session_id;
+    }
+
+    /**
+     * Retrieve a session variable.
+     *
+     * @access public
+     * @since 1.0.0
+     * @param string $key Session key
+     * @return string Session variable
+     */
+    public function get( $key ) {
+        $key = sanitize_key( $key );
+        return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+    }
+
+    /**
+     * Set a session variable
+     *
+     * @since 1.0.0
+     *
+     * @param string $key Session key
+     * @param integer $value Session variable
+     * @return string Session variable
+     */
+    public function set( $key, $value ) {
+        $key = sanitize_key( $key );
+
+        if ( is_array( $value ) ) {
+            $this->session[ $key ] = maybe_serialize( $value );
+        } else {
+            $this->session[ $key ] = $value;
+        }
+
+        if ( $this->use_php_sessions ) {
+            $_SESSION['wpi' . $this->prefix ] = $this->session;
+        }
+
+        return $this->session[ $key ];
+    }
 	
-	/**
-	 * Unset a session variable.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
-			return false;
-		}
+    /**
+     * Unset a session variable.
+     *
+     * @since 1.0.0
+     *
+     * @param string|array $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function un_set( $key ) {
+        if ( empty( $key ) ) {
+            return false;
+        }
 		
-		if ( is_array( $key ) ) {
-			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+        if ( is_array( $key ) ) {
+            foreach ($key as $index) {
+                $index = sanitize_key( $index );
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
-				}
-			}
-		} else {
-			$key = sanitize_key( $key );
+                if ( $index && isset( $this->session[ $index ] ) ) {
+                    unset( $this->session[ $index ] );
+                }
+            }
+        } else {
+            $key = sanitize_key( $key );
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
-			}
-		}
+            if ( isset( $this->session[ $key ] ) ) {
+                unset( $this->session[ $key ] );
+            }
+        }
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
-		}
+        if ( $this->use_php_sessions ) {
+            $_SESSION['wpi' . $this->prefix ] = $this->session;
+        }
 
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Check a session variable is set or not.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+    /**
+     * Check a session variable is set or not.
+     *
+     * @since 1.0.0
+     *
+     * @param string $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function is_set( $key ) {
+        $key = sanitize_key( $key );
 		
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		if ( isset( $this->session[ $key ] ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Force the cookie expiration variant time to 23 hours
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
-	}
-
-	/**
-	 * Force the cookie expiration time to 24 hours
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 *
-	 * @return boolean
-	 * Checks to see if the server supports PHP sessions
-	 * or if the WPINV_USE_PHP_SESSIONS constant is defined
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return boolean $ret True if we are using PHP sessions, false otherwise
-	 */
-	public function use_php_sessions() {
-		$ret = false;
-
-		// If the database variable is already set, no need to run autodetection
-		$wpinv_use_php_sessions = (bool)get_option( 'wpinv_use_php_sessions' );
-
-		if (!$wpinv_use_php_sessions ) {
-			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'wpinv_use_php_sessions', 1 );
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        if ( isset( $this->session[ $key ] ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Force the cookie expiration variant time to 23 hours
+     *
+     * @access public
+     * @since 1.0.0
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_variant_time( $exp ) {
+        return ( 30 * 60 * 23 );
+    }
+
+    /**
+     * Force the cookie expiration time to 24 hours
+     *
+     * @access public
+     * @since 1.0.0
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_time( $exp ) {
+        return ( 30 * 60 * 24 );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     *
+     * @return boolean
+     * Checks to see if the server supports PHP sessions
+     * or if the WPINV_USE_PHP_SESSIONS constant is defined
+     *
+     * @access public
+     * @since 1.0.0
+     * @return boolean $ret True if we are using PHP sessions, false otherwise
+     */
+    public function use_php_sessions() {
+        $ret = false;
+
+        // If the database variable is already set, no need to run autodetection
+        $wpinv_use_php_sessions = (bool)get_option( 'wpinv_use_php_sessions' );
+
+        if (!$wpinv_use_php_sessions ) {
+            // Attempt to detect if the server supports PHP sessions
+            if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
+                $this->set( 'wpinv_use_php_sessions', 1 );
 				
-				if ( $this->get( 'wpinv_use_php_sessions' ) ) {
-					$ret = true;
-
-					// Set the database option
-					update_option( 'wpinv_use_php_sessions', true );
-				}
-			}
-		} else {
-			$ret = $wpinv_use_php_sessions;
-		}
-
-		// Enable or disable PHP Sessions based on the WPINV_USE_PHP_SESSIONS constant
-		if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && WPINV_USE_PHP_SESSIONS ) {
-			$ret = true;
-		} else if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && ! WPINV_USE_PHP_SESSIONS ) {
-			$ret = false;
-		}
-
-		return (bool) apply_filters( 'wpinv_use_php_sessions', $ret );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 */
-	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
-			session_start();
-		}
-	}
+                if ( $this->get( 'wpinv_use_php_sessions' ) ) {
+                    $ret = true;
+
+                    // Set the database option
+                    update_option( 'wpinv_use_php_sessions', true );
+                }
+            }
+        } else {
+            $ret = $wpinv_use_php_sessions;
+        }
+
+        // Enable or disable PHP Sessions based on the WPINV_USE_PHP_SESSIONS constant
+        if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && WPINV_USE_PHP_SESSIONS ) {
+            $ret = true;
+        } else if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && ! WPINV_USE_PHP_SESSIONS ) {
+            $ret = false;
+        }
+
+        return (bool) apply_filters( 'wpinv_use_php_sessions', $ret );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     */
+    public function maybe_start_session() {
+        if ( !session_id() && !headers_sent() ) {
+            session_start();
+        }
+    }
 }
 
 global $wpi_session;

includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php

Indentation +47 added lines, -47 removed lines

@@ -40,7 +40,7 @@ 
     const EXCEPTION_CURL = 10;
 
     private $ch;
-	private $login;
+    private $login;
     private $response;
     private $response_xml;
     private $results;
@@ -48,9 +48,9 @@ 
     private $url;
     private $xml;
 
-	public function __construct($login, $transkey, $test = self::USE_PRODUCTION_SERVER)
-	{
-		$login    = trim($login);
+    public function __construct($login, $transkey, $test = self::USE_PRODUCTION_SERVER)
+    {
+        $login    = trim($login);
         $transkey = trim($transkey);
         if (empty($login) || empty($transkey))
         {
@@ -63,7 +63,7 @@ 
 
         $subdomain = ($test) ? 'apitest' : 'api';
         $this->url = 'https://' . $subdomain . '.authorize.net/xml/v1/request.api';
-	}
+    }
 
     /**
      * remove XML response namespaces
@@ -78,9 +78,9 @@ 
         return str_replace(' xmlns:xsd="http://www.w3.org/2001/XMLSchema"','',$input);
     }
 
-	public function __toString()
-	{
-	    $output  = '';
+    public function __toString()
+    {
+        $output  = '';
         $output .= '<table summary="Authorize.Net Results" id="authnet">' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<th colspan="2"><b>Class Parameters</b></th>' . "\n" . '</tr>' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<td><b>API Login ID</b></td><td>' . $this->login . '</td>' . "\n" . '</tr>' . "\n";
@@ -117,9 +117,9 @@ 
         $output .= '</table>';
 
         return $output;
-	}
+    }
 
-	public function __destruct()
+    public function __destruct()
     {
         if (isset($this->ch))
         {
@@ -128,31 +128,31 @@ 
     }
 
     public function __get($var)
-	{
-	    return $this->response_xml->$var;
-	}
-
-	public function __set($key, $value)
-	{
-	    trigger_error('You cannot set parameters directly in ' . __CLASS__ . '.', E_USER_WARNING);
-	    return false;
-	}
-
-	public function __call($api_call, $args)
-	{
-	    $this->xml = new SimpleXMLElement('<' . $api_call . '></' . $api_call . '>');
+    {
+        return $this->response_xml->$var;
+    }
+
+    public function __set($key, $value)
+    {
+        trigger_error('You cannot set parameters directly in ' . __CLASS__ . '.', E_USER_WARNING);
+        return false;
+    }
+
+    public function __call($api_call, $args)
+    {
+        $this->xml = new SimpleXMLElement('<' . $api_call . '></' . $api_call . '>');
         $this->xml->addAttribute('xmlns', 'AnetApi/xml/v1/schema/AnetApiSchema.xsd');
-	    $merch_auth = $this->xml->addChild('merchantAuthentication');
+        $merch_auth = $this->xml->addChild('merchantAuthentication');
         $merch_auth->addChild('name', $this->login);
-	    $merch_auth->addChild('transactionKey', $this->transkey);
+        $merch_auth->addChild('transactionKey', $this->transkey);
 
-		$this->setParameters($this->xml, $args[0]);
-		$this->process();
-	}
+        $this->setParameters($this->xml, $args[0]);
+        $this->process();
+    }
 
-	private function setParameters($xml, $array)
-	{
-	    if (is_array($array))
+    private function setParameters($xml, $array)
+    {
+        if (is_array($array))
         {
             $first = true;
             foreach ($array as $key => $value)
@@ -184,34 +184,34 @@ 
                 }
             }
         }
-	}
+    }
 
-	private function process()
-	{
-		$this->xml = $this->xml->asXML();
+    private function process()
+    {
+        $this->xml = $this->xml->asXML();
 
-		$this->ch = curl_init();
+        $this->ch = curl_init();
         curl_setopt($this->ch, CURLOPT_URL, $this->url);
-    	curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, 1);
-    	curl_setopt($this->ch, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
-    	curl_setopt($this->ch, CURLOPT_HEADER, 0);
-    	curl_setopt($this->ch, CURLOPT_POSTFIELDS, $this->xml);
-    	curl_setopt($this->ch, CURLOPT_POST, 1);
-    	curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 2);
-    	curl_setopt($this->ch, CURLOPT_CAINFO, dirname(__FILE__) . '/ssl/cert.pem');
+        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($this->ch, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
+        curl_setopt($this->ch, CURLOPT_HEADER, 0);
+        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $this->xml);
+        curl_setopt($this->ch, CURLOPT_POST, 1);
+        curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 2);
+        curl_setopt($this->ch, CURLOPT_CAINFO, dirname(__FILE__) . '/ssl/cert.pem');
 
         if(($this->response = curl_exec($this->ch)) !== false)
         {
             $this->response_xml = @new SimpleXMLElement($this->response);
 
-		    curl_close($this->ch);
+            curl_close($this->ch);
             unset($this->ch);
             return;
-		}
+        }
         throw new AuthnetXMLException('Connection error: ' . curl_error($this->ch) . ' (' . curl_errno($this->ch) . ')', self::EXCEPTION_CURL);
-	}
+    }
 
-	public function isSuccessful()
+    public function isSuccessful()
     {
         return $this->response_xml->messages->resultCode == 'Ok';
     }

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetARB.php

Indentation +7 added lines, -7 removed lines

@@ -91,13 +91,13 @@
         return $this->_sendRequest();
     }
     
-     /**
-     *
-     *
-     * @param string $response
-     * 
-     * @return AuthorizeNetARB_Response
-     */
+        /**
+         *
+         *
+         * @param string $response
+         * 
+         * @return AuthorizeNetARB_Response
+         */
     protected function _handleResponse($response)
     {
         return new AuthorizeNetARB_Response($response);

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetCIM.php

Indentation +3 added lines, -3 removed lines

@@ -316,9 +316,9 @@
         return $this->_sendRequest();
     }
     
-     /**
-     * @return string
-     */
+        /**
+         * @return string
+         */
     protected function _getPostUrl()
     {
         return ($this->_sandbox ? self::SANDBOX_URL : self::LIVE_URL);

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetDPM.php

Indentation +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             }
             else
             {
-              echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
+                echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
             }
         }
     }

includes/gateways/paypal.php

Indentation +252 added lines, -252 removed lines

@@ -65,7 +65,7 @@ 
             'notify_url'    => $listener_url,
             'cbt'           => get_bloginfo( 'name' ),
             'bn'            => 'WPInvoicing_SP',
-	        'lc'            => 'US' // this will force paypal site to english
+            'lc'            => 'US' // this will force paypal site to english
         );
 
         $paypal_args['address1'] = $invoice->get_address();
@@ -217,261 +217,261 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ) );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ) );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ) );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ) );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ) );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -686,27 +686,27 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
-		return; // This is a partial refund
-	}
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
-	wpinv_update_payment_status( $invoice_id, 'refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ) );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
+    wpinv_update_payment_status( $invoice_id, 'refunded' );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

includes/wpinv-address-functions.php

Indentation +278 added lines, -278 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 function wpinv_is_base_country( $country ) {
@@ -40,9 +40,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -115,260 +115,260 @@ 
 }
 
 function wpinv_get_country_list( $first_empty = false ) {
-	$countries = array(
-		'US' => __('United States', 'invoicing'),
-		'CA' => __('Canada', 'invoicing'),
-		'GB' => __('United Kingdom', 'invoicing'),
-		'AF' => __('Afghanistan', 'invoicing'),
-		'AX' => __('Aland Islands', 'invoicing'),
-		'AL' => __('Albania', 'invoicing'),
-		'DZ' => __('Algeria', 'invoicing'),
-		'AS' => __('American Samoa', 'invoicing'),
-		'AD' => __('Andorra', 'invoicing'),
-		'AO' => __('Angola', 'invoicing'),
-		'AI' => __('Anguilla', 'invoicing'),
-		'AQ' => __('Antarctica', 'invoicing'),
-		'AG' => __('Antigua and Barbuda', 'invoicing'),
-		'AR' => __('Argentina', 'invoicing'),
-		'AM' => __('Armenia', 'invoicing'),
-		'AW' => __('Aruba', 'invoicing'),
-		'AU' => __('Australia', 'invoicing'),
-		'AT' => __('Austria', 'invoicing'),
-		'AZ' => __('Azerbaijan', 'invoicing'),
-		'BS' => __('Bahamas', 'invoicing'),
-		'BH' => __('Bahrain', 'invoicing'),
-		'BD' => __('Bangladesh', 'invoicing'),
-		'BB' => __('Barbados', 'invoicing'),
-		'BY' => __('Belarus', 'invoicing'),
-		'BE' => __('Belgium', 'invoicing'),
-		'BZ' => __('Belize', 'invoicing'),
-		'BJ' => __('Benin', 'invoicing'),
-		'BM' => __('Bermuda', 'invoicing'),
-		'BT' => __('Bhutan', 'invoicing'),
-		'BO' => __('Bolivia', 'invoicing'),
-		'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
-		'BA' => __('Bosnia and Herzegovina', 'invoicing'),
-		'BW' => __('Botswana', 'invoicing'),
-		'BV' => __('Bouvet Island', 'invoicing'),
-		'BR' => __('Brazil', 'invoicing'),
-		'IO' => __('British Indian Ocean Territory', 'invoicing'),
-		'BN' => __('Brunei Darrussalam', 'invoicing'),
-		'BG' => __('Bulgaria', 'invoicing'),
-		'BF' => __('Burkina Faso', 'invoicing'),
-		'BI' => __('Burundi', 'invoicing'),
-		'KH' => __('Cambodia', 'invoicing'),
-		'CM' => __('Cameroon', 'invoicing'),
-		'CV' => __('Cape Verde', 'invoicing'),
-		'KY' => __('Cayman Islands', 'invoicing'),
-		'CF' => __('Central African Republic', 'invoicing'),
-		'TD' => __('Chad', 'invoicing'),
-		'CL' => __('Chile', 'invoicing'),
-		'CN' => __('China', 'invoicing'),
-		'CX' => __('Christmas Island', 'invoicing'),
-		'CC' => __('Cocos Islands', 'invoicing'),
-		'CO' => __('Colombia', 'invoicing'),
-		'KM' => __('Comoros', 'invoicing'),
-		'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
-		'CG' => __('Congo, Republic of', 'invoicing'),
-		'CK' => __('Cook Islands', 'invoicing'),
-		'CR' => __('Costa Rica', 'invoicing'),
-		'CI' => __('Cote d\'Ivoire', 'invoicing'),
-		'HR' => __('Croatia/Hrvatska', 'invoicing'),
-		'CU' => __('Cuba', 'invoicing'),
-		'CW' => __('CuraÇao', 'invoicing'),
-		'CY' => __('Cyprus', 'invoicing'),
-		'CZ' => __('Czech Republic', 'invoicing'),
-		'DK' => __('Denmark', 'invoicing'),
-		'DJ' => __('Djibouti', 'invoicing'),
-		'DM' => __('Dominica', 'invoicing'),
-		'DO' => __('Dominican Republic', 'invoicing'),
-		'TP' => __('East Timor', 'invoicing'),
-		'EC' => __('Ecuador', 'invoicing'),
-		'EG' => __('Egypt', 'invoicing'),
-		'GQ' => __('Equatorial Guinea', 'invoicing'),
-		'SV' => __('El Salvador', 'invoicing'),
-		'ER' => __('Eritrea', 'invoicing'),
-		'EE' => __('Estonia', 'invoicing'),
-		'ET' => __('Ethiopia', 'invoicing'),
-		'FK' => __('Falkland Islands', 'invoicing'),
-		'FO' => __('Faroe Islands', 'invoicing'),
-		'FJ' => __('Fiji', 'invoicing'),
-		'FI' => __('Finland', 'invoicing'),
-		'FR' => __('France', 'invoicing'),
-		'GF' => __('French Guiana', 'invoicing'),
-		'PF' => __('French Polynesia', 'invoicing'),
-		'TF' => __('French Southern Territories', 'invoicing'),
-		'GA' => __('Gabon', 'invoicing'),
-		'GM' => __('Gambia', 'invoicing'),
-		'GE' => __('Georgia', 'invoicing'),
-		'DE' => __('Germany', 'invoicing'),
-		'GR' => __('Greece', 'invoicing'),
-		'GH' => __('Ghana', 'invoicing'),
-		'GI' => __('Gibraltar', 'invoicing'),
-		'GL' => __('Greenland', 'invoicing'),
-		'GD' => __('Grenada', 'invoicing'),
-		'GP' => __('Guadeloupe', 'invoicing'),
-		'GU' => __('Guam', 'invoicing'),
-		'GT' => __('Guatemala', 'invoicing'),
-		'GG' => __('Guernsey', 'invoicing'),
-		'GN' => __('Guinea', 'invoicing'),
-		'GW' => __('Guinea-Bissau', 'invoicing'),
-		'GY' => __('Guyana', 'invoicing'),
-		'HT' => __('Haiti', 'invoicing'),
-		'HM' => __('Heard and McDonald Islands', 'invoicing'),
-		'VA' => __('Holy See (City Vatican State)', 'invoicing'),
-		'HN' => __('Honduras', 'invoicing'),
-		'HK' => __('Hong Kong', 'invoicing'),
-		'HU' => __('Hungary', 'invoicing'),
-		'IS' => __('Iceland', 'invoicing'),
-		'IN' => __('India', 'invoicing'),
-		'ID' => __('Indonesia', 'invoicing'),
-		'IR' => __('Iran', 'invoicing'),
-		'IQ' => __('Iraq', 'invoicing'),
-		'IE' => __('Ireland', 'invoicing'),
-		'IM' => __('Isle of Man', 'invoicing'),
-		'IL' => __('Israel', 'invoicing'),
-		'IT' => __('Italy', 'invoicing'),
-		'JM' => __('Jamaica', 'invoicing'),
-		'JP' => __('Japan', 'invoicing'),
-		'JE' => __('Jersey', 'invoicing'),
-		'JO' => __('Jordan', 'invoicing'),
-		'KZ' => __('Kazakhstan', 'invoicing'),
-		'KE' => __('Kenya', 'invoicing'),
-		'KI' => __('Kiribati', 'invoicing'),
-		'KW' => __('Kuwait', 'invoicing'),
-		'KG' => __('Kyrgyzstan', 'invoicing'),
-		'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
-		'LV' => __('Latvia', 'invoicing'),
-		'LB' => __('Lebanon', 'invoicing'),
-		'LS' => __('Lesotho', 'invoicing'),
-		'LR' => __('Liberia', 'invoicing'),
-		'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
-		'LI' => __('Liechtenstein', 'invoicing'),
-		'LT' => __('Lithuania', 'invoicing'),
-		'LU' => __('Luxembourg', 'invoicing'),
-		'MO' => __('Macau', 'invoicing'),
-		'MK' => __('Macedonia', 'invoicing'),
-		'MG' => __('Madagascar', 'invoicing'),
-		'MW' => __('Malawi', 'invoicing'),
-		'MY' => __('Malaysia', 'invoicing'),
-		'MV' => __('Maldives', 'invoicing'),
-		'ML' => __('Mali', 'invoicing'),
-		'MT' => __('Malta', 'invoicing'),
-		'MH' => __('Marshall Islands', 'invoicing'),
-		'MQ' => __('Martinique', 'invoicing'),
-		'MR' => __('Mauritania', 'invoicing'),
-		'MU' => __('Mauritius', 'invoicing'),
-		'YT' => __('Mayotte', 'invoicing'),
-		'MX' => __('Mexico', 'invoicing'),
-		'FM' => __('Micronesia', 'invoicing'),
-		'MD' => __('Moldova, Republic of', 'invoicing'),
-		'MC' => __('Monaco', 'invoicing'),
-		'MN' => __('Mongolia', 'invoicing'),
-		'ME' => __('Montenegro', 'invoicing'),
-		'MS' => __('Montserrat', 'invoicing'),
-		'MA' => __('Morocco', 'invoicing'),
-		'MZ' => __('Mozambique', 'invoicing'),
-		'MM' => __('Myanmar', 'invoicing'),
-		'NA' => __('Namibia', 'invoicing'),
-		'NR' => __('Nauru', 'invoicing'),
-		'NP' => __('Nepal', 'invoicing'),
-		'NL' => __('Netherlands', 'invoicing'),
-		'AN' => __('Netherlands Antilles', 'invoicing'),
-		'NC' => __('New Caledonia', 'invoicing'),
-		'NZ' => __('New Zealand', 'invoicing'),
-		'NI' => __('Nicaragua', 'invoicing'),
-		'NE' => __('Niger', 'invoicing'),
-		'NG' => __('Nigeria', 'invoicing'),
-		'NU' => __('Niue', 'invoicing'),
-		'NF' => __('Norfolk Island', 'invoicing'),
-		'KP' => __('North Korea', 'invoicing'),
-		'MP' => __('Northern Mariana Islands', 'invoicing'),
-		'NO' => __('Norway', 'invoicing'),
-		'OM' => __('Oman', 'invoicing'),
-		'PK' => __('Pakistan', 'invoicing'),
-		'PW' => __('Palau', 'invoicing'),
-		'PS' => __('Palestinian Territories', 'invoicing'),
-		'PA' => __('Panama', 'invoicing'),
-		'PG' => __('Papua New Guinea', 'invoicing'),
-		'PY' => __('Paraguay', 'invoicing'),
-		'PE' => __('Peru', 'invoicing'),
-		'PH' => __('Phillipines', 'invoicing'),
-		'PN' => __('Pitcairn Island', 'invoicing'),
-		'PL' => __('Poland', 'invoicing'),
-		'PT' => __('Portugal', 'invoicing'),
-		'PR' => __('Puerto Rico', 'invoicing'),
-		'QA' => __('Qatar', 'invoicing'),
-		'XK' => __('Republic of Kosovo', 'invoicing'),
-		'RE' => __('Reunion Island', 'invoicing'),
-		'RO' => __('Romania', 'invoicing'),
-		'RU' => __('Russian Federation', 'invoicing'),
-		'RW' => __('Rwanda', 'invoicing'),
-		'BL' => __('Saint Barthélemy', 'invoicing'),
-		'SH' => __('Saint Helena', 'invoicing'),
-		'KN' => __('Saint Kitts and Nevis', 'invoicing'),
-		'LC' => __('Saint Lucia', 'invoicing'),
-		'MF' => __('Saint Martin (French)', 'invoicing'),
-		'SX' => __('Saint Martin (Dutch)', 'invoicing'),
-		'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
-		'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
-		'SM' => __('San Marino', 'invoicing'),
-		'ST' => __('São Tomé and Príncipe', 'invoicing'),
-		'SA' => __('Saudi Arabia', 'invoicing'),
-		'SN' => __('Senegal', 'invoicing'),
-		'RS' => __('Serbia', 'invoicing'),
-		'SC' => __('Seychelles', 'invoicing'),
-		'SL' => __('Sierra Leone', 'invoicing'),
-		'SG' => __('Singapore', 'invoicing'),
-		'SK' => __('Slovak Republic', 'invoicing'),
-		'SI' => __('Slovenia', 'invoicing'),
-		'SB' => __('Solomon Islands', 'invoicing'),
-		'SO' => __('Somalia', 'invoicing'),
-		'ZA' => __('South Africa', 'invoicing'),
-		'GS' => __('South Georgia', 'invoicing'),
-		'KR' => __('South Korea', 'invoicing'),
-		'SS' => __('South Sudan', 'invoicing'),
-		'ES' => __('Spain', 'invoicing'),
-		'LK' => __('Sri Lanka', 'invoicing'),
-		'SD' => __('Sudan', 'invoicing'),
-		'SR' => __('Suriname', 'invoicing'),
-		'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
-		'SZ' => __('Swaziland', 'invoicing'),
-		'SE' => __('Sweden', 'invoicing'),
-		'CH' => __('Switzerland', 'invoicing'),
-		'SY' => __('Syrian Arab Republic', 'invoicing'),
-		'TW' => __('Taiwan', 'invoicing'),
-		'TJ' => __('Tajikistan', 'invoicing'),
-		'TZ' => __('Tanzania', 'invoicing'),
-		'TH' => __('Thailand', 'invoicing'),
-		'TL' => __('Timor-Leste', 'invoicing'),
-		'TG' => __('Togo', 'invoicing'),
-		'TK' => __('Tokelau', 'invoicing'),
-		'TO' => __('Tonga', 'invoicing'),
-		'TT' => __('Trinidad and Tobago', 'invoicing'),
-		'TN' => __('Tunisia', 'invoicing'),
-		'TR' => __('Turkey', 'invoicing'),
-		'TM' => __('Turkmenistan', 'invoicing'),
-		'TC' => __('Turks and Caicos Islands', 'invoicing'),
-		'TV' => __('Tuvalu', 'invoicing'),
-		'UG' => __('Uganda', 'invoicing'),
-		'UA' => __('Ukraine', 'invoicing'),
-		'AE' => __('United Arab Emirates', 'invoicing'),
-		'UY' => __('Uruguay', 'invoicing'),
-		'UM' => __('US Minor Outlying Islands', 'invoicing'),
-		'UZ' => __('Uzbekistan', 'invoicing'),
-		'VU' => __('Vanuatu', 'invoicing'),
-		'VE' => __('Venezuela', 'invoicing'),
-		'VN' => __('Vietnam', 'invoicing'),
-		'VG' => __('Virgin Islands (British)', 'invoicing'),
-		'VI' => __('Virgin Islands (USA)', 'invoicing'),
-		'WF' => __('Wallis and Futuna Islands', 'invoicing'),
-		'EH' => __('Western Sahara', 'invoicing'),
-		'WS' => __('Western Samoa', 'invoicing'),
-		'YE' => __('Yemen', 'invoicing'),
-		'ZM' => __('Zambia', 'invoicing'),
-		'ZW' => __('Zimbabwe', 'invoicing'),
-	);
+    $countries = array(
+        'US' => __('United States', 'invoicing'),
+        'CA' => __('Canada', 'invoicing'),
+        'GB' => __('United Kingdom', 'invoicing'),
+        'AF' => __('Afghanistan', 'invoicing'),
+        'AX' => __('Aland Islands', 'invoicing'),
+        'AL' => __('Albania', 'invoicing'),
+        'DZ' => __('Algeria', 'invoicing'),
+        'AS' => __('American Samoa', 'invoicing'),
+        'AD' => __('Andorra', 'invoicing'),
+        'AO' => __('Angola', 'invoicing'),
+        'AI' => __('Anguilla', 'invoicing'),
+        'AQ' => __('Antarctica', 'invoicing'),
+        'AG' => __('Antigua and Barbuda', 'invoicing'),
+        'AR' => __('Argentina', 'invoicing'),
+        'AM' => __('Armenia', 'invoicing'),
+        'AW' => __('Aruba', 'invoicing'),
+        'AU' => __('Australia', 'invoicing'),
+        'AT' => __('Austria', 'invoicing'),
+        'AZ' => __('Azerbaijan', 'invoicing'),
+        'BS' => __('Bahamas', 'invoicing'),
+        'BH' => __('Bahrain', 'invoicing'),
+        'BD' => __('Bangladesh', 'invoicing'),
+        'BB' => __('Barbados', 'invoicing'),
+        'BY' => __('Belarus', 'invoicing'),
+        'BE' => __('Belgium', 'invoicing'),
+        'BZ' => __('Belize', 'invoicing'),
+        'BJ' => __('Benin', 'invoicing'),
+        'BM' => __('Bermuda', 'invoicing'),
+        'BT' => __('Bhutan', 'invoicing'),
+        'BO' => __('Bolivia', 'invoicing'),
+        'BQ' => __('Bonaire, Saint Eustatius and Saba', 'invoicing'),
+        'BA' => __('Bosnia and Herzegovina', 'invoicing'),
+        'BW' => __('Botswana', 'invoicing'),
+        'BV' => __('Bouvet Island', 'invoicing'),
+        'BR' => __('Brazil', 'invoicing'),
+        'IO' => __('British Indian Ocean Territory', 'invoicing'),
+        'BN' => __('Brunei Darrussalam', 'invoicing'),
+        'BG' => __('Bulgaria', 'invoicing'),
+        'BF' => __('Burkina Faso', 'invoicing'),
+        'BI' => __('Burundi', 'invoicing'),
+        'KH' => __('Cambodia', 'invoicing'),
+        'CM' => __('Cameroon', 'invoicing'),
+        'CV' => __('Cape Verde', 'invoicing'),
+        'KY' => __('Cayman Islands', 'invoicing'),
+        'CF' => __('Central African Republic', 'invoicing'),
+        'TD' => __('Chad', 'invoicing'),
+        'CL' => __('Chile', 'invoicing'),
+        'CN' => __('China', 'invoicing'),
+        'CX' => __('Christmas Island', 'invoicing'),
+        'CC' => __('Cocos Islands', 'invoicing'),
+        'CO' => __('Colombia', 'invoicing'),
+        'KM' => __('Comoros', 'invoicing'),
+        'CD' => __('Congo, Democratic People\'s Republic', 'invoicing'),
+        'CG' => __('Congo, Republic of', 'invoicing'),
+        'CK' => __('Cook Islands', 'invoicing'),
+        'CR' => __('Costa Rica', 'invoicing'),
+        'CI' => __('Cote d\'Ivoire', 'invoicing'),
+        'HR' => __('Croatia/Hrvatska', 'invoicing'),
+        'CU' => __('Cuba', 'invoicing'),
+        'CW' => __('CuraÇao', 'invoicing'),
+        'CY' => __('Cyprus', 'invoicing'),
+        'CZ' => __('Czech Republic', 'invoicing'),
+        'DK' => __('Denmark', 'invoicing'),
+        'DJ' => __('Djibouti', 'invoicing'),
+        'DM' => __('Dominica', 'invoicing'),
+        'DO' => __('Dominican Republic', 'invoicing'),
+        'TP' => __('East Timor', 'invoicing'),
+        'EC' => __('Ecuador', 'invoicing'),
+        'EG' => __('Egypt', 'invoicing'),
+        'GQ' => __('Equatorial Guinea', 'invoicing'),
+        'SV' => __('El Salvador', 'invoicing'),
+        'ER' => __('Eritrea', 'invoicing'),
+        'EE' => __('Estonia', 'invoicing'),
+        'ET' => __('Ethiopia', 'invoicing'),
+        'FK' => __('Falkland Islands', 'invoicing'),
+        'FO' => __('Faroe Islands', 'invoicing'),
+        'FJ' => __('Fiji', 'invoicing'),
+        'FI' => __('Finland', 'invoicing'),
+        'FR' => __('France', 'invoicing'),
+        'GF' => __('French Guiana', 'invoicing'),
+        'PF' => __('French Polynesia', 'invoicing'),
+        'TF' => __('French Southern Territories', 'invoicing'),
+        'GA' => __('Gabon', 'invoicing'),
+        'GM' => __('Gambia', 'invoicing'),
+        'GE' => __('Georgia', 'invoicing'),
+        'DE' => __('Germany', 'invoicing'),
+        'GR' => __('Greece', 'invoicing'),
+        'GH' => __('Ghana', 'invoicing'),
+        'GI' => __('Gibraltar', 'invoicing'),
+        'GL' => __('Greenland', 'invoicing'),
+        'GD' => __('Grenada', 'invoicing'),
+        'GP' => __('Guadeloupe', 'invoicing'),
+        'GU' => __('Guam', 'invoicing'),
+        'GT' => __('Guatemala', 'invoicing'),
+        'GG' => __('Guernsey', 'invoicing'),
+        'GN' => __('Guinea', 'invoicing'),
+        'GW' => __('Guinea-Bissau', 'invoicing'),
+        'GY' => __('Guyana', 'invoicing'),
+        'HT' => __('Haiti', 'invoicing'),
+        'HM' => __('Heard and McDonald Islands', 'invoicing'),
+        'VA' => __('Holy See (City Vatican State)', 'invoicing'),
+        'HN' => __('Honduras', 'invoicing'),
+        'HK' => __('Hong Kong', 'invoicing'),
+        'HU' => __('Hungary', 'invoicing'),
+        'IS' => __('Iceland', 'invoicing'),
+        'IN' => __('India', 'invoicing'),
+        'ID' => __('Indonesia', 'invoicing'),
+        'IR' => __('Iran', 'invoicing'),
+        'IQ' => __('Iraq', 'invoicing'),
+        'IE' => __('Ireland', 'invoicing'),
+        'IM' => __('Isle of Man', 'invoicing'),
+        'IL' => __('Israel', 'invoicing'),
+        'IT' => __('Italy', 'invoicing'),
+        'JM' => __('Jamaica', 'invoicing'),
+        'JP' => __('Japan', 'invoicing'),
+        'JE' => __('Jersey', 'invoicing'),
+        'JO' => __('Jordan', 'invoicing'),
+        'KZ' => __('Kazakhstan', 'invoicing'),
+        'KE' => __('Kenya', 'invoicing'),
+        'KI' => __('Kiribati', 'invoicing'),
+        'KW' => __('Kuwait', 'invoicing'),
+        'KG' => __('Kyrgyzstan', 'invoicing'),
+        'LA' => __('Lao People\'s Democratic Republic', 'invoicing'),
+        'LV' => __('Latvia', 'invoicing'),
+        'LB' => __('Lebanon', 'invoicing'),
+        'LS' => __('Lesotho', 'invoicing'),
+        'LR' => __('Liberia', 'invoicing'),
+        'LY' => __('Libyan Arab Jamahiriya', 'invoicing'),
+        'LI' => __('Liechtenstein', 'invoicing'),
+        'LT' => __('Lithuania', 'invoicing'),
+        'LU' => __('Luxembourg', 'invoicing'),
+        'MO' => __('Macau', 'invoicing'),
+        'MK' => __('Macedonia', 'invoicing'),
+        'MG' => __('Madagascar', 'invoicing'),
+        'MW' => __('Malawi', 'invoicing'),
+        'MY' => __('Malaysia', 'invoicing'),
+        'MV' => __('Maldives', 'invoicing'),
+        'ML' => __('Mali', 'invoicing'),
+        'MT' => __('Malta', 'invoicing'),
+        'MH' => __('Marshall Islands', 'invoicing'),
+        'MQ' => __('Martinique', 'invoicing'),
+        'MR' => __('Mauritania', 'invoicing'),
+        'MU' => __('Mauritius', 'invoicing'),
+        'YT' => __('Mayotte', 'invoicing'),
+        'MX' => __('Mexico', 'invoicing'),
+        'FM' => __('Micronesia', 'invoicing'),
+        'MD' => __('Moldova, Republic of', 'invoicing'),
+        'MC' => __('Monaco', 'invoicing'),
+        'MN' => __('Mongolia', 'invoicing'),
+        'ME' => __('Montenegro', 'invoicing'),
+        'MS' => __('Montserrat', 'invoicing'),
+        'MA' => __('Morocco', 'invoicing'),
+        'MZ' => __('Mozambique', 'invoicing'),
+        'MM' => __('Myanmar', 'invoicing'),
+        'NA' => __('Namibia', 'invoicing'),
+        'NR' => __('Nauru', 'invoicing'),
+        'NP' => __('Nepal', 'invoicing'),
+        'NL' => __('Netherlands', 'invoicing'),
+        'AN' => __('Netherlands Antilles', 'invoicing'),
+        'NC' => __('New Caledonia', 'invoicing'),
+        'NZ' => __('New Zealand', 'invoicing'),
+        'NI' => __('Nicaragua', 'invoicing'),
+        'NE' => __('Niger', 'invoicing'),
+        'NG' => __('Nigeria', 'invoicing'),
+        'NU' => __('Niue', 'invoicing'),
+        'NF' => __('Norfolk Island', 'invoicing'),
+        'KP' => __('North Korea', 'invoicing'),
+        'MP' => __('Northern Mariana Islands', 'invoicing'),
+        'NO' => __('Norway', 'invoicing'),
+        'OM' => __('Oman', 'invoicing'),
+        'PK' => __('Pakistan', 'invoicing'),
+        'PW' => __('Palau', 'invoicing'),
+        'PS' => __('Palestinian Territories', 'invoicing'),
+        'PA' => __('Panama', 'invoicing'),
+        'PG' => __('Papua New Guinea', 'invoicing'),
+        'PY' => __('Paraguay', 'invoicing'),
+        'PE' => __('Peru', 'invoicing'),
+        'PH' => __('Phillipines', 'invoicing'),
+        'PN' => __('Pitcairn Island', 'invoicing'),
+        'PL' => __('Poland', 'invoicing'),
+        'PT' => __('Portugal', 'invoicing'),
+        'PR' => __('Puerto Rico', 'invoicing'),
+        'QA' => __('Qatar', 'invoicing'),
+        'XK' => __('Republic of Kosovo', 'invoicing'),
+        'RE' => __('Reunion Island', 'invoicing'),
+        'RO' => __('Romania', 'invoicing'),
+        'RU' => __('Russian Federation', 'invoicing'),
+        'RW' => __('Rwanda', 'invoicing'),
+        'BL' => __('Saint Barthélemy', 'invoicing'),
+        'SH' => __('Saint Helena', 'invoicing'),
+        'KN' => __('Saint Kitts and Nevis', 'invoicing'),
+        'LC' => __('Saint Lucia', 'invoicing'),
+        'MF' => __('Saint Martin (French)', 'invoicing'),
+        'SX' => __('Saint Martin (Dutch)', 'invoicing'),
+        'PM' => __('Saint Pierre and Miquelon', 'invoicing'),
+        'VC' => __('Saint Vincent and the Grenadines', 'invoicing'),
+        'SM' => __('San Marino', 'invoicing'),
+        'ST' => __('São Tomé and Príncipe', 'invoicing'),
+        'SA' => __('Saudi Arabia', 'invoicing'),
+        'SN' => __('Senegal', 'invoicing'),
+        'RS' => __('Serbia', 'invoicing'),
+        'SC' => __('Seychelles', 'invoicing'),
+        'SL' => __('Sierra Leone', 'invoicing'),
+        'SG' => __('Singapore', 'invoicing'),
+        'SK' => __('Slovak Republic', 'invoicing'),
+        'SI' => __('Slovenia', 'invoicing'),
+        'SB' => __('Solomon Islands', 'invoicing'),
+        'SO' => __('Somalia', 'invoicing'),
+        'ZA' => __('South Africa', 'invoicing'),
+        'GS' => __('South Georgia', 'invoicing'),
+        'KR' => __('South Korea', 'invoicing'),
+        'SS' => __('South Sudan', 'invoicing'),
+        'ES' => __('Spain', 'invoicing'),
+        'LK' => __('Sri Lanka', 'invoicing'),
+        'SD' => __('Sudan', 'invoicing'),
+        'SR' => __('Suriname', 'invoicing'),
+        'SJ' => __('Svalbard and Jan Mayen Islands', 'invoicing'),
+        'SZ' => __('Swaziland', 'invoicing'),
+        'SE' => __('Sweden', 'invoicing'),
+        'CH' => __('Switzerland', 'invoicing'),
+        'SY' => __('Syrian Arab Republic', 'invoicing'),
+        'TW' => __('Taiwan', 'invoicing'),
+        'TJ' => __('Tajikistan', 'invoicing'),
+        'TZ' => __('Tanzania', 'invoicing'),
+        'TH' => __('Thailand', 'invoicing'),
+        'TL' => __('Timor-Leste', 'invoicing'),
+        'TG' => __('Togo', 'invoicing'),
+        'TK' => __('Tokelau', 'invoicing'),
+        'TO' => __('Tonga', 'invoicing'),
+        'TT' => __('Trinidad and Tobago', 'invoicing'),
+        'TN' => __('Tunisia', 'invoicing'),
+        'TR' => __('Turkey', 'invoicing'),
+        'TM' => __('Turkmenistan', 'invoicing'),
+        'TC' => __('Turks and Caicos Islands', 'invoicing'),
+        'TV' => __('Tuvalu', 'invoicing'),
+        'UG' => __('Uganda', 'invoicing'),
+        'UA' => __('Ukraine', 'invoicing'),
+        'AE' => __('United Arab Emirates', 'invoicing'),
+        'UY' => __('Uruguay', 'invoicing'),
+        'UM' => __('US Minor Outlying Islands', 'invoicing'),
+        'UZ' => __('Uzbekistan', 'invoicing'),
+        'VU' => __('Vanuatu', 'invoicing'),
+        'VE' => __('Venezuela', 'invoicing'),
+        'VN' => __('Vietnam', 'invoicing'),
+        'VG' => __('Virgin Islands (British)', 'invoicing'),
+        'VI' => __('Virgin Islands (USA)', 'invoicing'),
+        'WF' => __('Wallis and Futuna Islands', 'invoicing'),
+        'EH' => __('Western Sahara', 'invoicing'),
+        'WS' => __('Western Samoa', 'invoicing'),
+        'YE' => __('Yemen', 'invoicing'),
+        'ZM' => __('Zambia', 'invoicing'),
+        'ZW' => __('Zimbabwe', 'invoicing'),
+    );
     
     if ( $first_empty ) {
         $countries = array_merge( array( '' => '' ), $countries );
@@ -1537,30 +1537,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . ' wpinv-select',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . ' wpinv-select',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {