AyeCode / invoicing

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

Indentation +46 added lines, -46 removed lines

@@ -16,16 +16,16 @@ 
  * @return int
  */
 function wp_session_cache_expire() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->cache_expiration();
+    return $wp_session->cache_expiration();
 }
 
 /**
  * Alias of wp_session_write_close()
  */
 function wp_session_commit() {
-	wp_session_write_close();
+    wp_session_write_close();
 }
 
 /**
@@ -34,9 +34,9 @@ 
  * @param string $data
  */
 function wp_session_decode( $data ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+    return $wp_session->json_in( $data );
 }
 
 /**
@@ -45,9 +45,9 @@ 
  * @return string
  */
 function wp_session_encode() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_out();
+    return $wp_session->json_out();
 }
 
 /**
@@ -58,11 +58,11 @@ 
  * @return bool
  */
 function wp_session_regenerate_id( $delete_old_session = false ) {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+    $wp_session->regenerate_id( $delete_old_session );
 
-	return true;
+    return true;
 }
 
 /**
@@ -73,13 +73,13 @@ 
  * @return bool
  */
 function wp_session_start() {
-	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+    $wp_session = WP_Session::get_instance();
+    do_action( 'wp_session_start' );
 
-	return $wp_session->session_started();
+    return $wp_session->session_started();
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'plugins_loaded', 'wp_session_start' );
+    add_action( 'plugins_loaded', 'wp_session_start' );
 }
 
 /**
@@ -88,35 +88,35 @@ 
  * @return int
  */
 function wp_session_status() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
-		return PHP_SESSION_ACTIVE;
-	}
+    if ( $wp_session->session_started() ) {
+        return PHP_SESSION_ACTIVE;
+    }
 
-	return PHP_SESSION_NONE;
+    return PHP_SESSION_NONE;
 }
 
 /**
  * Unset all session variables.
  */
 function wp_session_unset() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->reset();
+    $wp_session->reset();
 }
 
 /**
  * Write session data and end session
  */
 function wp_session_write_close() {
-	$wp_session = WP_Session::get_instance();
+    $wp_session = WP_Session::get_instance();
 
-	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+    $wp_session->write_data();
+    do_action( 'wp_session_commit' );
 }
 if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'shutdown', 'wp_session_write_close' );
+    add_action( 'shutdown', 'wp_session_write_close' );
 }
 
 /**
@@ -127,24 +127,24 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
-		return;
-	}
-
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		/**
-		 * Determine the size of each batch for deletion.
-		 *
-		 * @param int
-		 */
-		$batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
-
-		// Delete a batch of old sessions
-		WP_Session_Utils::delete_old_sessions( $batch_size );
-	}
-
-	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+    if ( defined( 'WP_SETUP_CONFIG' ) ) {
+        return;
+    }
+
+    if ( ! defined( 'WP_INSTALLING' ) ) {
+        /**
+         * Determine the size of each batch for deletion.
+         *
+         * @param int
+         */
+        $batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
+
+        // Delete a batch of old sessions
+        WP_Session_Utils::delete_old_sessions( $batch_size );
+    }
+
+    // Allow other plugins to hook in to the garbage collection process.
+    do_action( 'wp_session_cleanup' );
 }
 add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
 
@@ -152,8 +152,8 @@ 
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
-	}
+    if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
+        wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
+    }
 }
 add_action( 'wp', 'wp_session_register_garbage_collection' );

Spacing +20 added lines, -20 removed lines

@@ -33,10 +33,10 @@ 
  *
  * @param string $data
  */
-function wp_session_decode( $data ) {
+function wp_session_decode($data) {
 	$wp_session = WP_Session::get_instance();
 
-	return $wp_session->json_in( $data );
+	return $wp_session->json_in($data);
 }
 
 /**
@@ -57,10 +57,10 @@ 
  *
  * @return bool
  */
-function wp_session_regenerate_id( $delete_old_session = false ) {
+function wp_session_regenerate_id($delete_old_session = false) {
 	$wp_session = WP_Session::get_instance();
 
-	$wp_session->regenerate_id( $delete_old_session );
+	$wp_session->regenerate_id($delete_old_session);
 
 	return true;
 }
@@ -74,12 +74,12 @@ 
  */
 function wp_session_start() {
 	$wp_session = WP_Session::get_instance();
-	do_action( 'wp_session_start' );
+	do_action('wp_session_start');
 
 	return $wp_session->session_started();
 }
-if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'plugins_loaded', 'wp_session_start' );
+if (!defined('WP_CLI') || false === WP_CLI) {
+	add_action('plugins_loaded', 'wp_session_start');
 }
 
 /**
@@ -90,7 +90,7 @@ 
 function wp_session_status() {
 	$wp_session = WP_Session::get_instance();
 
-	if ( $wp_session->session_started() ) {
+	if ($wp_session->session_started()) {
 		return PHP_SESSION_ACTIVE;
 	}
 
@@ -113,10 +113,10 @@ 
 	$wp_session = WP_Session::get_instance();
 
 	$wp_session->write_data();
-	do_action( 'wp_session_commit' );
+	do_action('wp_session_commit');
 }
-if ( ! defined( 'WP_CLI' ) || false === WP_CLI ) {
-	add_action( 'shutdown', 'wp_session_write_close' );
+if (!defined('WP_CLI') || false === WP_CLI) {
+	add_action('shutdown', 'wp_session_write_close');
 }
 
 /**
@@ -127,33 +127,33 @@ 
  * of a scheduled task or cron job.
  */
 function wp_session_cleanup() {
-	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+	if (defined('WP_SETUP_CONFIG')) {
 		return;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
+	if (!defined('WP_INSTALLING')) {
 		/**
 		 * Determine the size of each batch for deletion.
 		 *
 		 * @param int
 		 */
-		$batch_size = apply_filters( 'wp_session_delete_batch_size', 1000 );
+		$batch_size = apply_filters('wp_session_delete_batch_size', 1000);
 
 		// Delete a batch of old sessions
-		WP_Session_Utils::delete_old_sessions( $batch_size );
+		WP_Session_Utils::delete_old_sessions($batch_size);
 	}
 
 	// Allow other plugins to hook in to the garbage collection process.
-	do_action( 'wp_session_cleanup' );
+	do_action('wp_session_cleanup');
 }
-add_action( 'wp_session_garbage_collection', 'wp_session_cleanup' );
+add_action('wp_session_garbage_collection', 'wp_session_cleanup');
 
 /**
  * Register the garbage collector as a twice daily event.
  */
 function wp_session_register_garbage_collection() {
-	if ( ! wp_next_scheduled( 'wp_session_garbage_collection' ) ) {
-		wp_schedule_event( time(), 'hourly', 'wp_session_garbage_collection' );
+	if (!wp_next_scheduled('wp_session_garbage_collection')) {
+		wp_schedule_event(time(), 'hourly', 'wp_session_garbage_collection');
 	}
 }
-add_action( 'wp', 'wp_session_register_garbage_collection' );
+add_action('wp', 'wp_session_register_garbage_collection');

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

Spacing +28 added lines, -28 removed lines

@@ -23,11 +23,11 @@ 
 		 *
 		 * @param string $query Database count query
 		 */
-		$query = apply_filters( 'wp_session_count_query', $query );
+		$query = apply_filters('wp_session_count_query', $query);
 
-		$sessions = $wpdb->get_var( $query );
+		$sessions = $wpdb->get_var($query);
 
-		return absint( $sessions );
+		return absint($sessions);
 	}
 
 	/**
@@ -35,33 +35,33 @@ 
 	 *
 	 * @param null|string $date
 	 */
-	public static function create_dummy_session( $date = null ) {
+	public static function create_dummy_session($date = null) {
 		// Generate our date
-		if ( null !== $date ) {
-			$time = strtotime( $date );
+		if (null !== $date) {
+			$time = strtotime($date);
 
-			if ( false === $time ) {
+			if (false === $time) {
 				$date = null;
 			} else {
-				$expires = date( 'U', strtotime( $date ) );
+				$expires = date('U', strtotime($date));
 			}
 		}
 
 		// If null was passed, or if the string parsing failed, fall back on a default
-		if ( null === $date ) {
+		if (null === $date) {
 			/**
 			 * Filter the expiration of the session in the database
 			 *
 			 * @param int
 			 */
-			$expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+			$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' );
+		add_option("_wp_session_{$session_id}", array(), '', 'no');
+		add_option("_wp_session_expires_{$session_id}", $expires, '', 'no');
 	}
 
 	/**
@@ -73,22 +73,22 @@ 
 	 *
 	 * @return int Sessions deleted.
 	 */
-	public static function delete_old_sessions( $limit = 1000 ) {
+	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}" );
+		$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 ) {
+		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 ) );
+			if ($now > $expires) {
+				$session_id = preg_replace("/[^A-Za-z0-9_]/", '', substr($key, 20));
 
 				$expired[] = $key;
 				$expired[] = "_wp_session_{$session_id}";
@@ -98,13 +98,13 @@ 
 		}
 
 		// Delete expired sessions
-		if ( ! empty( $expired ) ) {
-		    $placeholders = array_fill( 0, count( $expired ), '%s' );
-		    $format = implode( ', ', $placeholders );
+		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 );
+		    $prepared = $wpdb->prepare($query, $expired);
+			$wpdb->query($prepared);
 		}
 
 		return $count;
@@ -120,9 +120,9 @@ 
 	public static function delete_all_sessions() {
 		global $wpdb;
 
-		$count = $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'" );
+		$count = $wpdb->query("DELETE FROM $wpdb->options WHERE option_name LIKE '_wp_session_%'");
 
-		return (int) ( $count / 2 );
+		return (int)($count / 2);
 	}
 
 	/**
@@ -131,9 +131,9 @@ 
 	 * @return string
 	 */
 	public static function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php' );
-		$hash = new PasswordHash( 8, false );
+		require_once(ABSPATH . 'wp-includes/class-phpass.php');
+		$hash = new PasswordHash(8, false);
 
-		return md5( $hash->get_random_bytes( 32 ) );
+		return md5($hash->get_random_bytes(32));
 	}
 } 
\ No newline at end of file

includes/class-wpinv-item.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 class WPInv_Item {
     public $ID = 0;

Spacing +125 added lines, -125 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_Item {
     public $ID = 0;
@@ -47,26 +47,26 @@ 
     public $filter;
 
 
-    public function __construct( $_id = false, $_args = array() ) {
-        $item = WP_Post::get_instance( $_id );
-        return $this->setup_item( $item );
+    public function __construct($_id = false, $_args = array()) {
+        $item = WP_Post::get_instance($_id);
+        return $this->setup_item($item);
     }
 
-    private function setup_item( $item ) {
-        if( ! is_object( $item ) ) {
+    private function setup_item($item) {
+        if (!is_object($item)) {
             return false;
         }
 
-        if( ! is_a( $item, 'WP_Post' ) ) {
+        if (!is_a($item, 'WP_Post')) {
             return false;
         }
 
-        if( 'wpi_item' !== $item->post_type ) {
+        if ('wpi_item' !== $item->post_type) {
             return false;
         }
 
-        foreach ( $item as $key => $value ) {
-            switch ( $key ) {
+        foreach ($item as $key => $value) {
+            switch ($key) {
                 default:
                     $this->$key = $value;
                     break;
@@ -76,38 +76,38 @@ 
         return true;
     }
 
-    public function __get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+    public function __get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         } else {
-            return new WP_Error( 'wpinv-item-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error('wpinv-item-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
         }
     }
 
-    public function create( $data = array(), $wp_error = false ) {
-        if ( $this->ID != 0 ) {
+    public function create($data = array(), $wp_error = false) {
+        if ($this->ID != 0) {
             return false;
         }
 
         $defaults = array(
             'post_type'   => 'wpi_item',
             'post_status' => 'draft',
-            'post_title'  => __( 'New Invoice Item', 'invoicing' )
+            'post_title'  => __('New Invoice Item', 'invoicing')
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        do_action( 'wpinv_item_pre_create', $args );
+        do_action('wpinv_item_pre_create', $args);
 
-        $id = wp_insert_post( $args, $wp_error );
+        $id = wp_insert_post($args, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
         
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
@@ -115,47 +115,47 @@ 
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_create', $id, $args );
+        do_action('wpinv_item_create', $id, $args);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
     
-    public function update( $data = array(), $wp_error = false ) {
-        if ( !$this->ID > 0 ) {
+    public function update($data = array(), $wp_error = false) {
+        if (!$this->ID > 0) {
             return false;
         }
         
         $data['ID'] = $this->ID;
 
-        do_action( 'wpinv_item_pre_update', $data );
+        do_action('wpinv_item_pre_update', $data);
         
-        $id = wp_update_post( $data, $wp_error );
+        $id = wp_update_post($data, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
         
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
 
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
         
         // Set custom id if not set.
-        if ( empty( $data['meta']['custom_id'] ) && !$this->get_custom_id() ) {
-            $this->save_metas( array( 'custom_id' => $id ) );
+        if (empty($data['meta']['custom_id']) && !$this->get_custom_id()) {
+            $this->save_metas(array('custom_id' => $id));
         }
 
-        do_action( 'wpinv_item_update', $id, $data );
+        do_action('wpinv_item_update', $id, $data);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
 
     public function get_ID() {
@@ -163,119 +163,119 @@ 
     }
 
     public function get_name() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_title() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_status() {
-        return get_post_status( $this->ID );
+        return get_post_status($this->ID);
     }
     
     public function get_summary() {
-        return get_the_excerpt( $this->ID );
+        return get_the_excerpt($this->ID);
     }
 
     public function get_price() {
-        if ( ! isset( $this->price ) ) {
-            $this->price = get_post_meta( $this->ID, '_wpinv_price', true );
+        if (!isset($this->price)) {
+            $this->price = get_post_meta($this->ID, '_wpinv_price', true);
             
-            if ( $this->price ) {
-                $this->price = wpinv_sanitize_amount( $this->price );
+            if ($this->price) {
+                $this->price = wpinv_sanitize_amount($this->price);
             } else {
                 $this->price = 0;
             }
         }
         
-        return apply_filters( 'wpinv_get_item_price', $this->price, $this->ID );
+        return apply_filters('wpinv_get_item_price', $this->price, $this->ID);
     }
     
     public function get_vat_rule() {
         global $wpinv_euvat;
         
-        if( !isset( $this->vat_rule ) ) {
-            $this->vat_rule = get_post_meta( $this->ID, '_wpinv_vat_rule', true );
+        if (!isset($this->vat_rule)) {
+            $this->vat_rule = get_post_meta($this->ID, '_wpinv_vat_rule', true);
 
-            if ( empty( $this->vat_rule ) ) {        
+            if (empty($this->vat_rule)) {        
                 $this->vat_rule = $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_rule', $this->vat_rule, $this->ID );
+        return apply_filters('wpinv_get_item_vat_rule', $this->vat_rule, $this->ID);
     }
     
     public function get_vat_class() {
-        if( !isset( $this->vat_class ) ) {
-            $this->vat_class = get_post_meta( $this->ID, '_wpinv_vat_class', true );
+        if (!isset($this->vat_class)) {
+            $this->vat_class = get_post_meta($this->ID, '_wpinv_vat_class', true);
 
-            if ( empty( $this->vat_class ) ) {        
+            if (empty($this->vat_class)) {        
                 $this->vat_class = '_standard';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $this->vat_class, $this->ID );
+        return apply_filters('wpinv_get_item_vat_class', $this->vat_class, $this->ID);
     }
 
     public function get_type() {
-        if( ! isset( $this->type ) ) {
-            $this->type = get_post_meta( $this->ID, '_wpinv_type', true );
+        if (!isset($this->type)) {
+            $this->type = get_post_meta($this->ID, '_wpinv_type', true);
 
-            if ( empty( $this->type ) ) {
+            if (empty($this->type)) {
                 $this->type = 'custom';
             }
         }
 
-        return apply_filters( 'wpinv_get_item_type', $this->type, $this->ID );
+        return apply_filters('wpinv_get_item_type', $this->type, $this->ID);
     }
     
     public function get_custom_id() {
-        $custom_id = get_post_meta( $this->ID, '_wpinv_custom_id', true );
+        $custom_id = get_post_meta($this->ID, '_wpinv_custom_id', true);
 
-        return apply_filters( 'wpinv_get_item_custom_id', $custom_id, $this->ID );
+        return apply_filters('wpinv_get_item_custom_id', $custom_id, $this->ID);
     }
     
     public function get_custom_name() {
-        $custom_name = get_post_meta( $this->ID, '_wpinv_custom_name', true );
+        $custom_name = get_post_meta($this->ID, '_wpinv_custom_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_name', $custom_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_name', $custom_name, $this->ID);
     }
     
     public function get_custom_singular_name() {
-        $custom_singular_name = get_post_meta( $this->ID, '_wpinv_custom_singular_name', true );
+        $custom_singular_name = get_post_meta($this->ID, '_wpinv_custom_singular_name', true);
 
-        return apply_filters( 'wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID );
+        return apply_filters('wpinv_get_item_custom_singular_name', $custom_singular_name, $this->ID);
     }
     
     public function get_editable() {
-        $editable = get_post_meta( $this->ID, '_wpinv_editable', true );
+        $editable = get_post_meta($this->ID, '_wpinv_editable', true);
 
-        return apply_filters( 'wpinv_item_get_editable', $editable, $this->ID );
+        return apply_filters('wpinv_item_get_editable', $editable, $this->ID);
     }
     
     public function get_excerpt() {
-        $excerpt = get_the_excerpt( $this->ID );
+        $excerpt = get_the_excerpt($this->ID);
         
-        return apply_filters( 'wpinv_item_get_excerpt', $excerpt, $this->ID );
+        return apply_filters('wpinv_item_get_excerpt', $excerpt, $this->ID);
     }
     
     public function get_is_recurring() {
-        $is_recurring = get_post_meta( $this->ID, '_wpinv_is_recurring', true );
+        $is_recurring = get_post_meta($this->ID, '_wpinv_is_recurring', true);
 
-        return apply_filters( 'wpinv_item_get_is_recurring', $is_recurring, $this->ID );
+        return apply_filters('wpinv_item_get_is_recurring', $is_recurring, $this->ID);
 
     }
     
-    public function get_recurring_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_recurring_period', true );
+    public function get_recurring_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_recurring_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -291,40 +291,40 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_recurring_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_recurring_period', $period, $full, $this->ID);
     }
     
     public function get_recurring_interval() {
-        $interval = (int)get_post_meta( $this->ID, '_wpinv_recurring_interval', true );
+        $interval = (int)get_post_meta($this->ID, '_wpinv_recurring_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_recurring_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_recurring_interval', $interval, $this->ID);
     }
     
     public function get_recurring_limit() {
-        $limit = get_post_meta( $this->ID, '_wpinv_recurring_limit', true );
+        $limit = get_post_meta($this->ID, '_wpinv_recurring_limit', true);
 
-        return (int)apply_filters( 'wpinv_item_recurring_limit', $limit, $this->ID );
+        return (int)apply_filters('wpinv_item_recurring_limit', $limit, $this->ID);
     }
     
     public function get_free_trial() {
-        $free_trial = get_post_meta( $this->ID, '_wpinv_free_trial', true );
+        $free_trial = get_post_meta($this->ID, '_wpinv_free_trial', true);
 
-        return apply_filters( 'wpinv_item_get_free_trial', $free_trial, $this->ID );
+        return apply_filters('wpinv_item_get_free_trial', $free_trial, $this->ID);
     }
     
-    public function get_trial_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_trial_period', true );
+    public function get_trial_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_trial_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -340,47 +340,47 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_trial_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_trial_period', $period, $full, $this->ID);
     }
     
     public function get_trial_interval() {
-        $interval = absint( get_post_meta( $this->ID, '_wpinv_trial_interval', true ) );
+        $interval = absint(get_post_meta($this->ID, '_wpinv_trial_interval', true));
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_trial_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_trial_interval', $interval, $this->ID);
     }
     
     public function get_the_price() {
-        $item_price = wpinv_price( wpinv_format_amount( $this->price ) );
+        $item_price = wpinv_price(wpinv_format_amount($this->price));
         
-        return apply_filters( 'wpinv_get_the_item_price', $item_price, $this->ID );
+        return apply_filters('wpinv_get_the_item_price', $item_price, $this->ID);
     }
     
     public function is_recurring() {
         $is_recurring = $this->get_is_recurring();
 
-        return (bool)apply_filters( 'wpinv_is_recurring_item', $is_recurring, $this->ID );
+        return (bool)apply_filters('wpinv_is_recurring_item', $is_recurring, $this->ID);
     }
     
     public function has_free_trial() {
         $free_trial = $this->is_recurring() && $this->get_free_trial() ? true : false;
 
-        return (bool)apply_filters( 'wpinv_item_has_free_trial', $free_trial, $this->ID );
+        return (bool)apply_filters('wpinv_item_has_free_trial', $free_trial, $this->ID);
     }
 
     public function is_free() {
         $is_free = false;
         
-        $price = get_post_meta( $this->ID, '_wpinv_price', true );
+        $price = get_post_meta($this->ID, '_wpinv_price', true);
 
-        if ( (float)$price == 0 ) {
+        if ((float)$price == 0) {
             $is_free = true;
         }
 
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID );
+        return (bool)apply_filters('wpinv_is_free_item', $is_free, $this->ID);
 
     }
     
@@ -389,15 +389,15 @@ 
 
         $is_editable = $editable === 0 || $editable === '0' ? false : true;
 
-        return (bool) apply_filters( 'wpinv_item_is_editable', $is_editable, $this->ID );
+        return (bool)apply_filters('wpinv_item_is_editable', $is_editable, $this->ID);
     }
     
-    public function save_metas( $metas = array() ) {
-        if ( empty( $metas ) ) {
+    public function save_metas($metas = array()) {
+        if (empty($metas)) {
             return false;
         }
         
-        foreach ( $metas as $meta_key => $meta_value ) {
+        foreach ($metas as $meta_key => $meta_value) {
             $meta_key = strpos($meta_key, '_wpinv_') !== 0 ? '_wpinv_' . $meta_key : $meta_key;
             
             $this->update_meta($meta_key, $meta_value);
@@ -406,66 +406,66 @@ 
         return true;
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
         
-        $meta_value = apply_filters( 'wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID);
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
     
-    public function get_fees( $type = 'fee', $item_id = 0 ) {
+    public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['custom_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int)$item_id !== (int)$fee['custom_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['custom_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['custom_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['custom_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['custom_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
     
     public function can_purchase() {
         $can_purchase = true;
 
-        if ( !current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool)apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool)apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 }

includes/gateways/worldpay.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_worldpay_cc_form', '__return_false' );
 

Spacing +60 added lines, -60 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_worldpay_cc_form', '__return_false' );
+add_action('wpinv_worldpay_cc_form', '__return_false');
 
-function wpinv_process_worldpay_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_worldpay_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
     // Collect payment data
@@ -24,120 +24,120 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         $quantities_enabled = wpinv_item_quantities_enabled();
         
-        $instId     = wpinv_get_option( 'worldpay_instId', false );
+        $instId     = wpinv_get_option('worldpay_instId', false);
         $cartId     = $invoice->get_number();
-        $testMode   = wpinv_is_test_mode( 'worldpay' ) ? 100 : 0;
+        $testMode   = wpinv_is_test_mode('worldpay') ? 100 : 0;
         $name       = $invoice->get_user_full_name();
-        $address    = wp_strip_all_tags( $invoice->get_address(), true );
+        $address    = wp_strip_all_tags($invoice->get_address(), true);
         $postcode   = $invoice->zip;
         $tel        = $invoice->phone;
         $email      = $invoice->get_email();
         $country    = $invoice->country;
-        $amount     = wpinv_sanitize_amount( $invoice->get_total() );
+        $amount     = wpinv_sanitize_amount($invoice->get_total());
         $currency   = wpinv_get_currency();
         
         $items      = array();
-        foreach ( $invoice->get_cart_details() as $item ) {
+        foreach ($invoice->get_cart_details() as $item) {
             $item_desc  = $item['name'];
-            $quantity   = !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-            $item_desc .= ' (' . ( $quantities_enabled ? $quantity . 'x ' : '' ) . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            $quantity   = !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+            $item_desc .= ' (' . ($quantities_enabled ? $quantity . 'x ' : '') . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
             
             $items[] = $item_desc;
         }
         
-        $desc = implode( ', ', $items );
-        if ( wpinv_use_taxes() && $invoice->get_tax() > 0 ) {
-            $desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+        $desc = implode(', ', $items);
+        if (wpinv_use_taxes() && $invoice->get_tax() > 0) {
+            $desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
         }
         
         $extra_params                   = array();
         $extra_params['MC_description'] = $desc;
-        $extra_params['MC_callback']    = wpinv_get_ipn_url( 'worldpay' );
+        $extra_params['MC_callback']    = wpinv_get_ipn_url('worldpay');
         $extra_params['MC_key']         = $invoice->get_key();
         $extra_params['MC_invoice_id']  = $invoice->ID;
         $extra_params['address1']       = $address;
         $extra_params['town']           = $invoice->city;
         $extra_params['region']         = $invoice->state;
-        $extra_params['amountString']   = $invoice->get_total( true );
-        $extra_params['countryString']  = wpinv_country_name( $invoice->country );
+        $extra_params['amountString']   = $invoice->get_total(true);
+        $extra_params['countryString']  = wpinv_country_name($invoice->country);
         $extra_params['compName']       = $invoice->company;
         
-        $extra_params   = apply_filters( 'wpinv_worldpay_form_extra_parameters', $extra_params, $invoice );
+        $extra_params   = apply_filters('wpinv_worldpay_form_extra_parameters', $extra_params, $invoice);
         
-        $redirect_text  = __( 'Redirecting to Worldpay site, click on button if not redirected.', 'invoicing' );
-        $redirect_text  = apply_filters( 'wpinv_worldpay_redirect_text', $redirect_text, $invoice );
+        $redirect_text  = __('Redirecting to Worldpay site, click on button if not redirected.', 'invoicing');
+        $redirect_text  = apply_filters('wpinv_worldpay_redirect_text', $redirect_text, $invoice);
         
         // Empty the shopping cart
         wpinv_empty_cart();
         ?>
 <div class="wpi-worldpay-form" style="padding:20px;font-family:arial,sans-serif;text-align:center;color:#555">
-<?php do_action( 'wpinv_worldpay_form_before', $invoice ); ?>
-<h3><?php echo $redirect_text ;?></h3>
+<?php do_action('wpinv_worldpay_form_before', $invoice); ?>
+<h3><?php echo $redirect_text; ?></h3>
 <form action="<?php echo wpinv_get_worldpay_redirect(); ?>" name="wpi_worldpay_form" method="POST">
-    <input type="hidden" value="<?php echo $amount;?>" name="amount">
-    <input type="hidden" value="<?php echo esc_attr( $cartId );?>" name="cartId">
-    <input type="hidden" value="<?php echo $currency;?>" name="currency">
-    <input type="hidden" value="<?php echo $instId;?>" name="instId">
-    <input type="hidden" value="<?php echo $testMode;?>" name="testMode">
-    <input type="hidden" value="<?php echo esc_attr( $name );?>" name="name">
-    <input type="hidden" value="<?php echo esc_attr( $address );?>" name="address">
-    <input type="hidden" value="<?php echo esc_attr( $postcode );?>" name="postcode">
-    <input type="hidden" value="<?php echo esc_attr( $tel );?>" name="tel">
-    <input type="hidden" value="<?php echo esc_attr( $email );?>" name="email">
-    <input type="hidden" value="<?php echo esc_attr( $country );?>" name="country">
-    <input type="hidden" value="<?php echo esc_attr( $desc );?>" name="desc">
-    <?php foreach ( $extra_params as $param => $value ) { ?>
-        <?php if ( !empty( $value !== false ) ) { ?>
-    <input type="hidden" value="<?php echo esc_attr( $value );?>" name="<?php echo esc_attr( $param );?>">
+    <input type="hidden" value="<?php echo $amount; ?>" name="amount">
+    <input type="hidden" value="<?php echo esc_attr($cartId); ?>" name="cartId">
+    <input type="hidden" value="<?php echo $currency; ?>" name="currency">
+    <input type="hidden" value="<?php echo $instId; ?>" name="instId">
+    <input type="hidden" value="<?php echo $testMode; ?>" name="testMode">
+    <input type="hidden" value="<?php echo esc_attr($name); ?>" name="name">
+    <input type="hidden" value="<?php echo esc_attr($address); ?>" name="address">
+    <input type="hidden" value="<?php echo esc_attr($postcode); ?>" name="postcode">
+    <input type="hidden" value="<?php echo esc_attr($tel); ?>" name="tel">
+    <input type="hidden" value="<?php echo esc_attr($email); ?>" name="email">
+    <input type="hidden" value="<?php echo esc_attr($country); ?>" name="country">
+    <input type="hidden" value="<?php echo esc_attr($desc); ?>" name="desc">
+    <?php foreach ($extra_params as $param => $value) { ?>
+        <?php if (!empty($value !== false)) { ?>
+    <input type="hidden" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($param); ?>">
         <?php } ?>
     <?php } ?>
-    <?php do_action( 'wpinv_worldpay_form_parameters', $invoice ); ?>
-    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e( 'Pay by Debit/Credit Card (WorldPay)', 'invoicing' ) ;?>">
+    <?php do_action('wpinv_worldpay_form_parameters', $invoice); ?>
+    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e('Pay by Debit/Credit Card (WorldPay)', 'invoicing'); ?>">
 </form>
 <script type="text/javascript">document.wpi_worldpay_form.submit();</script>
-<?php do_action( 'wpinv_worldpay_form_after', $invoice ); ?>
+<?php do_action('wpinv_worldpay_form_after', $invoice); ?>
 </div>
         <?php
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment' );
+add_action('wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment');
 
 function wpinv_get_worldpay_redirect() {
-    $redirect = wpinv_is_test_mode( 'worldpay' ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+    $redirect = wpinv_is_test_mode('worldpay') ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
     
-    return apply_filters( 'wpinv_worldpay_redirect', $redirect );
+    return apply_filters('wpinv_worldpay_redirect', $redirect);
 }
 
 function wpinv_process_worldpay_ipn() {
-    $request = wpinv_get_post_data( 'post' );
+    $request = wpinv_get_post_data('post');
     
-    if ( !empty( $request['cartId'] ) && !empty( $request['transStatus'] ) && !empty( $request['installation'] ) && isset( $request['testMode'] ) && isset( $request['MC_invoice_id'] ) && isset( $request['MC_key'] ) ) {
+    if (!empty($request['cartId']) && !empty($request['transStatus']) && !empty($request['installation']) && isset($request['testMode']) && isset($request['MC_invoice_id']) && isset($request['MC_key'])) {
         $invoice_id = $request['MC_invoice_id'];
         
-        if ( $invoice_id == wpinv_get_invoice_id_by_key( $request['MC_key'] ) && $invoice = wpinv_get_invoice( $invoice_id ) ) {
-            if ( $request['transStatus'] == 'Y' ) {                
-                wpinv_update_payment_status( $invoice_id, 'publish' );
-                wpinv_set_payment_transaction_id( $invoice_id, $request['transId'] );
-                wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Worldpay Transaction ID: %s', 'invoicing' ), $request['transId'] ) );
+        if ($invoice_id == wpinv_get_invoice_id_by_key($request['MC_key']) && $invoice = wpinv_get_invoice($invoice_id)) {
+            if ($request['transStatus'] == 'Y') {                
+                wpinv_update_payment_status($invoice_id, 'publish');
+                wpinv_set_payment_transaction_id($invoice_id, $request['transId']);
+                wpinv_insert_payment_note($invoice_id, sprintf(__('Worldpay Transaction ID: %s', 'invoicing'), $request['transId']));
                 return;
-            } else if ( $request['transStatus'] == 'C' ) {
-                wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-                wpinv_insert_payment_note( $invoice_id, __( 'Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing' ) );
+            } else if ($request['transStatus'] == 'C') {
+                wpinv_update_payment_status($invoice_id, 'wpi-failed');
+                wpinv_insert_payment_note($invoice_id, __('Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing'));
                 
-                wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing' ), json_encode( $request ) ), $invoice_id );
+                wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing'), json_encode($request)), $invoice_id);
                 return;
             }
         }
     }
     return;
 }
-add_action( 'wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn' );
\ No newline at end of file
+add_action('wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn');
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
         $string = "";
         foreach ($array as $key => $value) {
             if ($value) {
-                $string .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+                $string .= '<input type="hidden" name="' . $key . '" value="' . $value . '">';
             }
         }
         return $string;

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);

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
      */
     protected function _setPostString()
     {
-        $this->_post_string =<<<XML
+        $this->_post_string = <<<XML
 <?xml version="1.0" encoding="utf-8"?>
 <ARB{$this->_request_type} xmlns= "AnetApi/xml/v1/schema/AnetApiSchema.xsd">
     <merchantAuthentication>

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

Spacing +7 added lines, -7 removed lines

@@ -64,8 +64,8 @@ 
     {
         $month = ($month ? $month : date('m'));
         $year = ($year ? $year : date('Y'));
-        $firstSettlementDate = substr(date('c',mktime(0, 0, 0, $month, 1, $year)),0,-6);
-        $lastSettlementDate  = substr(date('c',mktime(0, 0, 0, $month+1, 0, $year)),0,-6);
+        $firstSettlementDate = substr(date('c', mktime(0, 0, 0, $month, 1, $year)), 0, -6);
+        $lastSettlementDate  = substr(date('c', mktime(0, 0, 0, $month + 1, 0, $year)), 0, -6);
         return $this->getSettledBatchList(true, $firstSettlementDate, $lastSettlementDate);
     }
 
@@ -98,8 +98,8 @@ 
         $month = ($month ? $month : date('m'));
         $day = ($day ? $day : date('d'));
         $year = ($year ? $year : date('Y'));
-        $firstSettlementDate = substr(date('c',mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)),0,-6);
-        $lastSettlementDate  = substr(date('c',mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)),0,-6);
+        $firstSettlementDate = substr(date('c', mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)), 0, -6);
+        $lastSettlementDate  = substr(date('c', mktime(0, 0, 0, (int)$month, (int)$day, (int)$year)), 0, -6);
         $response = $this->getSettledBatchList(true, $firstSettlementDate, $lastSettlementDate);
         $batches = $response->xpath("batchList/batch");
         foreach ($batches as $batch) {
@@ -187,11 +187,11 @@ 
      */
     private function _constructXml($request_type)
     {
-        $string = '<?xml version="1.0" encoding="utf-8"?><'.$request_type.' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></'.$request_type.'>';
+        $string = '<?xml version="1.0" encoding="utf-8"?><' . $request_type . ' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"></' . $request_type . '>';
         $this->_xml = @new SimpleXMLElement($string);
         $merchant = $this->_xml->addChild('merchantAuthentication');
-        $merchant->addChild('name',$this->_api_login);
-        $merchant->addChild('transactionKey',$this->_transaction_key);
+        $merchant->addChild('name', $this->_api_login);
+        $merchant->addChild('transactionKey', $this->_transaction_key);
     }
     
 }

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

Spacing +6 added lines, -6 removed lines

@@ -51,10 +51,10 @@ 
         $string = "";
         $types = $this->__getTypes();
         foreach ($types as $type) {
-            if (preg_match("/struct /",$type)) {
-                $type = preg_replace("/struct /","class ",$type);
-                $type = preg_replace("/ (\w+) (\w+);/","    // $1\n    public \$$2;",$type);
-                $string .= $type ."\n";
+            if (preg_match("/struct /", $type)) {
+                $type = preg_replace("/struct /", "class ", $type);
+                $type = preg_replace("/ (\w+) (\w+);/", "    // $1\n    public \$$2;", $type);
+                $string .= $type . "\n";
             }
         }
         return $string;
@@ -84,13 +84,13 @@ 
      */
     public function saveSoapDocumentation($path)
     {
-        $string =  "<?php\n";
+        $string = "<?php\n";
         $string .= "/**\n";
         $string .= " * Auto generated documentation for the AuthorizeNetSOAP API.\n";
         $string .= " * Generated " . date("m/d/Y") . "\n";
         $string .= " */\n";
         $string .= "class AuthorizeNetSOAP\n";
-        $string .= "{\n" . $this->getSoapMethods() . "\n}\n\n" . $this->getSoapTypes() ."\n\n ?>";
+        $string .= "{\n" . $this->getSoapMethods() . "\n}\n\n" . $this->getSoapTypes() . "\n\n ?>";
         return file_put_contents($path, $string);
     }
     

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']);
             }
         }
     }

Spacing +13 added lines, -13 removed lines

@@ -57,7 +57,7 @@ 
                 else
                 {
                     // Redirect to error page.
-                    $redirect_url = $url . '?response_code='.$response->response_code . '&response_reason_text=' . $response->response_reason_text;
+                    $redirect_url = $url . '?response_code=' . $response->response_code . '&response_reason_text=' . $response->response_reason_text;
                 }
                 // Send the Javascript back to AuthorizeNet, which will redirect user back to your site.
                 echo AuthorizeNetDPM::getRelayResponseSnippet($redirect_url);
@@ -179,54 +179,54 @@ 
             -moz-box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75);
             box-shadow: inset 3px -3px 3px rgba(0,0,0,.5), inset 0 3px 3px rgba(255,255,255,.5), inset -3px 0 3px rgba(255,255,255,.75); }
         </style>
-        <form method="post" action="'.$post_url.'">
-                '.$hidden_fields.'
+        <form method="post" action="'.$post_url . '">
+                '.$hidden_fields . '
             <fieldset>
                 <div>
                     <label>Credit Card Number</label>
-                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_card_num" value="'.($prefill ? '6011000000000012' : '') . '"></input>
                 </div>
                 <div>
                     <label>Exp.</label>
-                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_exp_date" value="'.($prefill ? '04/17' : '') . '"></input>
                 </div>
                 <div>
                     <label>CCV</label>
-                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_card_code" value="'.($prefill ? '782' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>First Name</label>
-                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_first_name" value="'.($prefill ? 'John' : '') . '"></input>
                 </div>
                 <div>
                     <label>Last Name</label>
-                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '').'"></input>
+                    <input type="text" class="text" size="14" name="x_last_name" value="'.($prefill ? 'Doe' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>Address</label>
-                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '').'"></input>
+                    <input type="text" class="text" size="26" name="x_address" value="'.($prefill ? '123 Main Street' : '') . '"></input>
                 </div>
                 <div>
                     <label>City</label>
-                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '').'"></input>
+                    <input type="text" class="text" size="15" name="x_city" value="'.($prefill ? 'Boston' : '') . '"></input>
                 </div>
             </fieldset>
             <fieldset>
                 <div>
                     <label>State</label>
-                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '').'"></input>
+                    <input type="text" class="text" size="4" name="x_state" value="'.($prefill ? 'MA' : '') . '"></input>
                 </div>
                 <div>
                     <label>Zip Code</label>
-                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '').'"></input>
+                    <input type="text" class="text" size="9" name="x_zip" value="'.($prefill ? '02142' : '') . '"></input>
                 </div>
                 <div>
                     <label>Country</label>
-                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '').'"></input>
+                    <input type="text" class="text" size="22" name="x_country" value="'.($prefill ? 'US' : '') . '"></input>
                 </div>
             </fieldset>
             <input type="submit" value="BUY" class="submit buy">

Braces +3 added lines, -6 removed lines

@@ -53,16 +53,14 @@ 
                 {
                     // Do your processing here.
                     $redirect_url = $url . '?response_code=1&transaction_id=' . $response->transaction_id; 
-                }
-                else
+                } else
                 {
                     // Redirect to error page.
                     $redirect_url = $url . '?response_code='.$response->response_code . '&response_reason_text=' . $response->response_reason_text;
                 }
                 // Send the Javascript back to AuthorizeNet, which will redirect user back to your site.
                 echo AuthorizeNetDPM::getRelayResponseSnippet($redirect_url);
-            }
-            else
+            } else
             {
                 echo "Error -- not AuthorizeNet. Check your MD5 Setting.";
             }
@@ -73,8 +71,7 @@ 
             if ($_GET['response_code'] == 1)
             {
                 echo "Thank you for your purchase! Transaction id: " . htmlentities($_GET['transaction_id']);
-            }
-            else
+            } else
             {
               echo "Sorry, an error occurred: " . htmlentities($_GET['response_reason_text']);
             }