AyeCode / invoicing

includes/class-wpinv-notes.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -14,65 +14,65 @@ 
     }
     
     public function init() {
-        do_action( 'wpinv_class_notes_init', $this );
+        do_action('wpinv_class_notes_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_notes_includes', $this );
+        do_action('wpinv_class_notes_includes', $this);
     }
     
     public function actions() {
         // Secure inovice notes
-        add_action( 'pre_get_comments', array( $this, 'set_invoice_note_type' ), 11, 1 );
+        add_action('pre_get_comments', array($this, 'set_invoice_note_type'), 11, 1);
         
-        do_action( 'wpinv_class_notes_actions', $this );
+        do_action('wpinv_class_notes_actions', $this);
     }
         
-    public function set_invoice_note_type( $query ) {
-        $post_ID        = !empty( $query->query_vars['post_ID'] ) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
+    public function set_invoice_note_type($query) {
+        $post_ID = !empty($query->query_vars['post_ID']) ? $query->query_vars['post_ID'] : $query->query_vars['post_id'];
         
-        if ( $post_ID && get_post_type( $post_ID ) == $this->invoice_post_type ) {
+        if ($post_ID && get_post_type($post_ID) == $this->invoice_post_type) {
             $query->query_vars['type__in']      = $this->comment_type;
             $query->query_vars['type__not_in']  = '';
         } else {        
-            if ( isset( $query->query_vars['type__in'] ) && $type_in = $query->query_vars['type__in'] ) {
-                if ( is_array( $type_in ) && in_array( $this->comment_type, $type_in ) ) {
-                    $key = array_search( $this->comment_type, $type_in );
-                    unset( $query->query_vars['type__in'][$key] );
-                } else if ( !is_array( $type_in ) && $type_in == $this->comment_type ) {
+            if (isset($query->query_vars['type__in']) && $type_in = $query->query_vars['type__in']) {
+                if (is_array($type_in) && in_array($this->comment_type, $type_in)) {
+                    $key = array_search($this->comment_type, $type_in);
+                    unset($query->query_vars['type__in'][$key]);
+                } else if (!is_array($type_in) && $type_in == $this->comment_type) {
                     $query->query_vars['type__in'] = '';
                 }
             }
             
-            if ( isset( $query->query_vars['type__not_in'] ) && $type_not_in = $query->query_vars['type__not_in'] ) {
-                if ( is_array( $type_not_in ) && !in_array( $this->comment_type, $type_not_in ) ) {
+            if (isset($query->query_vars['type__not_in']) && $type_not_in = $query->query_vars['type__not_in']) {
+                if (is_array($type_not_in) && !in_array($this->comment_type, $type_not_in)) {
                     $query->query_vars['type__not_in'][] = $this->comment_type;
-                } else if ( !is_array( $type_not_in ) && $type_not_in != $this->comment_type ) {
+                } else if (!is_array($type_not_in) && $type_not_in != $this->comment_type) {
                     $query->query_vars['type__not_in'] = (array)$query->query_vars['type__not_in'];
                     $query->query_vars['type__not_in'][] = $this->comment_type;
                 }
             } else {
-                $query->query_vars['type__not_in']  = $this->comment_type;
+                $query->query_vars['type__not_in'] = $this->comment_type;
             }
         }
         
         return $query;
     }
     
-    public function get_invoice_notes( $invoice_id = 0, $type = '' ) {
+    public function get_invoice_notes($invoice_id = 0, $type = '') {
         $args = array( 
             'post_id'   => $invoice_id,
             'order'     => 'comment_date_gmt',
             'order'     => 'DESC',
         );
         
-        if ( $type == 'customer' ) {
+        if ($type == 'customer') {
             $args['meta_key']   = '_wpi_customer_note';
             $args['meta_value'] = 1;
         }
         
-        $args   = apply_filters( 'wpinv_invoice_notes_args', $args, $this, $invoice_id, $type );
+        $args = apply_filters('wpinv_invoice_notes_args', $args, $this, $invoice_id, $type);
         
-        return get_comments( $args );
+        return get_comments($args);
     }
 }

includes/libraries/GeoIp2/Model/City.php

Spacing +1 added lines, -2 removed lines

@@ -130,7 +130,6 @@
     private function mostSpecificSubdivision()
     {
         return empty($this->subdivisions) ?
-            new \GeoIp2\Record\Subdivision(array(), $this->locales) :
-            end($this->subdivisions);
+            new \GeoIp2\Record\Subdivision(array(), $this->locales) : end($this->subdivisions);
     }
 }

includes/libraries/GeoIp2/WebService/Client.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         // This is for backwards compatibility. Do not remove except for a
         // major version bump.
         if (is_string($options)) {
-            $options = array( 'host' => $options );
+            $options = array('host' => $options);
         }
 
         if (!isset($options['host'])) {

includes/libraries/class-emogrifier.php

Spacing +14 added lines, -14 removed lines

@@ -238,7 +238,7 @@ 
 		if ($nodesWithStyleAttributes !== false) {
 			/** @var $nodeWithStyleAttribute DOMNode */
 			foreach ($nodesWithStyleAttributes as $node) {
-				$normalizedOriginalStyle = preg_replace_callback( '/[A-z\\-]+(?=\\:)/S', array( $this, 'strtolower' ), $node->getAttribute('style') );
+				$normalizedOriginalStyle = preg_replace_callback('/[A-z\\-]+(?=\\:)/S', array($this, 'strtolower'), $node->getAttribute('style'));
 
 				// in order to not overwrite existing style attributes in the HTML, we have to save the original HTML styles
 				$nodePath = $node->getNodePath();
@@ -289,7 +289,7 @@ 
 			}
 
 			// now sort the selectors by precedence
-			usort($allSelectors, array($this,'sortBySelectorPrecedence'));
+			usort($allSelectors, array($this, 'sortBySelectorPrecedence'));
 
 			$this->caches[self::CACHE_KEY_CSS][$cssKey] = $allSelectors;
 		}
@@ -329,7 +329,7 @@ 
 		if ($nodesWithStyleDisplayNone->length > 0) {
 			/** @var $node \DOMNode */
 			foreach ($nodesWithStyleDisplayNone as $node) {
-				if ($node->parentNode && is_callable(array($node->parentNode,'removeChild'))) {
+				if ($node->parentNode && is_callable(array($node->parentNode, 'removeChild'))) {
 					$node->parentNode->removeChild($node);
 				}
 			}
@@ -338,10 +338,10 @@ 
 		$this->copyCssWithMediaToStyleNode($cssParts, $xmlDocument);
 
 		if ($this->preserveEncoding) {
-			if ( function_exists( 'mb_convert_encoding' ) ) {
-				return mb_convert_encoding( $xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES' );
+			if (function_exists('mb_convert_encoding')) {
+				return mb_convert_encoding($xmlDocument->saveHTML(), self::ENCODING, 'HTML-ENTITIES');
 			} else {
-				return htmlspecialchars_decode( utf8_encode( html_entity_decode( $xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING ) ) );
+				return htmlspecialchars_decode(utf8_encode(html_entity_decode($xmlDocument->saveHTML(), ENT_COMPAT, self::ENCODING)));
 			}
 		} else {
 			return $xmlDocument->saveHTML();
@@ -462,7 +462,7 @@ 
 	 * @return array
 	 */
 	private function splitCssAndMediaQuery($css) {
-		$css = preg_replace_callback( '#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array( $this, '_media_concat' ), $css );
+		$css = preg_replace_callback('#@media\\s+(?:only\\s)?(?:[\\s{\(]|screen|all)\\s?[^{]+{.*}\\s*}\\s*#misU', array($this, '_media_concat'), $css);
 
 		// filter the CSS
 		$search = array(
@@ -486,7 +486,7 @@ 
 		return array('css' => $css, 'media' => self::$_media);
 	}
 
-	private function _media_concat( $matches ) {
+	private function _media_concat($matches) {
 		self::$_media .= $matches[0];
 	}
 
@@ -524,10 +524,10 @@ 
 			$bodyWithoutUnprocessableTags = $this->html;
 		}
 
-		if ( function_exists( 'mb_convert_encoding' ) ) {
-			return mb_convert_encoding( $bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING );
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($bodyWithoutUnprocessableTags, 'HTML-ENTITIES', self::ENCODING);
 		} else {
-			return htmlspecialchars_decode( utf8_decode( htmlentities( $bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false ) ) );
+			return htmlspecialchars_decode(utf8_decode(htmlentities($bodyWithoutUnprocessableTags, ENT_COMPAT, self::ENCODING, false)));
 		}
 	}
 
@@ -562,7 +562,7 @@ 
 			$precedence = 0;
 			$value = 100;
 			// ids: worth 100, classes: worth 10, elements: worth 1
-			$search = array('\\#','\\.','');
+			$search = array('\\#', '\\.', '');
 
 			foreach ($search as $s) {
 				if (trim($selector == '')) {
@@ -590,7 +590,7 @@ 
 	 */
 	private function translateCssToXpath($paramCssSelector) {
 		$cssSelector = ' ' . $paramCssSelector . ' ';
-		$cssSelector = preg_replace_callback( '/\s+\w+\s+/', array( $this, 'strtolower' ), $cssSelector );
+		$cssSelector = preg_replace_callback('/\s+\w+\s+/', array($this, 'strtolower'), $cssSelector);
 		$cssSelector = trim($cssSelector);
 		$xpathKey = md5($cssSelector);
 		if (!isset($this->caches[self::CACHE_KEY_XPATH][$xpathKey])) {
@@ -713,7 +713,7 @@ 
 	 * @return array
 	 */
 	private function parseNth(array $match) {
-		if (in_array(strtolower($match[2]), array('even','odd'))) {
+		if (in_array(strtolower($match[2]), array('even', 'odd'))) {
 			$index = strtolower($match[2]) == 'even' ? 0 : 1;
 			return array(self::MULTIPLIER => 2, self::INDEX => $index);
 		} elseif (stripos($match[2], 'n') === false) {

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

Spacing +24 added lines, -24 removed lines

@@ -21,10 +21,10 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function count( $args, $assoc_args ) {
+	public function count($args, $assoc_args) {
 		$sessions = WP_Session_Utils::count_sessions();
 
-		\WP_CLI::line( sprintf( '%d sessions currently exist.', absint( $sessions ) ) );
+		\WP_CLI::line(sprintf('%d sessions currently exist.', absint($sessions)));
 	}
 
 	/**
@@ -53,14 +53,14 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function delete( $args, $assoc_args ) {
-		if ( isset( $assoc_args['limit'] ) ) {
-			$limit = absint( $assoc_args['limit'] );
+	public function delete($args, $assoc_args) {
+		if (isset($assoc_args['limit'])) {
+			$limit = absint($assoc_args['limit']);
 
-			$count = WP_Session_Utils::delete_old_sessions( $limit );
+			$count = WP_Session_Utils::delete_old_sessions($limit);
 
-			if ( $count > 0 ) {
-				\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+			if ($count > 0) {
+				\WP_CLI::line(sprintf('Deleted %d sessions.', $count));
 			}
 
 			// Clear memory
@@ -69,32 +69,32 @@ 
 		}
 
 		// Determine if we're deleting all sessions or just a subset.
-		$all = isset( $assoc_args['all'] );
+		$all = isset($assoc_args['all']);
 
 		/**
 		 * Determine the size of each batch for deletion.
 		 *
 		 * @param int
 		 */
-		$batch = isset( $assoc_args['batch'] ) ? absint( $assoc_args['batch'] ) : apply_filters( 'wp_session_delete_batch_size', 1000 );
+		$batch = isset($assoc_args['batch']) ? absint($assoc_args['batch']) : apply_filters('wp_session_delete_batch_size', 1000);
 
-		switch ( $all ) {
+		switch ($all) {
 			case true:
 				$count = WP_Session_Utils::delete_all_sessions();
 
-				\WP_CLI::line( sprintf( 'Deleted all %d sessions.', $count ) );
+				\WP_CLI::line(sprintf('Deleted all %d sessions.', $count));
 				break;
 			case false:
 				do {
-					$count = WP_Session_Utils::delete_old_sessions( $batch );
+					$count = WP_Session_Utils::delete_old_sessions($batch);
 
-					if ( $count > 0 ) {
-						\WP_CLI::line( sprintf( 'Deleted %d sessions.', $count ) );
+					if ($count > 0) {
+						\WP_CLI::line(sprintf('Deleted %d sessions.', $count));
 					}
 
 					// Clear memory
 					self::free_up_memory();
-				} while ( $count > 0 );
+				} while ($count > 0);
 				break;
 		}
 	}
@@ -120,14 +120,14 @@ 
 	 * @param array $args
 	 * @param array $assoc_args
 	 */
-	public function generate( $args, $assoc_args ) {
-		$count = absint( $args[0] );
-		$date  = isset( $assoc_args['expires'] ) ? $assoc_args['expires'] : null;
+	public function generate($args, $assoc_args) {
+		$count = absint($args[0]);
+		$date  = isset($assoc_args['expires']) ? $assoc_args['expires'] : null;
 
-		$notify = \WP_CLI\Utils\make_progress_bar( 'Generating sessions', $count );
+		$notify = \WP_CLI\Utils\make_progress_bar('Generating sessions', $count);
 
-		for ( $i = 0; $i < $count; $i ++ ) {
-			WP_Session_Utils::create_dummy_session( $date );
+		for ($i = 0; $i < $count; $i++) {
+			WP_Session_Utils::create_dummy_session($date);
 			$notify->tick();
 		}
 
@@ -144,7 +144,7 @@ 
 		global $wp_object_cache, $wpdb;
 		$wpdb->queries = array();
 
-		if ( ! is_object( $wp_object_cache ) ) {
+		if (!is_object($wp_object_cache)) {
 			return;
 		}
 
@@ -155,4 +155,4 @@ 
 	}
 }
 
-\WP_CLI::add_command( 'session', 'WP_Session_Command' );
\ No newline at end of file
+\WP_CLI::add_command('session', 'WP_Session_Command');
\ No newline at end of file

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

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.php

Spacing +29 added lines, -29 removed lines

@@ -53,7 +53,7 @@ 
 	 * @return bool|WP_Session
 	 */
 	public static function get_instance() {
-		if ( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self();
 		}
 
@@ -69,19 +69,19 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
 	 */
 	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
+		if (isset($_COOKIE[WP_SESSION_COOKIE])) {
+			$cookie = stripslashes($_COOKIE[WP_SESSION_COOKIE]);
+			$cookie_crumbs = explode('||', $cookie);
 
-            $this->session_id = preg_replace("/[^A-Za-z0-9_]/", '', $cookie_crumbs[0] );
-            $this->expires = absint( $cookie_crumbs[1] );
-            $this->exp_variant = absint( $cookie_crumbs[2] );
+            $this->session_id = preg_replace("/[^A-Za-z0-9_]/", '', $cookie_crumbs[0]);
+            $this->expires = absint($cookie_crumbs[1]);
+            $this->exp_variant = absint($cookie_crumbs[2]);
 
 			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
+			if (time() > $this->exp_variant) {
 				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+				delete_option("_wp_session_expires_{$this->session_id}");
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			}
 		} else {
 			$this->session_id = WP_Session_Utils::generate_id();
@@ -113,8 +113,8 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
 	 */
 	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+		$this->exp_variant = time() + (int)apply_filters('wp_session_expiration_variant', 24 * 60);
+		$this->expires = time() + (int)apply_filters('wp_session_expiration', 30 * 60);
 	}
 
 	/**
@@ -123,13 +123,13 @@ 
 	* @uses apply_filters Calls `wp_session_cookie_httponly` to set the $httponly parameter of setcookie()
 	*/
 	protected function set_cookie() {
-		if ( !defined( 'WPI_TESTING_MODE' ) ) {
+		if (!defined('WPI_TESTING_MODE')) {
 			try {
 				$secure = apply_filters('wp_session_cookie_secure', false);
 				$httponly = apply_filters('wp_session_cookie_httponly', false);
-				setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN, $secure, $httponly );
-			} catch(Exception $e) {
-				error_log( 'Set Cookie Error: ' . $e->getMessage() );
+				setcookie(WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant, $this->expires, COOKIEPATH, COOKIE_DOMAIN, $secure, $httponly);
+			} catch (Exception $e) {
+				error_log('Set Cookie Error: ' . $e->getMessage());
 			}
 		}
 	}
@@ -142,7 +142,7 @@ 
 	 * @return array
 	 */
 	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
+		$this->container = get_option("_wp_session_{$this->session_id}", array());
 
 		return $this->container;
 	}
@@ -153,12 +153,12 @@ 
 	public function write_data() {
 		$option_key = "_wp_session_{$this->session_id}";
 		
-		if ( false === get_option( $option_key ) ) {
-			add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-			add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+		if (false === get_option($option_key)) {
+			add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
+			add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 		} else {
-			delete_option( "_wp_session_{$this->session_id}" );
-			add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+			delete_option("_wp_session_{$this->session_id}");
+			add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
 		}
 	}
 
@@ -168,7 +168,7 @@ 
 	 * @return string
 	 */
 	public function json_out() {
-		return json_encode( $this->container );
+		return json_encode($this->container);
 	}
 
 	/**
@@ -178,10 +178,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
+	public function json_in($data) {
+		$array = json_decode($data);
 
-		if ( is_array( $array ) ) {
+		if (is_array($array)) {
 			$this->container = $array;
 			return true;
 		}
@@ -194,9 +194,9 @@ 
 	 *
 	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
 	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
+	public function regenerate_id($delete_old = false) {
+		if ($delete_old) {
+			delete_option("_wp_session_{$this->session_id}");
 		}
 
 		$this->session_id = WP_Session_Utils::generate_id();

includes/libraries/wp-session/class-recursive-arrayaccess.php

Spacing +26 added lines, -26 removed lines

@@ -36,9 +36,9 @@ 
 	 *
 	 * @param array $data
 	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
+	protected function __construct($data = array()) {
+		foreach ($data as $key => $value) {
+			$this[$key] = $value;
 		}
 	}
 
@@ -46,9 +46,9 @@ 
 	 * Allow deep copies of objects
 	 */
 	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
+		foreach ($this->container as $key => $value) {
+			if ($value instanceof self) {
+				$this[$key] = clone $value;
 			}
 		}
 	}
@@ -60,9 +60,9 @@ 
 	 */
 	public function toArray() {
 		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
+		foreach ($data as $key => $value) {
+			if ($value instanceof self) {
+				$data[$key] = $value->toArray();
 			}
 		}
 		return $data;
@@ -81,8 +81,8 @@ 
 	 *
 	 * @return boolean true on success or false on failure.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
+	public function offsetExists($offset) {
+		return isset($this->container[$offset]);
 	}
 
 	/**
@@ -94,8 +94,8 @@ 
 	 *
 	 * @return mixed Can return all value types.
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->container[$offset]) ? $this->container[$offset] : null;
 	}
 
 	/**
@@ -108,14 +108,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
+	public function offsetSet($offset, $data) {
+		if (is_array($data)) {
+			$data = new self($data);
 		}
-		if ( $offset === null ) { // don't forget this!
+		if ($offset === null) { // don't forget this!
 			$this->container[] = $data;
 		} else {
-			$this->container[ $offset ] = $data;
+			$this->container[$offset] = $data;
 		}
 
 		$this->dirty = true;
@@ -130,8 +130,8 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->container[$offset]);
 
 		$this->dirty = true;
 	}
@@ -149,7 +149,7 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return current( $this->container );
+		return current($this->container);
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return key( $this->container );
+		return key($this->container);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 * @return void
 	 */
 	public function next() {
-		next( $this->container );
+		next($this->container);
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @return void
 	 */
 	public function rewind() {
-		reset( $this->container );
+		reset($this->container);
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return $this->offsetExists( $this->key() );
+		return $this->offsetExists($this->key());
 	}
 
 	/*****************************************************************/
@@ -208,6 +208,6 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->container );
+		return count($this->container);
 	}
 }

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

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