AyeCode / invoicing

includes/admin/html-admin-page-addons.php

Indentation +51 added lines, -51 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 add_ThickBox();
 ?>
@@ -14,18 +14,18 @@ 
 	<?php if ( $tabs ){ ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
-			}
-			do_action( 'wpi_addons_tabs' );
-			?>
+            foreach ( $tabs as $name => $label ) {
+                echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
+            }
+            do_action( 'wpi_addons_tabs' );
+            ?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+        if($current_tab == 'membership'){
 
-			?>
+            ?>
 
 			<div class="wpi-membership-tab-conatiner">
 				<div class="membership-content">
@@ -36,9 +36,9 @@ 
 					<h2>Have a membership key?</h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108));
-						?>
+                        $wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
+                        echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108));
+                        ?>
 					</p>
 				<?php }?>
 
@@ -89,8 +89,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -109,8 +109,8 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
-								?>
+                                    echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
+                                ?>
 							</div>
 							<div class="t-content">
 								<p>
@@ -134,20 +134,20 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
-			$installed_plugins = get_plugins();
+        }else{
+            $installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
-				?>
+            if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+                ?>
 				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
                         if(965==$addon->info->id){continue;}// don't show quote add on
-						?><li class="wpi-product">
+                        ?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
-										}
-										echo esc_html( $addon->info->title ); ?></h3>
+                                        if ( ! empty( $addon->info->excerpt) ){
+                                            echo wpi_help_tip( $addon->info->excerpt );
+                                        }
+                                        echo esc_html( $addon->info->title ); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
@@ -155,27 +155,27 @@ 
 										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
 									<?php endif;
 
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
-										}else{
-											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
-												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
-											}
-										}
-										echo '<a href="'.$url.'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
-										echo '</a>';
-									}
-
-									?>
+                                    if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
+                                        echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
+                                        if(defined('WP_EASY_UPDATES_ACTIVE')){
+                                            $url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
+                                        }else{
+                                            // if installed show activation link
+                                            if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
+                                            }else{
+                                                $url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
+                                            }
+                                        }
+                                        echo '<a href="'.$url.'" class="thickbox">';
+                                        echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+                                        echo '</a>';
+                                    }
+
+                                    ?>
 
 								</span>
 
@@ -183,15 +183,15 @@ 
 								<span class="wpi-product-button">
 									<?php
                                     $addon_obj->output_button( $addon );
-									?>
+                                    ?>
 								</span>
 
 								<span class="wpi-price"><?php //print_r($addon); //echo wp_kses_post( $addon->price ); ?></span></li><?php endforeach; ?></ul>
 			<?php endif;
-		}
+        }
 
-	}
-	?>
+    }
+    ?>
 
 
 	<div class="clearfix" ></div>
@@ -210,8 +210,8 @@ 
 			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
-			?>
+            echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+            ?>
 		</span>
 	</div>
 

Spacing +41 added lines, -41 removed lines

@@ -3,7 +3,7 @@ 
  * Admin View: Page - Addons
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 add_ThickBox();
@@ -11,19 +11,19 @@ 
 <div class="wrap wpi_addons_wrap">
 	<h1><?php echo get_admin_page_title(); ?></h1>
 
-	<?php if ( $tabs ){ ?>
+	<?php if ($tabs) { ?>
 		<nav class="nav-tab-wrapper wpi-nav-tab-wrapper">
 			<?php
-			foreach ( $tabs as $name => $label ) {
-				echo '<a href="' . admin_url( 'admin.php?page=wpi-addons&tab=' . $name ) . '" class="nav-tab ' . ( $current_tab == $name ? 'nav-tab-active' : '' ) . '">' . $label . '</a>';
+			foreach ($tabs as $name => $label) {
+				echo '<a href="' . admin_url('admin.php?page=wpi-addons&tab=' . $name) . '" class="nav-tab ' . ($current_tab == $name ? 'nav-tab-active' : '') . '">' . $label . '</a>';
 			}
-			do_action( 'wpi_addons_tabs' );
+			do_action('wpi_addons_tabs');
 			?>
 		</nav>
 
 		<?php
 
-		if($current_tab == 'membership'){
+		if ($current_tab == 'membership') {
 
 			?>
 
@@ -32,12 +32,12 @@ 
 <!--
 				<h2>With our WPInvoicing Membership you get access to all our products!</h2>
 				<p><a class="button button-primary" href="https://wpinvoicing.com/downloads/membership/">View Memberships</a></p>-->
-				<?php if(defined('WP_EASY_UPDATES_ACTIVE')){?>
+				<?php if (defined('WP_EASY_UPDATES_ACTIVE')) {?>
 					<h2>Have a membership key?</h2>
 					<p>
 						<?php
-						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com','1');
-						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership',array(95, 106, 108));
+						$wpeu_admin = new External_Updates_Admin('wpinvoicing.com', '1');
+						echo $wpeu_admin->render_licence_actions('wpinvoicing.com', 'membership', array(95, 106, 108));
 						?>
 					</p>
 				<?php }?>
@@ -89,7 +89,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image2.png', dirname(__FILE__) ) . '" > ';
+									echo '<img src="' . plugins_url('images/t-image2.png', dirname(__FILE__)) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -109,7 +109,7 @@ 
 						<div class="testimonial-content">
 							<div class="t-image">
 								<?php
-									echo '<img src="' . plugins_url( 'images/t-image1.png', dirname(__FILE__) ) . '" > ';
+									echo '<img src="' . plugins_url('images/t-image1.png', dirname(__FILE__)) . '" > ';
 								?>
 							</div>
 							<div class="t-content">
@@ -134,44 +134,44 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} else {
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
-			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
+			if ($addons = $addon_obj->get_section_data($current_tab)) :
 				?>
-				<ul class="wpi-products"><?php foreach ( $addons as $addon ) :
-                        if(965==$addon->info->id){continue;}// don't show quote add on
+				<ul class="wpi-products"><?php foreach ($addons as $addon) :
+                        if (965 == $addon->info->id) {continue; }// don't show quote add on
 						?><li class="wpi-product">
 								<div class="wpi-product-title">
 									<h3><?php
-										if ( ! empty( $addon->info->excerpt) ){
-											echo wpi_help_tip( $addon->info->excerpt );
+										if (!empty($addon->info->excerpt)) {
+											echo wpi_help_tip($addon->info->excerpt);
 										}
-										echo esc_html( $addon->info->title ); ?></h3>
+										echo esc_html($addon->info->title); ?></h3>
 								</div>
 
 								<span class="wpi-product-image">
-									<?php if ( ! empty( $addon->info->thumbnail) ) : ?>
-										<img src="<?php echo esc_attr( $addon->info->thumbnail ); ?>"/>
+									<?php if (!empty($addon->info->thumbnail)) : ?>
+										<img src="<?php echo esc_attr($addon->info->thumbnail); ?>"/>
 									<?php endif;
 
-									if(isset($addon->info->link) && substr( $addon->info->link, 0, 21 ) === "https://wordpress.org"){
-										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+									if (isset($addon->info->link) && substr($addon->info->link, 0, 21) === "https://wordpress.org") {
+										echo '<a href="' . admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug) . '&TB_iframe=true&width=770&height=660" class="thickbox" >';
+										echo '<span class="wpi-product-info">' . __('More info', 'invoicing') . '</span>';
 										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
-										if(defined('WP_EASY_UPDATES_ACTIVE')){
-											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
-										}else{
+									}elseif (isset($addon->info->link) && substr($addon->info->link, 0, 23) === "https://wpinvoicing.com") {
+										if (defined('WP_EASY_UPDATES_ACTIVE')) {
+											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin=' . $addon->info->slug . '&TB_iframe=true&width=770&height=660&item_id=' . $addon->info->id . '&update_url=https://wpinvoicing.com');
+										} else {
 											// if installed show activation link
-											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
+											if (isset($installed_plugins['wp-easy-updates/external-updates.php'])) {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} else {
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}
-										echo '<a href="'.$url.'" class="thickbox">';
-										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
+										echo '<a href="' . $url . '" class="thickbox">';
+										echo '<span class="wpi-product-info">' . __('More info', 'invoicing') . '</span>';
 										echo '</a>';
 									}
 
@@ -182,7 +182,7 @@ 
 
 								<span class="wpi-product-button">
 									<?php
-                                    $addon_obj->output_button( $addon );
+                                    $addon_obj->output_button($addon);
 									?>
 								</span>
 
@@ -196,21 +196,21 @@ 
 
 	<div class="clearfix" ></div>
 
-	<?php if($current_tab =='addons'){ ?>
-	<p><?php printf( __( 'All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/addons/' ); ?></p>
-	<?php } if($current_tab =='gateways'){  ?>
-    <p><?php printf( __( 'All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing' ), 'https://wpinvoicing.com/downloads/category/gateways/' ); ?></p>
+	<?php if ($current_tab == 'addons') { ?>
+	<p><?php printf(__('All of our Invoicing Addons can be found on WPInvoicing.com here: <a href="%s">Invoicing Addons</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/addons/'); ?></p>
+	<?php } if ($current_tab == 'gateways') {  ?>
+    <p><?php printf(__('All of our Invoicing Payment Gateways can be found on WPInvoicing.com here: <a href="%s">Invoicing Payment Gateways</a>', 'invoicing'), 'https://wpinvoicing.com/downloads/category/gateways/'); ?></p>
     <?php } ?>
 
-	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf( __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.",'invoicing'),wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php'));?></span></div>
-	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(  __("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.",'invoicing'),admin_url("plugin-install.php?tab=upload&wpeu-install=true"));?></span></div>
+	<div id="wpi-wpeu-required-activation" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s'>activate</a> it now.", 'invoicing'), wp_nonce_url(admin_url('plugins.php?action=activate&plugin=wp-easy-updates/external-updates.php'), 'activate-plugin_wp-easy-updates/external-updates.php')); ?></span></div>
+	<div id="wpi-wpeu-required-for-external" style="display:none;"><span class="wpi-notification "><?php printf(__("The plugin <a href='https://wpeasyupdates.com/' target='_blank'>WP Easy Updates</a> is required to check for and update some installed plugins/themes, please <a href='%s' onclick='window.open(\"https://wpeasyupdates.com/wp-easy-updates.zip\", \"_blank\");' >download</a> and install it now.", 'invoicing'), admin_url("plugin-install.php?tab=upload&wpeu-install=true")); ?></span></div>
 	<div id="wpeu-licence-popup" style="display:none;">
 		<span class="wpi-notification noti-white">
-			<h3 class="wpeu-licence-title"><?php _e("Licence key",'invoicing');?></h3>
-			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key",'invoicing');?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install",'invoicing');?></button>
+			<h3 class="wpeu-licence-title"><?php _e("Licence key", 'invoicing'); ?></h3>
+			<input class="wpeu-licence-key" type="text" placeholder="<?php _e("Enter your licence key", 'invoicing'); ?>"> <button class="button-primary wpeu-licence-popup-button" ><?php _e("Install", 'invoicing'); ?></button>
 			<br>
 			<?php
-			echo sprintf( __('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">','</a>','<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">','</a>' );
+			echo sprintf(__('%sFind your licence key here%s OR %sBuy one here%s', 'invoicing'), '<a href="https://wpinvoicing.com/your-account/" target="_blank">', '</a>', '<a class="wpeu-licence-link" href="https://wpinvoicing.com/downloads/category/addons/" target="_blank">', '</a>');
 			?>
 		</span>
 	</div>

Braces +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
 			</div>
 		</div>
 			<?php
-		}else{
+		} else{
 			$installed_plugins = get_plugins();
             $addon_obj = new WPInv_Admin_Addons();
 			if ($addons = $addon_obj->get_section_data( $current_tab ) ) :
@@ -159,14 +159,14 @@ 
 										echo '<a href="'.admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug).'&TB_iframe=true&width=770&height=660" class="thickbox" >';
 										echo '<span class="wpi-product-info">'.__('More info','invoicing').'</span>';
 										echo '</a>';
-									}elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
+									} elseif(isset($addon->info->link) && substr( $addon->info->link, 0, 23 ) === "https://wpinvoicing.com"){
 										if(defined('WP_EASY_UPDATES_ACTIVE')){
 											$url = admin_url('/plugin-install.php?tab=plugin-information&plugin='.$addon->info->slug.'&TB_iframe=true&width=770&height=660&item_id='.$addon->info->id.'&update_url=https://wpinvoicing.com');
-										}else{
+										} else{
 											// if installed show activation link
 											if(isset($installed_plugins['wp-easy-updates/external-updates.php'])){
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-activation';
-											}else{
+											} else{
 												$url = '#TB_inline?width=600&height=50&inlineId=wpi-wpeu-required-for-external';
 											}
 										}

includes/class-wpinv-cardinal-commerce.php

Doc Comments +20 added lines

@@ -253,6 +253,9 @@ 
 	        WPINV_VERSION, true);
     }
 
+    /**
+     * @param string $source
+     */
     private static function base64_encode_urlsafe($source) {
         $rv = base64_encode($source);
         $rv = str_replace('=', '', $rv);
@@ -286,6 +289,9 @@ 
         return $header . '.' . $body . '.' . $signature;
     }
 
+    /**
+     * @param WPInv_Invoice $invoice
+     */
     private function generate_cruise_jwt($invoice = null) {
         $iat = time();
         $data = array(
@@ -317,6 +323,9 @@ 
         return $payload;
     }
 
+    /**
+     * @param string $id
+     */
     public function hidden_input($id, $value = '') {
         echo "<input type='hidden' id='{$id}' value='{$value}' />";
     }
@@ -333,6 +342,10 @@ 
         echo "<input type='hidden' autocomplete='off' id='{$id}' name='$id' /><div id='merchant-content-wrapper' style='display: none'><div id='actual-merchant-content'>{$merchant_content}</div></div>";
     }
 
+    /**
+     * @param string $type
+     * @param string $amount
+     */
     public function pm_message($type, $orderid, $amount, $currency, $fields=array()) {
         $timestamp = time() * 1000;
         $plaintext = $timestamp . '9b11d472-91c9-4c5d-aadf-c32e710db171';
@@ -427,6 +440,9 @@ 
 	    wpinv_send_back_to_checkout( '?payment-mode=paypalpro' );
     }
 
+    /**
+     * @param WPInv_Invoice|null $invoice
+     */
     public function order_add($invoice, $key, $value) {
         update_post_meta($invoice->ID, "_{$this->id}_{$key}", $value);
     }
@@ -436,6 +452,10 @@ 
         return isset($meta[0]) ? $meta[0] : null;
     }
 
+    /**
+     * @param WPInv_Invoice|null $invoice
+     * @param string $message
+     */
     public function status_message($invoice, $message, $amount = null,
                                    $error = null) {
         if (!$amount) {

Indentation +230 added lines, -230 removed lines

@@ -11,231 +11,231 @@ 
         $this->method_title = '3-D Secure Payment Gateway by CardinalCommerce';
 
         $this->currencies = array(
-	        'ADP' => '020',
-	        'AED' => '784',
-	        'AFA' => '004',
-	        'AFN' => '971',
-	        'ALL' => '008',
-	        'AMD' => '051',
-	        'ANG' => '532',
-	        'AOA' => '973',
-	        'AON' => '024',
-	        'ARS' => '032',
-	        'ATS' => '040',
-	        'AUD' => '036',
-	        'AWG' => '533',
-	        'AZM' => '031',
-	        'AZN' => '944',
-	        'BAM' => '977',
-	        'BBD' => '052',
-	        'BDT' => '050',
-	        'BEF' => '056',
-	        'BGL' => '100',
-	        'BGN' => '975',
-	        'BHD' => '048',
-	        'BIF' => '108',
-	        'BMD' => '060',
-	        'BND' => '096',
-	        'BOB' => '068',
-	        'BOV' => '984',
-	        'BRL' => '986',
-	        'BSD' => '044',
-	        'BTN' => '064',
-	        'BWP' => '072',
-	        'BYR' => '974',
-	        'BZD' => '084',
-	        'CAD' => '124',
-	        'CDF' => '976',
-	        'CHE' => '947',
-	        'CHF' => '756',
-	        'CHW' => '948',
-	        'CLF' => '990',
-	        'CLP' => '152',
-	        'CNY' => '156',
-	        'COP' => '170',
-	        'COU' => '970',
-	        'CRC' => '188',
-	        'CSD' => '891',
-	        'CUC' => '931',
-	        'CUP' => '192',
-	        'CVE' => '132',
-	        'CYP' => '196',
-	        'CZK' => '203',
-	        'DEM' => '276',
-	        'DJF' => '262',
-	        'DKK' => '208',
-	        'DOP' => '214',
-	        'DZD' => '012',
-	        'EEK' => '233',
-	        'EGP' => '818',
-	        'ERN' => '232',
-	        'ESP' => '724',
-	        'ETB' => '230',
-	        'EUR' => '978',
-	        'FIM' => '246',
-	        'FJD' => '242',
-	        'FKP' => '238',
-	        'FRF' => '250',
-	        'GBP' => '826',
-	        'GEL' => '981',
-	        'GHC' => '288',
-	        'GHS' => '936',
-	        'GIP' => '292',
-	        'GMD' => '270',
-	        'GNF' => '324',
-	        'GTQ' => '320',
-	        'GWP' => '624',
-	        'GYD' => '328',
-	        'HKD' => '344',
-	        'HNL' => '340',
-	        'HRK' => '191',
-	        'HTG' => '332',
-	        'HUF' => '348',
-	        'IDR' => '360',
-	        'IEP' => '372',
-	        'ILS' => '376',
-	        'INR' => '356',
-	        'IQD' => '368',
-	        'IRR' => '364',
-	        'ISK' => '352',
-	        'ITL' => '380',
-	        'JMD' => '388',
-	        'JOD' => '400',
-	        'JPY' => '392',
-	        'KES' => '404',
-	        'KGS' => '417',
-	        'KHR' => '116',
-	        'KMF' => '174',
-	        'KPW' => '408',
-	        'KRW' => '410',
-	        'KWD' => '414',
-	        'KYD' => '136',
-	        'KZT' => '398',
-	        'LAK' => '418',
-	        'LBP' => '422',
-	        'LKR' => '144',
-	        'LRD' => '430',
-	        'LSL' => '426',
-	        'LTL' => '440',
-	        'LUF' => '442',
-	        'LVL' => '428',
-	        'LYD' => '434',
-	        'MAD' => '504',
-	        'MDL' => '498',
-	        'MGA' => '969',
-	        'MGF' => '450',
-	        'MKD' => '807',
-	        'MMK' => '104',
-	        'MNT' => '496',
-	        'MOP' => '446',
-	        'MRO' => '478',
-	        'MTL' => '470',
-	        'MUR' => '480',
-	        'MVR' => '462',
-	        'MWK' => '454',
-	        'MXN' => '484',
-	        'MXV' => '979',
-	        'MYR' => '458',
-	        'MZM' => '508',
-	        'MZN' => '943',
-	        'NAD' => '516',
-	        'NGN' => '566',
-	        'NIO' => '558',
-	        'NLG' => '528',
-	        'NOK' => '578',
-	        'NPR' => '524',
-	        'NZD' => '554',
-	        'OMR' => '512',
-	        'PAB' => '590',
-	        'PEN' => '604',
-	        'PGK' => '598',
-	        'PHP' => '608',
-	        'PKR' => '586',
-	        'PLN' => '985',
-	        'PTE' => '620',
-	        'PYG' => '600',
-	        'QAR' => '634',
-	        'ROL' => '642',
-	        'RON' => '946',
-	        'RSD' => '941',
-	        'RUB' => '643',
-	        'RUR' => '810',
-	        'RWF' => '646',
-	        'SAR' => '682',
-	        'SBD' => '090',
-	        'SCR' => '690',
-	        'SDD' => '736',
-	        'SDG' => '938',
-	        'SEK' => '752',
-	        'SGD' => '702',
-	        'SHP' => '654',
-	        'SIT' => '705',
-	        'SKK' => '703',
-	        'SLL' => '694',
-	        'SOS' => '706',
-	        'SRD' => '968',
-	        'SRG' => '740',
-	        'SSP' => '728',
-	        'STD' => '678',
-	        'SVC' => '222',
-	        'SYP' => '760',
-	        'SZL' => '748',
-	        'THB' => '764',
-	        'TJS' => '972',
-	        'TMM' => '795',
-	        'TMT' => '934',
-	        'TND' => '788',
-	        'TOP' => '776',
-	        'TPE' => '626',
-	        'TRL' => '792',
-	        'TRY' => '949',
-	        'TTD' => '780',
-	        'TWD' => '901',
-	        'TZS' => '834',
-	        'UAH' => '980',
-	        'UGX' => '800',
-	        'USD' => '840',
-	        'USN' => '997',
-	        'UYI' => '940',
-	        'UYU' => '858',
-	        'UZS' => '860',
-	        'VEB' => '862',
-	        'VEF' => '937',
-	        'VND' => '704',
-	        'VUV' => '548',
-	        'WST' => '882',
-	        'XAF' => '950',
-	        'XCD' => '951',
-	        'XOF' => '952',
-	        'XPF' => '953',
-	        'XXX' => '999',
-	        'YER' => '886',
-	        'YUM' => '891',
-	        'ZAR' => '710',
-	        'ZMK' => '894',
-	        'ZMW' => '967',
-	        'ZWD' => '716',
-	        'ZWL' => '932',
+            'ADP' => '020',
+            'AED' => '784',
+            'AFA' => '004',
+            'AFN' => '971',
+            'ALL' => '008',
+            'AMD' => '051',
+            'ANG' => '532',
+            'AOA' => '973',
+            'AON' => '024',
+            'ARS' => '032',
+            'ATS' => '040',
+            'AUD' => '036',
+            'AWG' => '533',
+            'AZM' => '031',
+            'AZN' => '944',
+            'BAM' => '977',
+            'BBD' => '052',
+            'BDT' => '050',
+            'BEF' => '056',
+            'BGL' => '100',
+            'BGN' => '975',
+            'BHD' => '048',
+            'BIF' => '108',
+            'BMD' => '060',
+            'BND' => '096',
+            'BOB' => '068',
+            'BOV' => '984',
+            'BRL' => '986',
+            'BSD' => '044',
+            'BTN' => '064',
+            'BWP' => '072',
+            'BYR' => '974',
+            'BZD' => '084',
+            'CAD' => '124',
+            'CDF' => '976',
+            'CHE' => '947',
+            'CHF' => '756',
+            'CHW' => '948',
+            'CLF' => '990',
+            'CLP' => '152',
+            'CNY' => '156',
+            'COP' => '170',
+            'COU' => '970',
+            'CRC' => '188',
+            'CSD' => '891',
+            'CUC' => '931',
+            'CUP' => '192',
+            'CVE' => '132',
+            'CYP' => '196',
+            'CZK' => '203',
+            'DEM' => '276',
+            'DJF' => '262',
+            'DKK' => '208',
+            'DOP' => '214',
+            'DZD' => '012',
+            'EEK' => '233',
+            'EGP' => '818',
+            'ERN' => '232',
+            'ESP' => '724',
+            'ETB' => '230',
+            'EUR' => '978',
+            'FIM' => '246',
+            'FJD' => '242',
+            'FKP' => '238',
+            'FRF' => '250',
+            'GBP' => '826',
+            'GEL' => '981',
+            'GHC' => '288',
+            'GHS' => '936',
+            'GIP' => '292',
+            'GMD' => '270',
+            'GNF' => '324',
+            'GTQ' => '320',
+            'GWP' => '624',
+            'GYD' => '328',
+            'HKD' => '344',
+            'HNL' => '340',
+            'HRK' => '191',
+            'HTG' => '332',
+            'HUF' => '348',
+            'IDR' => '360',
+            'IEP' => '372',
+            'ILS' => '376',
+            'INR' => '356',
+            'IQD' => '368',
+            'IRR' => '364',
+            'ISK' => '352',
+            'ITL' => '380',
+            'JMD' => '388',
+            'JOD' => '400',
+            'JPY' => '392',
+            'KES' => '404',
+            'KGS' => '417',
+            'KHR' => '116',
+            'KMF' => '174',
+            'KPW' => '408',
+            'KRW' => '410',
+            'KWD' => '414',
+            'KYD' => '136',
+            'KZT' => '398',
+            'LAK' => '418',
+            'LBP' => '422',
+            'LKR' => '144',
+            'LRD' => '430',
+            'LSL' => '426',
+            'LTL' => '440',
+            'LUF' => '442',
+            'LVL' => '428',
+            'LYD' => '434',
+            'MAD' => '504',
+            'MDL' => '498',
+            'MGA' => '969',
+            'MGF' => '450',
+            'MKD' => '807',
+            'MMK' => '104',
+            'MNT' => '496',
+            'MOP' => '446',
+            'MRO' => '478',
+            'MTL' => '470',
+            'MUR' => '480',
+            'MVR' => '462',
+            'MWK' => '454',
+            'MXN' => '484',
+            'MXV' => '979',
+            'MYR' => '458',
+            'MZM' => '508',
+            'MZN' => '943',
+            'NAD' => '516',
+            'NGN' => '566',
+            'NIO' => '558',
+            'NLG' => '528',
+            'NOK' => '578',
+            'NPR' => '524',
+            'NZD' => '554',
+            'OMR' => '512',
+            'PAB' => '590',
+            'PEN' => '604',
+            'PGK' => '598',
+            'PHP' => '608',
+            'PKR' => '586',
+            'PLN' => '985',
+            'PTE' => '620',
+            'PYG' => '600',
+            'QAR' => '634',
+            'ROL' => '642',
+            'RON' => '946',
+            'RSD' => '941',
+            'RUB' => '643',
+            'RUR' => '810',
+            'RWF' => '646',
+            'SAR' => '682',
+            'SBD' => '090',
+            'SCR' => '690',
+            'SDD' => '736',
+            'SDG' => '938',
+            'SEK' => '752',
+            'SGD' => '702',
+            'SHP' => '654',
+            'SIT' => '705',
+            'SKK' => '703',
+            'SLL' => '694',
+            'SOS' => '706',
+            'SRD' => '968',
+            'SRG' => '740',
+            'SSP' => '728',
+            'STD' => '678',
+            'SVC' => '222',
+            'SYP' => '760',
+            'SZL' => '748',
+            'THB' => '764',
+            'TJS' => '972',
+            'TMM' => '795',
+            'TMT' => '934',
+            'TND' => '788',
+            'TOP' => '776',
+            'TPE' => '626',
+            'TRL' => '792',
+            'TRY' => '949',
+            'TTD' => '780',
+            'TWD' => '901',
+            'TZS' => '834',
+            'UAH' => '980',
+            'UGX' => '800',
+            'USD' => '840',
+            'USN' => '997',
+            'UYI' => '940',
+            'UYU' => '858',
+            'UZS' => '860',
+            'VEB' => '862',
+            'VEF' => '937',
+            'VND' => '704',
+            'VUV' => '548',
+            'WST' => '882',
+            'XAF' => '950',
+            'XCD' => '951',
+            'XOF' => '952',
+            'XPF' => '953',
+            'XXX' => '999',
+            'YER' => '886',
+            'YUM' => '891',
+            'ZAR' => '710',
+            'ZMK' => '894',
+            'ZMW' => '967',
+            'ZWD' => '716',
+            'ZWL' => '932',
         );
 
         $this->instances = array(
-	        'STAG' => 'centineltest.cardinalcommerce.com',
-	        'CYBERSOURCE' => 'cybersource.cardinalcommerce.com',
-	        'FIRSTDATA' => 'production.altpayfirstdata.com',
-	        'FIRSTDATA_TEST' => 'test.altpayfirstdata.com',
-	        'PAYMENTECH' => 'paymentech.cardinalcommerce.com',
-	        'PAYPAL' => 'paypal.cardinalcommerce.com',
-	        '200' => 'centinel.cardinalcommerce.com',
-	        '300' => 'centinel300.cardinalcommerce.com',
-	        '400' => 'centinel400.cardinalcommerce.com',
-	        'PROD' => 'centinel600.cardinalcommerce.com',
-	        '800' => 'centinel800.cardinalcommerce.com',
-	        '1000' => 'centinel1000.cardinalcommerce.com',
-	        '1200' => 'centinel1200.cardinalcommerce.com',
+            'STAG' => 'centineltest.cardinalcommerce.com',
+            'CYBERSOURCE' => 'cybersource.cardinalcommerce.com',
+            'FIRSTDATA' => 'production.altpayfirstdata.com',
+            'FIRSTDATA_TEST' => 'test.altpayfirstdata.com',
+            'PAYMENTECH' => 'paymentech.cardinalcommerce.com',
+            'PAYPAL' => 'paypal.cardinalcommerce.com',
+            '200' => 'centinel.cardinalcommerce.com',
+            '300' => 'centinel300.cardinalcommerce.com',
+            '400' => 'centinel400.cardinalcommerce.com',
+            'PROD' => 'centinel600.cardinalcommerce.com',
+            '800' => 'centinel800.cardinalcommerce.com',
+            '1000' => 'centinel1000.cardinalcommerce.com',
+            '1200' => 'centinel1200.cardinalcommerce.com',
         );
 
-	    add_filter( 'wp_enqueue_scripts', array($this, 'register_scripts') );
-	    add_filter( 'wpinv_purchase_form_before_submit', array($this, 'purchase_form_before_submit') );
+        add_filter( 'wp_enqueue_scripts', array($this, 'register_scripts') );
+        add_filter( 'wpinv_purchase_form_before_submit', array($this, 'purchase_form_before_submit') );
 
     }
 
@@ -250,7 +250,7 @@ 
         wp_register_script(
             'cardinalcommerce-oneconnect', WPINV_PLUGIN_URL.'assets/js/cardinalcommerce-oneconnect.js',
             array('jquery', 'cardinalcommerce-oneconnect-songbird'),
-	        WPINV_VERSION, true);
+            WPINV_VERSION, true);
     }
 
     private static function base64_encode_urlsafe($source) {
@@ -323,10 +323,10 @@ 
 
     public function purchase_form_before_submit() {
         wp_enqueue_script('cardinalcommerce-oneconnect');
-	    $invoice = wpinv_get_invoice_cart();
-	    $jwt = $this->generate_cruise_jwt($invoice);
-	    $this->hidden_input('CardinalOneConnectJWT', $jwt);
-	    $this->hidden_input('CardinalOneConnectLoggingLevel','verbose');
+        $invoice = wpinv_get_invoice_cart();
+        $jwt = $this->generate_cruise_jwt($invoice);
+        $this->hidden_input('CardinalOneConnectJWT', $jwt);
+        $this->hidden_input('CardinalOneConnectLoggingLevel','verbose');
 
         $id = 'CardinalOneConnectResult';
         $merchant_content = 'Consumer Messaging';
@@ -424,7 +424,7 @@ 
 
     public function reject_with_error($message, $permanent = false) {
         wpinv_set_error('wpinv_error', "{$this->method_title}: {$message}");
-	    wpinv_send_back_to_checkout( '?payment-mode=paypalpro' );
+        wpinv_send_back_to_checkout( '?payment-mode=paypalpro' );
     }
 
     public function order_add($invoice, $key, $value) {
@@ -437,7 +437,7 @@ 
     }
 
     public function status_message($invoice, $message, $amount = null,
-                                   $error = null) {
+                                    $error = null) {
         if (!$amount) {
             $amount = $invoice->get_total();
         }
@@ -450,7 +450,7 @@ 
     }
 
     public function process_payment( $invoice_id ) {
-	    $invoice = wpinv_get_invoice( $invoice_id );
+        $invoice = wpinv_get_invoice( $invoice_id );
 
         $cruise_result_json = $_POST['CardinalOneConnectResult'];
         if ( ! $cruise_result_json ) {
@@ -500,7 +500,7 @@ 
             $this->reject_with_error('data and Payload ActionCode do not match');
         }
 
-	    $invoiceid = $payload->AuthorizationProcessor->ProcessorOrderId;
+        $invoiceid = $payload->AuthorizationProcessor->ProcessorOrderId;
         $cca = $payload->Payment->ExtendedData;
         $eci = isset($cca->ECIFlag) ? $cca->ECIFlag : '';
         $cavv = isset($cca->CAVV) ? $cca->CAVV : '';
@@ -620,7 +620,7 @@ 
 
     public function create_request_order_object($invoice) {
         $currency = $invoice->get_currency();
-    	$currency_alpha = $this->currencies[$currency];
+        $currency_alpha = $this->currencies[$currency];
         $raw_amount = self::raw_amount($invoice->get_total(), $currency_alpha);
 
         $request_order_object = array(

Switch Indentation +17 added lines, -17 removed lines

@@ -467,23 +467,23 @@
         $this->order_add($invoice, "ActionCode", $data->ActionCode);
 
         switch ($data->ActionCode) {
-        case 'SUCCESS':
-        case 'NOACTION':
-            break;
-        case 'FAILURE':
-            $this->reject_with_error('Payment was unsuccessful. ' .
-                'Please try again or provide another form of payment.');
-            break;
-        case 'ERROR':
-            $message = $data->ErrorDescription;
-            if ( isset($data->ErrorNumber) ) {
-                $message .= " ({$data->ErrorNumber})";
-            }
-            $this->reject_with_error($message, isset($data->PermanentFatal));
-            break;
-        default:
-            $this->reject_with_error('Unknown ActionCode');
-            break;
+            case 'SUCCESS':
+            case 'NOACTION':
+                break;
+            case 'FAILURE':
+                $this->reject_with_error('Payment was unsuccessful. ' .
+                    'Please try again or provide another form of payment.');
+                break;
+            case 'ERROR':
+                $message = $data->ErrorDescription;
+                if ( isset($data->ErrorNumber) ) {
+                    $message .= " ({$data->ErrorNumber})";
+                }
+                $this->reject_with_error($message, isset($data->PermanentFatal));
+                break;
+            default:
+                $this->reject_with_error('Unknown ActionCode');
+                break;
         }
 
         if (!isset($cruise_result->jwt)) {

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -234,8 +234,8 @@ 
 	        '1200' => 'centinel1200.cardinalcommerce.com',
         );
 
-	    add_filter( 'wp_enqueue_scripts', array($this, 'register_scripts') );
-	    add_filter( 'wpinv_purchase_form_before_submit', array($this, 'purchase_form_before_submit') );
+	    add_filter('wp_enqueue_scripts', array($this, 'register_scripts'));
+	    add_filter('wpinv_purchase_form_before_submit', array($this, 'purchase_form_before_submit'));
 
     }
 
@@ -248,7 +248,7 @@ 
             'cardinalcommerce-oneconnect-songbird',
             "https://{$songbird_domain}/edge/v1/songbird.js");
         wp_register_script(
-            'cardinalcommerce-oneconnect', WPINV_PLUGIN_URL.'assets/js/cardinalcommerce-oneconnect.js',
+            'cardinalcommerce-oneconnect', WPINV_PLUGIN_URL . 'assets/js/cardinalcommerce-oneconnect.js',
             array('jquery', 'cardinalcommerce-oneconnect-songbird'),
 	        WPINV_VERSION, true);
     }
@@ -295,7 +295,7 @@ 
             'iss' => '5d79e83d031e732958e19532',
             'OrgUnitId' => '5d79e83de0919f19584569b6',
         );
-        if ( $invoice ) {
+        if ($invoice) {
             $payload = $this->create_request_order_object($invoice);
             $data['Payload'] = $payload;
             $data['ObjectifyPayload'] = true;
@@ -326,14 +326,14 @@ 
 	    $invoice = wpinv_get_invoice_cart();
 	    $jwt = $this->generate_cruise_jwt($invoice);
 	    $this->hidden_input('CardinalOneConnectJWT', $jwt);
-	    $this->hidden_input('CardinalOneConnectLoggingLevel','verbose');
+	    $this->hidden_input('CardinalOneConnectLoggingLevel', 'verbose');
 
         $id = 'CardinalOneConnectResult';
         $merchant_content = 'Consumer Messaging';
         echo "<input type='hidden' autocomplete='off' id='{$id}' name='$id' /><div id='merchant-content-wrapper' style='display: none'><div id='actual-merchant-content'>{$merchant_content}</div></div>";
     }
 
-    public function pm_message($type, $orderid, $amount, $currency, $fields=array()) {
+    public function pm_message($type, $orderid, $amount, $currency, $fields = array()) {
         $timestamp = time() * 1000;
         $plaintext = $timestamp . '9b11d472-91c9-4c5d-aadf-c32e710db171';
         $signature = base64_encode(hash('sha256', $plaintext, true));
@@ -424,7 +424,7 @@ 
 
     public function reject_with_error($message, $permanent = false) {
         wpinv_set_error('wpinv_error', "{$this->method_title}: {$message}");
-	    wpinv_send_back_to_checkout( '?payment-mode=paypalpro' );
+	    wpinv_send_back_to_checkout('?payment-mode=paypalpro');
     }
 
     public function order_add($invoice, $key, $value) {
@@ -449,11 +449,11 @@ 
         return $rv;
     }
 
-    public function process_payment( $invoice_id ) {
-	    $invoice = wpinv_get_invoice( $invoice_id );
+    public function process_payment($invoice_id) {
+	    $invoice = wpinv_get_invoice($invoice_id);
 
         $cruise_result_json = $_POST['CardinalOneConnectResult'];
-        if ( ! $cruise_result_json ) {
+        if (!$cruise_result_json) {
             $jwt = $this->generate_cruise_jwt($invoice);
             wp_send_json(array(
                 'messages' =>
@@ -476,7 +476,7 @@ 
             break;
         case 'ERROR':
             $message = $data->ErrorDescription;
-            if ( isset($data->ErrorNumber) ) {
+            if (isset($data->ErrorNumber)) {
                 $message .= " ({$data->ErrorNumber})";
             }
             $this->reject_with_error($message, isset($data->PermanentFatal));
@@ -585,7 +585,7 @@ 
 
         return array(
             'result' => 'success',
-            'redirect' => $this->get_return_url( $invoice )
+            'redirect' => $this->get_return_url($invoice)
         );
     }
 
@@ -612,10 +612,10 @@ 
     }
 
     public static function raw_amount($amount, $currency_alpha) {
-        $float_amount = (float) $amount;
+        $float_amount = (float)$amount;
         $exponent = self::currency_exponent($currency_alpha);
-        $int_amount = (int) round($float_amount * pow(10, $exponent));
-        return (string) $int_amount;
+        $int_amount = (int)round($float_amount * pow(10, $exponent));
+        return (string)$int_amount;
     }
 
     public function create_request_order_object($invoice) {

includes/class-wpinv-session-handler.php

Doc Comments +5 added lines, -1 removed lines

@@ -130,6 +130,10 @@ 
 		}
 	}
 
+	/**
+	 * @param string $name
+	 * @param string $value
+	 */
 	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
@@ -274,7 +278,7 @@ 
 	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
 	 *
 	 * @param int $uid User ID.
-	 * @return string
+	 * @return integer
 	 */
 	public function nonce_user_logged_out( $uid ) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;

Indentation +277 added lines, -277 removed lines

@@ -12,125 +12,125 @@ 
  */
 class WPInv_Session_Handler extends WPInv_Session {
 
-	/**
-	 * Cookie name used for the session.
-	 *
-	 * @var string cookie name
-	 */
-	protected $_cookie;
-
-	/**
-	 * Stores session expiry.
-	 *
-	 * @var string session due to expire timestamp
-	 */
-	protected $_session_expiring;
-
-	/**
-	 * Stores session due to expire timestamp.
-	 *
-	 * @var string session expiration timestamp
-	 */
-	protected $_session_expiration;
-
-	/**
-	 * True when the cookie exists.
-	 *
-	 * @var bool Based on whether a cookie exists.
-	 */
-	protected $_has_cookie = false;
-
-	/**
-	 * Table name for session data.
-	 *
-	 * @var string Custom session table name
-	 */
-	protected $_table;
-
-	/**
-	 * Constructor for the session class.
-	 */
-	public function __construct() {
-
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
+    /**
+     * Cookie name used for the session.
+     *
+     * @var string cookie name
+     */
+    protected $_cookie;
+
+    /**
+     * Stores session expiry.
+     *
+     * @var string session due to expire timestamp
+     */
+    protected $_session_expiring;
+
+    /**
+     * Stores session due to expire timestamp.
+     *
+     * @var string session expiration timestamp
+     */
+    protected $_session_expiration;
+
+    /**
+     * True when the cookie exists.
+     *
+     * @var bool Based on whether a cookie exists.
+     */
+    protected $_has_cookie = false;
+
+    /**
+     * Table name for session data.
+     *
+     * @var string Custom session table name
+     */
+    protected $_table;
+
+    /**
+     * Constructor for the session class.
+     */
+    public function __construct() {
+
+        $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
         add_action( 'init', array( $this, 'init' ), -1 );
-	}
-
-	/**
-	 * Init hooks and session data.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {
-		$this->init_session_cookie();
-
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
-		}
-	}
-
-	/**
-	 * Setup cookie and customer ID.
-	 *
-	 * @since 3.6.0
-	 */
-	public function init_session_cookie() {
-		$cookie = $this->get_session_cookie();
-
-		if ( $cookie ) {
-			$this->_customer_id        = $cookie[0];
-			$this->_session_expiration = $cookie[1];
-			$this->_session_expiring   = $cookie[2];
-			$this->_has_cookie         = true;
-			$this->_data               = $this->get_session_data();
-
-			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
-				$this->_customer_id = get_current_user_id();
-				$this->_dirty       = true;
-				$this->save_data();
-				$this->set_customer_session_cookie( true );
-			}
-
-			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
-				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
-			}
-		} else {
-			$this->set_session_expiration();
-			$this->_customer_id = $this->generate_customer_id();
-			$this->_data        = $this->get_session_data();
-		}
-	}
-
-	/**
-	 * Sets the session cookie on-demand (usually after adding an item to the cart).
-	 *
-	 * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
-	 *
-	 * Warning: Cookies will only be set if this is called before the headers are sent.
-	 *
-	 * @param bool $set Should the session cookie be set.
-	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
-			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
-			$this->_has_cookie = true;
-
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
-			}
-		}
-	}
-
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
+    }
+
+    /**
+     * Init hooks and session data.
+     *
+     * @since 3.3.0
+     */
+    public function init() {
+        $this->init_session_cookie();
+
+        add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
+        add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+        add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+
+        if ( ! is_user_logged_in() ) {
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+        }
+    }
+
+    /**
+     * Setup cookie and customer ID.
+     *
+     * @since 3.6.0
+     */
+    public function init_session_cookie() {
+        $cookie = $this->get_session_cookie();
+
+        if ( $cookie ) {
+            $this->_customer_id        = $cookie[0];
+            $this->_session_expiration = $cookie[1];
+            $this->_session_expiring   = $cookie[2];
+            $this->_has_cookie         = true;
+            $this->_data               = $this->get_session_data();
+
+            // If the user logs in, update session.
+            if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+                $this->_customer_id = get_current_user_id();
+                $this->_dirty       = true;
+                $this->save_data();
+                $this->set_customer_session_cookie( true );
+            }
+
+            // Update session if its close to expiring.
+            if ( time() > $this->_session_expiring ) {
+                $this->set_session_expiration();
+                $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+            }
+        } else {
+            $this->set_session_expiration();
+            $this->_customer_id = $this->generate_customer_id();
+            $this->_data        = $this->get_session_data();
+        }
+    }
+
+    /**
+     * Sets the session cookie on-demand (usually after adding an item to the cart).
+     *
+     * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
+     *
+     * Warning: Cookies will only be set if this is called before the headers are sent.
+     *
+     * @param bool $set Should the session cookie be set.
+     */
+    public function set_customer_session_cookie( $set ) {
+        if ( $set ) {
+            $to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
+            $cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+            $cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
+            $this->_has_cookie = true;
+
+            if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
+                $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+            }
+        }
+    }
+
+    public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
         } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
@@ -139,96 +139,96 @@ 
         }
     }
 
-	/**
-	 * Should the session cookie be secure?
-	 *
-	 * @since 3.6.0
-	 * @return bool
-	 */
-	protected function use_secure_cookie() {
+    /**
+     * Should the session cookie be secure?
+     *
+     * @since 3.6.0
+     * @return bool
+     */
+    protected function use_secure_cookie() {
         $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
-	}
-
-	/**
-	 * Return true if the current user has an active session, i.e. a cookie to retrieve values.
-	 *
-	 * @return bool
-	 */
-	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
-	}
-
-	/**
-	 * Set session expiration.
-	 */
-	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
-	}
-
-	/**
-	 * Generate a unique customer ID for guests, or return user ID if logged in.
-	 *
-	 * Uses Portable PHP password hashing framework to generate a unique cryptographically strong ID.
-	 *
-	 * @return string
-	 */
-	public function generate_customer_id() {
-		$customer_id = '';
-
-		if ( is_user_logged_in() ) {
-			$customer_id = get_current_user_id();
-		}
-
-		if ( empty( $customer_id ) ) {
+        return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+    }
+
+    /**
+     * Return true if the current user has an active session, i.e. a cookie to retrieve values.
+     *
+     * @return bool
+     */
+    public function has_session() {
+        return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+    }
+
+    /**
+     * Set session expiration.
+     */
+    public function set_session_expiration() {
+        $this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
+        $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+    }
+
+    /**
+     * Generate a unique customer ID for guests, or return user ID if logged in.
+     *
+     * Uses Portable PHP password hashing framework to generate a unique cryptographically strong ID.
+     *
+     * @return string
+     */
+    public function generate_customer_id() {
+        $customer_id = '';
+
+        if ( is_user_logged_in() ) {
+            $customer_id = get_current_user_id();
+        }
+
+        if ( empty( $customer_id ) ) {
             $customer_id = wp_create_nonce('wpinv-session-customer-id');
-		}
-
-		return $customer_id;
-	}
-
-	/**
-	 * Get the session cookie, if set. Otherwise return false.
-	 *
-	 * Session cookies without a customer ID are invalid.
-	 *
-	 * @return bool|array
-	 */
-	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
-
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
-			return false;
-		}
-
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
-
-		if ( empty( $customer_id ) ) {
-			return false;
-		}
-
-		// Validate hash.
-		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
-			return false;
-		}
-
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
-	}
-
-	/**
-	 * Get session data.
-	 *
-	 * @return array
-	 */
-	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
-	}
-
-	public function generate_key($customer_id){
+        }
+
+        return $customer_id;
+    }
+
+    /**
+     * Get the session cookie, if set. Otherwise return false.
+     *
+     * Session cookies without a customer ID are invalid.
+     *
+     * @return bool|array
+     */
+    public function get_session_cookie() {
+        $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+
+        if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+            return false;
+        }
+
+        list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+
+        if ( empty( $customer_id ) ) {
+            return false;
+        }
+
+        // Validate hash.
+        $to_hash = $customer_id . '|' . $session_expiration;
+        $hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+
+        if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+            return false;
+        }
+
+        return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+    }
+
+    /**
+     * Get session data.
+     *
+     * @return array
+     */
+    public function get_session_data() {
+        return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+    }
+
+    public function generate_key($customer_id){
         if(!$customer_id){
             return;
         }
@@ -236,62 +236,62 @@ 
         return 'wpi_trans_'.$customer_id;
     }
 
-	/**
-	 * Save data.
-	 */
-	public function save_data() {
-		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+    /**
+     * Save data.
+     */
+    public function save_data() {
+        // Dirty if something changed - prevents saving nothing new.
+        if ( $this->_dirty && $this->has_session() ) {
 
             set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
-			$this->_dirty = false;
-		}
-	}
-
-	/**
-	 * Destroy all session data.
-	 */
-	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
-		$this->forget_session();
-	}
-
-	/**
-	 * Forget all session data without destroying it.
-	 */
-	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
-
-		wpinv_empty_cart();
-
-		$this->_data        = array();
-		$this->_dirty       = false;
-		$this->_customer_id = $this->generate_customer_id();
-	}
-
-	/**
-	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
-	 *
-	 * @param int $uid User ID.
-	 * @return string
-	 */
-	public function nonce_user_logged_out( $uid ) {
-		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
-	}
-
-	/**
-	 * Returns the session.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param mixed  $default Default session value.
-	 * @return string|array
-	 */
-	public function get_session( $customer_id, $default = false ) {
-
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
-			return false;
-		}
+            $this->_dirty = false;
+        }
+    }
+
+    /**
+     * Destroy all session data.
+     */
+    public function destroy_session() {
+        $this->delete_session( $this->_customer_id );
+        $this->forget_session();
+    }
+
+    /**
+     * Forget all session data without destroying it.
+     */
+    public function forget_session() {
+        $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+
+        wpinv_empty_cart();
+
+        $this->_data        = array();
+        $this->_dirty       = false;
+        $this->_customer_id = $this->generate_customer_id();
+    }
+
+    /**
+     * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
+     *
+     * @param int $uid User ID.
+     * @return string
+     */
+    public function nonce_user_logged_out( $uid ) {
+        return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
+    }
+
+    /**
+     * Returns the session.
+     *
+     * @param string $customer_id Customer ID.
+     * @param mixed  $default Default session value.
+     * @return string|array
+     */
+    public function get_session( $customer_id, $default = false ) {
+
+        if ( defined( 'WP_SETUP_CONFIG' ) ) {
+            return false;
+        }
 
         if ( !is_user_logged_in() ) {
             if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
@@ -306,32 +306,32 @@ 
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
-	}
+        return maybe_unserialize( $value );
+    }
 
-	/**
-	 * Delete the session from the cache and database.
-	 *
-	 * @param int $customer_id Customer ID.
-	 */
-	public function delete_session( $customer_id ) {
+    /**
+     * Delete the session from the cache and database.
+     *
+     * @param int $customer_id Customer ID.
+     */
+    public function delete_session( $customer_id ) {
 
         $key = $this->generate_key($customer_id);
 
-		delete_transient($key);
-	}
+        delete_transient($key);
+    }
 
-	/**
-	 * Update the session expiry timestamp.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param int    $timestamp Timestamp to expire the cookie.
-	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+    /**
+     * Update the session expiry timestamp.
+     *
+     * @param string $customer_id Customer ID.
+     * @param int    $timestamp Timestamp to expire the cookie.
+     */
+    public function update_session_timestamp( $customer_id, $timestamp ) {
 
         set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
 
-	}
+    }
 }
 
 global $wpi_session;

Spacing +56 added lines, -56 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,8 +52,8 @@ 
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
 	}
 
 	/**
@@ -64,12 +64,12 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
+		add_action('wp_logout', array($this, 'destroy_session'));
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ) );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'));
 		}
 	}
 
@@ -81,7 +81,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -89,17 +89,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -117,25 +117,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -146,8 +146,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -156,15 +156,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -177,11 +177,11 @@ 
 	public function generate_customer_id() {
 		$customer_id = '';
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			$customer_id = get_current_user_id();
 		}
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
             $customer_id = wp_create_nonce('wpinv-session-customer-id');
 		}
 
@@ -196,27 +196,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -225,15 +225,15 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array)$this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -241,9 +241,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -253,7 +253,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -261,7 +261,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -276,7 +276,7 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 		return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 	}
 
@@ -287,14 +287,14 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return false;
 		}
 
-        if ( !is_user_logged_in() ) {
-            if(!wp_verify_nonce( $customer_id, 'wpinv-session-customer-id' )){
+        if (!is_user_logged_in()) {
+            if (!wp_verify_nonce($customer_id, 'wpinv-session-customer-id')) {
                 return array();
             }
         }
@@ -302,11 +302,11 @@ 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -327,9 +327,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

includes/class-wpinv.php

Spacing +186 added lines, -186 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -31,31 +31,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( 'WPInv_Shortcodes', 'init' ) );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array('WPInv_Shortcodes', 'init'));
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
         
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -65,16 +65,16 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
         /* Internationalize the text strings used. */
         $this->load_textdomain();
 
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
     }
     
     /**
@@ -82,221 +82,221 @@ 
      *
      * @since 1.0
      */
-    public function load_textdomain( $locale = NULL ) {
-        if ( empty( $locale ) ) {
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
+    public function load_textdomain($locale = NULL) {
+        if (empty($locale)) {
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
         }
 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
         
-        unload_textdomain( 'invoicing' );
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        unload_textdomain('invoicing');
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cardinal-commerce.php' );
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cardinal-commerce.php');
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
 
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        if (!class_exists('WPInv_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
         
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
             // load the user class only on the users.php page
             global $pagenow;
-            if($pagenow=='users.php'){
+            if ($pagenow == 'users.php') {
                 new WPInv_Admin_Users();
             }
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         }
         
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array( 'jquery' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front.js', array('jquery'), WPINV_VERSION);
 
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_separator();
         $localize['decimal_sep']          = wpinv_decimal_separator();
         $localize['decimals']             = wpinv_decimals();
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
+        $localize['txtComplete']          = __('Complete', 'invoicing');
         $localize['UseTaxes']             = wpinv_use_taxes();
-        $localize['checkoutNonce']        = wp_create_nonce( 'wpinv_checkout_nonce' );
+        $localize['checkoutNonce']        = wp_create_nonce('wpinv_checkout_nonce');
 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
+        wp_enqueue_script('jquery-blockui');
         $autofill_api = wpinv_get_option('address_autofill_api');
         $autofill_active = wpinv_get_option('address_autofill_active');
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
-                wp_dequeue_script( 'google-maps-api' );
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
+            if (wp_script_is('google-maps-api', 'enqueued')) {
+                wp_dequeue_script('google-maps-api');
             }
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
 
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
+        $suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
 
         $jquery_ui_css = false;
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $jquery_ui_css = true;
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
             $jquery_ui_css = true;
         }
-        if ( $jquery_ui_css ) {
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-            wp_enqueue_style( 'jquery-ui-css' );
+        if ($jquery_ui_css) {
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+            wp_enqueue_style('jquery-ui-css');
         }
 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
+        if ($page == 'wpinv-subscriptions') {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
             $autofill_api = wpinv_get_option('address_autofill_api');
@@ -307,20 +307,20 @@ 
             }
         }
 
-        wp_enqueue_style( "select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all' );
-        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), WPINV_VERSION );
+        wp_enqueue_style("select2", WPINV_PLUGIN_URL . 'assets/css/select2/select2.css', array(), WPINV_VERSION, 'all');
+        wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full' . $suffix . '.js', array('jquery'), WPINV_VERSION);
 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -328,69 +328,69 @@ 
         $localize['thousand_sep']               = wpinv_thousands_separator();
         $localize['decimal_sep']                = wpinv_decimal_separator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
+        $localize['action_edit']                = __('Edit', 'invoicing');
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
 
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
 
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
 
-        if ( $page == 'wpinv-subscriptions' ) {
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
+        if ($page == 'wpinv-subscriptions') {
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions.js', array('wpinv-admin-script'), WPINV_VERSION);
+            wp_enqueue_script('wpinv-sub-admin-script');
         }
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow, $post, $current_screen;
         
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
             $classes .= ' wpinv-cpt';
         }
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
-        if ( $add_class ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
+        if ($add_class) {
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
             return $classes .= ' wpinv';
         }
         
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
             $classes .= ' wpi-editable-n';
         }
 
@@ -402,20 +402,20 @@ 
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 }
\ No newline at end of file

includes/abstracts/abstract-wpinv-privacy.php

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
  * Abstract privacy class.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Abstract class that is intended to be extended by
@@ -38,7 +38,7 @@ 
      *
      * @param string $name Plugin identifier.
      */
-    public function __construct( $name = '' ) {
+    public function __construct($name = '') {
         $this->name = $name;
         $this->init();
     }
@@ -47,22 +47,22 @@ 
      * Hook in events.
      */
     protected function init() {
-        add_action( 'admin_init', array( $this, 'add_privacy_message' ) );
+        add_action('admin_init', array($this, 'add_privacy_message'));
         // Register data exporters
-        add_filter( 'wp_privacy_personal_data_exporters', array( $this, 'register_exporters' ), 10 );
+        add_filter('wp_privacy_personal_data_exporters', array($this, 'register_exporters'), 10);
         // Register data erasers
-        add_filter( 'wp_privacy_personal_data_erasers', array( $this, 'register_erasers' ) );
+        add_filter('wp_privacy_personal_data_erasers', array($this, 'register_erasers'));
     }
 
     /**
      * Adds the privacy message on invoicing privacy page.
      */
     public function add_privacy_message() {
-        if ( function_exists( 'wp_add_privacy_policy_content' ) ) {
+        if (function_exists('wp_add_privacy_policy_content')) {
             $content = $this->get_privacy_message();
 
-            if ( $content ) {
-                wp_add_privacy_policy_content( $this->name, $this->get_privacy_message() );
+            if ($content) {
+                wp_add_privacy_policy_content($this->name, $this->get_privacy_message());
             }
         }
     }
@@ -83,9 +83,9 @@ 
      * @param array $exporters List of exporter callbacks.
      * @return array
      */
-    public function register_exporters( $exporters = array() ) {
-        foreach ( $this->exporters as $id => $exporter ) {
-            $exporters[ $id ] = $exporter;
+    public function register_exporters($exporters = array()) {
+        foreach ($this->exporters as $id => $exporter) {
+            $exporters[$id] = $exporter;
         }
         return $exporters;
     }
@@ -96,9 +96,9 @@ 
      * @param array $erasers List of eraser callbacks.
      * @return array
      */
-    public function register_erasers( $erasers = array() ) {
-        foreach ( $this->erasers as $id => $eraser ) {
-            $erasers[ $id ] = $eraser;
+    public function register_erasers($erasers = array()) {
+        foreach ($this->erasers as $id => $eraser) {
+            $erasers[$id] = $eraser;
         }
         return $erasers;
     }
@@ -112,8 +112,8 @@ 
      *
      * @return array
      */
-    public function add_exporter( $id, $name, $callback ) {
-        $this->exporters[ $id ] = array(
+    public function add_exporter($id, $name, $callback) {
+        $this->exporters[$id] = array(
             'exporter_friendly_name' => $name,
             'callback'               => $callback,
         );
@@ -129,8 +129,8 @@ 
      *
      * @return array
      */
-    public function add_eraser( $id, $name, $callback ) {
-        $this->erasers[ $id ] = array(
+    public function add_eraser($id, $name, $callback) {
+        $this->erasers[$id] = array(
             'eraser_friendly_name' => $name,
             'callback'             => $callback,
         );

includes/abstracts/abstract-wpinv-session.php

Indentation +98 added lines, -98 removed lines

@@ -4,7 +4,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -12,112 +12,112 @@ 
  */
 abstract class WPInv_Session {
 
-	/**
-	 * Customer ID.
-	 *
-	 * @var int $_customer_id Customer ID.
-	 */
-	protected $_customer_id;
+    /**
+     * Customer ID.
+     *
+     * @var int $_customer_id Customer ID.
+     */
+    protected $_customer_id;
 
-	/**
-	 * Session Data.
-	 *
-	 * @var array $_data Data array.
-	 */
-	protected $_data = array();
+    /**
+     * Session Data.
+     *
+     * @var array $_data Data array.
+     */
+    protected $_data = array();
 
-	/**
-	 * Dirty when the session needs saving.
-	 *
-	 * @var bool $_dirty When something changes
-	 */
-	protected $_dirty = false;
+    /**
+     * Dirty when the session needs saving.
+     *
+     * @var bool $_dirty When something changes
+     */
+    protected $_dirty = false;
 
-	/**
-	 * Init hooks and session data. Extended by child classes.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {}
+    /**
+     * Init hooks and session data. Extended by child classes.
+     *
+     * @since 3.3.0
+     */
+    public function init() {}
 
-	/**
-	 * Cleanup session data. Extended by child classes.
-	 */
-	public function cleanup_sessions() {}
+    /**
+     * Cleanup session data. Extended by child classes.
+     */
+    public function cleanup_sessions() {}
 
-	/**
-	 * Magic get method.
-	 *
-	 * @param mixed $key Key to get.
-	 * @return mixed
-	 */
-	public function __get( $key ) {
-		return $this->get( $key );
-	}
+    /**
+     * Magic get method.
+     *
+     * @param mixed $key Key to get.
+     * @return mixed
+     */
+    public function __get( $key ) {
+        return $this->get( $key );
+    }
 
-	/**
-	 * Magic set method.
-	 *
-	 * @param mixed $key Key to set.
-	 * @param mixed $value Value to set.
-	 */
-	public function __set( $key, $value ) {
-		$this->set( $key, $value );
-	}
+    /**
+     * Magic set method.
+     *
+     * @param mixed $key Key to set.
+     * @param mixed $value Value to set.
+     */
+    public function __set( $key, $value ) {
+        $this->set( $key, $value );
+    }
 
-	/**
-	 * Magic isset method.
-	 *
-	 * @param mixed $key Key to check.
-	 * @return bool
-	 */
-	public function __isset( $key ) {
-		return isset( $this->_data[ sanitize_title( $key ) ] );
-	}
+    /**
+     * Magic isset method.
+     *
+     * @param mixed $key Key to check.
+     * @return bool
+     */
+    public function __isset( $key ) {
+        return isset( $this->_data[ sanitize_title( $key ) ] );
+    }
 
-	/**
-	 * Magic unset method.
-	 *
-	 * @param mixed $key Key to unset.
-	 */
-	public function __unset( $key ) {
-		if ( isset( $this->_data[ $key ] ) ) {
-			unset( $this->_data[ $key ] );
-			$this->_dirty = true;
-		}
-	}
+    /**
+     * Magic unset method.
+     *
+     * @param mixed $key Key to unset.
+     */
+    public function __unset( $key ) {
+        if ( isset( $this->_data[ $key ] ) ) {
+            unset( $this->_data[ $key ] );
+            $this->_dirty = true;
+        }
+    }
 
-	/**
-	 * Get a session variable.
-	 *
-	 * @param string $key Key to get.
-	 * @param mixed  $default used if the session variable isn't set.
-	 * @return array|string value of session variable
-	 */
-	public function get( $key, $default = null ) {
-		$key = sanitize_key( $key );
-		return isset( $this->_data[ $key ] ) ? maybe_unserialize( $this->_data[ $key ] ) : $default;
-	}
+    /**
+     * Get a session variable.
+     *
+     * @param string $key Key to get.
+     * @param mixed  $default used if the session variable isn't set.
+     * @return array|string value of session variable
+     */
+    public function get( $key, $default = null ) {
+        $key = sanitize_key( $key );
+        return isset( $this->_data[ $key ] ) ? maybe_unserialize( $this->_data[ $key ] ) : $default;
+    }
 
-	/**
-	 * Set a session variable.
-	 *
-	 * @param string $key Key to set.
-	 * @param mixed  $value Value to set.
-	 */
-	public function set( $key, $value ) {
-		if ( $value !== $this->get( $key ) ) {
-			$this->_data[ sanitize_key( $key ) ] = maybe_serialize( $value );
-			$this->_dirty                        = true;
-		}
-	}
+    /**
+     * Set a session variable.
+     *
+     * @param string $key Key to set.
+     * @param mixed  $value Value to set.
+     */
+    public function set( $key, $value ) {
+        if ( $value !== $this->get( $key ) ) {
+            $this->_data[ sanitize_key( $key ) ] = maybe_serialize( $value );
+            $this->_dirty                        = true;
+        }
+    }
 
-	/**
-	 * Get customer ID.
-	 *
-	 * @return int
-	 */
-	public function get_customer_id() {
-		return $this->_customer_id;
-	}
+    /**
+     * Get customer ID.
+     *
+     * @return int
+     */
+    public function get_customer_id() {
+        return $this->_customer_id;
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
  * Handle data for the current customer session
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,8 +51,8 @@ 
 	 * @param mixed $key Key to get.
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		return $this->get( $key );
+	public function __get($key) {
+		return $this->get($key);
 	}
 
 	/**
@@ -61,8 +61,8 @@ 
 	 * @param mixed $key Key to set.
 	 * @param mixed $value Value to set.
 	 */
-	public function __set( $key, $value ) {
-		$this->set( $key, $value );
+	public function __set($key, $value) {
+		$this->set($key, $value);
 	}
 
 	/**
@@ -71,8 +71,8 @@ 
 	 * @param mixed $key Key to check.
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		return isset( $this->_data[ sanitize_title( $key ) ] );
+	public function __isset($key) {
+		return isset($this->_data[sanitize_title($key)]);
 	}
 
 	/**
@@ -80,9 +80,9 @@ 
 	 *
 	 * @param mixed $key Key to unset.
 	 */
-	public function __unset( $key ) {
-		if ( isset( $this->_data[ $key ] ) ) {
-			unset( $this->_data[ $key ] );
+	public function __unset($key) {
+		if (isset($this->_data[$key])) {
+			unset($this->_data[$key]);
 			$this->_dirty = true;
 		}
 	}
@@ -94,9 +94,9 @@ 
 	 * @param mixed  $default used if the session variable isn't set.
 	 * @return array|string value of session variable
 	 */
-	public function get( $key, $default = null ) {
-		$key = sanitize_key( $key );
-		return isset( $this->_data[ $key ] ) ? maybe_unserialize( $this->_data[ $key ] ) : $default;
+	public function get($key, $default = null) {
+		$key = sanitize_key($key);
+		return isset($this->_data[$key]) ? maybe_unserialize($this->_data[$key]) : $default;
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param string $key Key to set.
 	 * @param mixed  $value Value to set.
 	 */
-	public function set( $key, $value ) {
-		if ( $value !== $this->get( $key ) ) {
-			$this->_data[ sanitize_key( $key ) ] = maybe_serialize( $value );
+	public function set($key, $value) {
+		if ($value !== $this->get($key)) {
+			$this->_data[sanitize_key($key)] = maybe_serialize($value);
 			$this->_dirty                        = true;
 		}
 	}