eventespresso / event-espresso-core

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_gateways.dmsstage.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
  * into an array with all the 4.1 gateway setting array keys (often the keys were
  * changed from 3.1 to 4.1)
- * @param array $old_gateway_settings
+ * @param string $old_gateway_settings
  * @param string $new_gateway_slug
  * @return array
  */

Indentation +187 added lines, -187 removed lines

@@ -14,68 +14,68 @@ 
 class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage
 {
 
-    private $_converted_active_gateways = false;
+	private $_converted_active_gateways = false;
 
-    public function _migration_step($num_items = 50)
-    {
-        // loads existing EE_CONfig from DB, if it exists
-        $new_gateway_config_obj = EE_Config::instance()->gateway;
-        $items_actually_migrated = 0;
-        // convert settings
-        $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
-        // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
-            $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                // determine the old option's name
-                $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
-                    // no settings existed for this gateway anyways... weird...
-                    $items_actually_migrated++;
-                    continue;
-                }
-                // now prepare the settings to make sure they're in the 4.1 format
-                $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
-                // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
-                // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
-                delete_option($old_gateway_wp_option_name);
-            } else {// it must be one of the ones we mostly leave alone
-                global $wpdb;
-                // yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
-                // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
-            }
+	public function _migration_step($num_items = 50)
+	{
+		// loads existing EE_CONfig from DB, if it exists
+		$new_gateway_config_obj = EE_Config::instance()->gateway;
+		$items_actually_migrated = 0;
+		// convert settings
+		$gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
+		// just do a part of them on this request
+		$gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
+			$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+			if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				// determine the old option's name
+				$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
+				if (! $old_gateway_settings) {
+					// no settings existed for this gateway anyways... weird...
+					$items_actually_migrated++;
+					continue;
+				}
+				// now prepare the settings to make sure they're in the 4.1 format
+				$new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
+				$new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+				// and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
+				// I think it's ok to do right away this time (we wont need gateway settings elsewhere)
+				delete_option($old_gateway_wp_option_name);
+			} else {// it must be one of the ones we mostly leave alone
+				global $wpdb;
+				// yeah we could do this all in one query... and if you're reading this and would liek to, go ahead. Although you'll
+				// only be saving users 50 milliseconds the one time this runs...
+				$wpdb->query($wpdb->prepare("UPDATE ".$wpdb->options." SET autoload='no' WHERE option_name=%s", $old_gateway_wp_option_name));
+			}
         
-            $items_actually_migrated++;
-        }
-        // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
-            $this->_convert_active_gateways();
-            $this->_converted_active_gateways = true;
-            $items_actually_migrated++;
-        }
+			$items_actually_migrated++;
+		}
+		// if we can keep going, and it hasn' tbeen done yet, convert active gateways
+		if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+			$this->_convert_active_gateways();
+			$this->_converted_active_gateways = true;
+			$items_actually_migrated++;
+		}
     
-        EE_Config::instance()->update_espresso_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
-    public function _count_records_to_migrate()
-    {
-        $count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
-        $step_of_setting_active_gateways = 1;
-        $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
-    //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
-    }
-    public function __construct()
-    {
-        $this->_pretty_name = __("Gateways", "event_espresso");
-        parent::__construct();
-    }
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
+	public function _count_records_to_migrate()
+	{
+		$count_of_gateways_to_convert = count($this->_gateways_we_know_how_to_migrate);
+		$step_of_setting_active_gateways = 1;
+		$count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
+	//  $button_images_to_update =
+		return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	}
+	public function __construct()
+	{
+		$this->_pretty_name = __("Gateways", "event_espresso");
+		parent::__construct();
+	}
 
 /**
  * Takes the old array of 3.1 gateway settings for this gateway and converts it
@@ -85,144 +85,144 @@ 
  * @param string $new_gateway_slug
  * @return array
  */
-    private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
-    {
-        $new_gateway_settings = $old_gateway_settings;
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
-                $new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
-                break;
-            case 'Invoice':
-                $new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
-                break;
-            case 'Paypal_Pro':
-                $new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
-                $new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
-                $new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
-                $new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
-                $new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
-                $new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
-                break;
-        }
-        return $new_gateway_settings;
-    }
+	private function _convert_gateway_settings($old_gateway_settings, $new_gateway_slug)
+	{
+		$new_gateway_settings = $old_gateway_settings;
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
+				$new_gateway_settings['page_title'] = $old_gateway_settings['bank_title'];
+				break;
+			case 'Invoice':
+				$new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
+				break;
+			case 'Paypal_Pro':
+				$new_gateway_settings['email'] = $old_gateway_settings['paypal_pro_email'];
+				$new_gateway_settings['username'] = $old_gateway_settings['paypal_api_username'];
+				$new_gateway_settings['password'] = $old_gateway_settings['paypal_api_password'];
+				$new_gateway_settings['signature'] = $old_gateway_settings['paypal_api_signature'];
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['use_sandbox'] = $old_gateway_settings['paypal_pro_use_sandbox'];
+				break;
+		}
+		return $new_gateway_settings;
+	}
 /**
- * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
- * @param string $new_gateway_slug
- * @return string
- */
-    private function _get_old_gateway_option($new_gateway_slug)
-    {
-        $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
-    //  if( ! $settings){
-    //      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
-    //  }
-        return $settings;
-    }
+	 * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option($new_gateway_slug)
+	{
+		$option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+		$settings =  get_option($option_name, null);
+	//  if( ! $settings){
+	//      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
+	//  }
+		return $settings;
+	}
 
 /**
  * Just gets the old gateways slug
  * @param string $new_gateway_slug
  * @return string
  */
-    private function _get_old_gateway_option_name($new_gateway_slug)
-    {
-        $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
-        $normal_option_prefix = 'event_espresso_';
-        $normal_option_postfix = '_settings';
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
-                break;
-            case 'Aim':
-                $option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
-                break;
-            case 'Check':
-                $option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
-                break;
-            case 'Ideal':
-                $option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
-                break;
-            case 'Invoice':
-                $option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
-                break;
-            case 'Purchase_Order':
-                $option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
-                break;
-            case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
-                break;
-            case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
-                break;
-            default:
-                $option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
-        }
-        return $option_name;
-    }
+	private function _get_old_gateway_option_name($new_gateway_slug)
+	{
+		$new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
+		$old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+		$normal_option_prefix = 'event_espresso_';
+		$normal_option_postfix = '_settings';
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$option_name = $normal_option_prefix.'bank_deposit'.$normal_option_postfix;
+				break;
+			case 'Aim':
+				$option_name = $normal_option_prefix.'authnet_aim'.$normal_option_postfix;
+				break;
+			case 'Check':
+				$option_name = $normal_option_prefix.'check_payment'.$normal_option_postfix;
+				break;
+			case 'Ideal':
+				$option_name = $normal_option_prefix.'ideal_mollie'.$normal_option_postfix;
+				break;
+			case 'Invoice':
+				$option_name = $normal_option_prefix.'invoice_payment'.$normal_option_postfix;
+				break;
+			case 'Purchase_Order':
+				$option_name = $normal_option_prefix.'purchase_order_payment'.$normal_option_postfix;
+				break;
+			case 'USAePay_Offsite':
+				$option_name = 'espresso_usaepay_offsite'.$normal_option_postfix;
+				break;
+			case 'USAePay_Onsite':
+				$option_name = 'espresso_usaepay_onsite'.$normal_option_postfix;
+				break;
+			default:
+				$option_name = apply_filters('FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option', $normal_option_prefix.$old_gateway_slug.$normal_option_postfix);
+		}
+		return $option_name;
+	}
 
-    private function _convert_active_gateways()
-    {
-        // just does it all one big swoop
-        $old_active_gateways = get_option('event_espresso_active_gateways');
-        $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-        foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                $this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
-                continue;
-            }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+	private function _convert_active_gateways()
+	{
+		// just does it all one big swoop
+		$old_active_gateways = get_option('event_espresso_active_gateways');
+		$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
+		foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+			if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				$this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
+				continue;
+			}
+			$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
         
-            // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
-        }
-        EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
-    }
+			// in the new format we can also upload gateways to the uploads directory and
+			$new_active_gateways[ $new_gateway_slug ] = false;
+		}
+		EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
+	}
     
-    protected $_gateways_we_know_how_to_migrate = array(
-        'aim'=>'Aim',
-        'bank'=>'Bank',
-        'check'=>'Check',
-        'invoice'=>'Invoice',
-        'paypal'=>'Paypal_Standard',
-        'paypal_pro'=>'Paypal_Pro',
+	protected $_gateways_we_know_how_to_migrate = array(
+		'aim'=>'Aim',
+		'bank'=>'Bank',
+		'check'=>'Check',
+		'invoice'=>'Invoice',
+		'paypal'=>'Paypal_Standard',
+		'paypal_pro'=>'Paypal_Pro',
 
-    );
+	);
     
-    protected $_gateways_we_leave_alone = array(
-        '2checkout'=>'2checkout',
-        'anz'=>'Anz',
-        'atos'=>'Atos',
-        'authnet'=>'Authnet',
-        'beanstream'=>'Beanstream',
-        'evertec'=>'Evertec',
-        'eway'=>'Eway',
-        'eway_rapid3'=>'Eway_Rapid3',
-        'exact'=>'Exact',
-        'firstdata'=>'Firstdata',
-        'firstdat_e4'=>'Firstdata_E4',
-        'ideal'=>'Ideal',
-        'infusion_payment'=>'InfusionSoft',
-        'luottokunta'=>'Luottokunta',
-        'megasoft'=>'Megasoft',
-        'moneris_hpp'=>'Moneris_HPP',
-        'mwarrior'=>'Mwarrior',
-        'nab'=>'NAB',
-        'paychoice'=>'Paychoice',
-        'paytrace'=>'Paytrace',
-        'psigate'=>'Psigate',
-        'purchase_order'=>'Purchase_Order',
-        'qbms'=>'QBMS',
-        'quickpay'=>'Quickpay',
-        'realauth'=>'Realauth',
-        'securepay_aus'=>'Securepay_Aus',
-        'stripe'=>'Stripe',
-        'usaepay_offsite'=>'USAePay_Offsite',
-        'usaepay_onsite'=>'USAePay_Onsite',
-        'wepay'=>'Wepay',
-        'worldpay'=>'Worldpay'
-    );
+	protected $_gateways_we_leave_alone = array(
+		'2checkout'=>'2checkout',
+		'anz'=>'Anz',
+		'atos'=>'Atos',
+		'authnet'=>'Authnet',
+		'beanstream'=>'Beanstream',
+		'evertec'=>'Evertec',
+		'eway'=>'Eway',
+		'eway_rapid3'=>'Eway_Rapid3',
+		'exact'=>'Exact',
+		'firstdata'=>'Firstdata',
+		'firstdat_e4'=>'Firstdata_E4',
+		'ideal'=>'Ideal',
+		'infusion_payment'=>'InfusionSoft',
+		'luottokunta'=>'Luottokunta',
+		'megasoft'=>'Megasoft',
+		'moneris_hpp'=>'Moneris_HPP',
+		'mwarrior'=>'Mwarrior',
+		'nab'=>'NAB',
+		'paychoice'=>'Paychoice',
+		'paytrace'=>'Paytrace',
+		'psigate'=>'Psigate',
+		'purchase_order'=>'Purchase_Order',
+		'qbms'=>'QBMS',
+		'quickpay'=>'Quickpay',
+		'realauth'=>'Realauth',
+		'securepay_aus'=>'Securepay_Aus',
+		'stripe'=>'Stripe',
+		'usaepay_offsite'=>'USAePay_Offsite',
+		'usaepay_onsite'=>'USAePay_Onsite',
+		'wepay'=>'Wepay',
+		'worldpay'=>'Worldpay'
+	);
 }

Spacing +11 added lines, -11 removed lines

@@ -24,20 +24,20 @@ 
         // convert settings
         $gateways_to_deal_with = array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone);
         // just do a part of them on this request
-        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items);// $this->_gateways_we_know_how_to_migrate;
+        $gateways_to_deal_with = array_slice($gateways_to_deal_with, $this->count_records_migrated(), $num_items); // $this->_gateways_we_know_how_to_migrate;
         foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
             $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if (isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 // determine the old option's name
                 $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
+                if ( ! $old_gateway_settings) {
                     // no settings existed for this gateway anyways... weird...
                     $items_actually_migrated++;
                     continue;
                 }
                 // now prepare the settings to make sure they're in the 4.1 format
                 $new_gateway_settings = $this->_convert_gateway_settings($old_gateway_settings, $new_gateway_slug);
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+                $new_gateway_config_obj->payment_settings[$new_gateway_slug] = $new_gateway_settings;
                 // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
                 // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
                 delete_option($old_gateway_wp_option_name);
@@ -51,7 +51,7 @@ 
             $items_actually_migrated++;
         }
         // if we can keep going, and it hasn' tbeen done yet, convert active gateways
-        if ($items_actually_migrated < $num_items &&  ! $this->_converted_active_gateways) {
+        if ($items_actually_migrated < $num_items && ! $this->_converted_active_gateways) {
             $this->_convert_active_gateways();
             $this->_converted_active_gateways = true;
             $items_actually_migrated++;
@@ -69,7 +69,7 @@ 
         $step_of_setting_active_gateways = 1;
         $count_of_gateways_to_leave_alone = count($this->_gateways_we_leave_alone);
     //  $button_images_to_update =
-        return $count_of_gateways_to_convert +  $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+        return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
     }
     public function __construct()
     {
@@ -115,7 +115,7 @@ 
     private function _get_old_gateway_option($new_gateway_slug)
     {
         $option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-        $settings =  get_option($option_name, null);
+        $settings = get_option($option_name, null);
     //  if( ! $settings){
     //      $this->add_error(sprintf(__("There is no wordpress option named %s for gateway %s", "event_espresso"),$option_name,$new_gateway_slug));
     //  }
@@ -130,7 +130,7 @@ 
     private function _get_old_gateway_option_name($new_gateway_slug)
     {
         $new_gateway_slugs_to_new = array_flip(array_merge($this->_gateways_we_know_how_to_migrate, $this->_gateways_we_leave_alone));
-        $old_gateway_slug = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+        $old_gateway_slug = $new_gateway_slugs_to_new[$new_gateway_slug];
         $normal_option_prefix = 'event_espresso_';
         $normal_option_postfix = '_settings';
         switch ($new_gateway_slug) {
@@ -170,14 +170,14 @@ 
         $old_active_gateways = get_option('event_espresso_active_gateways');
         $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
         foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+            if ( ! isset($this->_gateways_we_know_how_to_migrate[$old_gateway_slug])) {
                 $this->add_error(sprintf(__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug));
                 continue;
             }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[$old_gateway_slug];
         
             // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
+            $new_active_gateways[$new_gateway_slug] = false;
         }
         EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
     }

admin_pages/registration_form/help_tabs/registration_form_add_question.help_tab.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 <?php _e('This shows the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso'); ?>
 </li>
 <li>
-<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso');?></strong><br/>
-<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso');?>
+<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso'); ?></strong><br/>
+<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Required Question', 'event_espresso'); ?></strong><br />

caffeinated/modules/recaptcha/ReCaptcha/ReCaptcha.php

Indentation +55 added lines, -55 removed lines

@@ -31,67 +31,67 @@
  */
 class ReCaptcha
 {
-    /**
-     * Version of this client library.
-     * @const string
-     */
-    const VERSION = 'php_1.1.1';
+	/**
+	 * Version of this client library.
+	 * @const string
+	 */
+	const VERSION = 'php_1.1.1';
 
-    /**
-     * Shared secret for the site.
-     * @var type string
-     */
-    private $secret;
+	/**
+	 * Shared secret for the site.
+	 * @var type string
+	 */
+	private $secret;
 
-    /**
-     * Method used to communicate  with service. Defaults to POST request.
-     * @var RequestMethod
-     */
-    private $requestMethod;
+	/**
+	 * Method used to communicate  with service. Defaults to POST request.
+	 * @var RequestMethod
+	 */
+	private $requestMethod;
 
-    /**
-     * Create a configured instance to use the reCAPTCHA service.
-     *
-     * @param string $secret shared secret between site and reCAPTCHA server.
-     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
-     */
-    public function __construct($secret, RequestMethod $requestMethod = null)
-    {
-        if (empty($secret)) {
-            throw new \RuntimeException('No secret provided');
-        }
+	/**
+	 * Create a configured instance to use the reCAPTCHA service.
+	 *
+	 * @param string $secret shared secret between site and reCAPTCHA server.
+	 * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
+	 */
+	public function __construct($secret, RequestMethod $requestMethod = null)
+	{
+		if (empty($secret)) {
+			throw new \RuntimeException('No secret provided');
+		}
 
-        if (!is_string($secret)) {
-            throw new \RuntimeException('The provided secret must be a string');
-        }
+		if (!is_string($secret)) {
+			throw new \RuntimeException('The provided secret must be a string');
+		}
 
-        $this->secret = $secret;
+		$this->secret = $secret;
 
-        if (!is_null($requestMethod)) {
-            $this->requestMethod = $requestMethod;
-        } else {
-            $this->requestMethod = new RequestMethod\Post();
-        }
-    }
+		if (!is_null($requestMethod)) {
+			$this->requestMethod = $requestMethod;
+		} else {
+			$this->requestMethod = new RequestMethod\Post();
+		}
+	}
 
-    /**
-     * Calls the reCAPTCHA siteverify API to verify whether the user passes
-     * CAPTCHA test.
-     *
-     * @param string $response The value of 'g-recaptcha-response' in the submitted form.
-     * @param string $remoteIp The end user's IP address.
-     * @return Response Response from the service.
-     */
-    public function verify($response, $remoteIp = null)
-    {
-        // Discard empty solution submissions
-        if (empty($response)) {
-            $recaptchaResponse = new Response(false, array('missing-input-response'));
-            return $recaptchaResponse;
-        }
+	/**
+	 * Calls the reCAPTCHA siteverify API to verify whether the user passes
+	 * CAPTCHA test.
+	 *
+	 * @param string $response The value of 'g-recaptcha-response' in the submitted form.
+	 * @param string $remoteIp The end user's IP address.
+	 * @return Response Response from the service.
+	 */
+	public function verify($response, $remoteIp = null)
+	{
+		// Discard empty solution submissions
+		if (empty($response)) {
+			$recaptchaResponse = new Response(false, array('missing-input-response'));
+			return $recaptchaResponse;
+		}
 
-        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
-        $rawResponse = $this->requestMethod->submit($params);
-        return Response::fromJson($rawResponse);
-    }
+		$params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
+		$rawResponse = $this->requestMethod->submit($params);
+		return Response::fromJson($rawResponse);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -61,13 +61,13 @@
             throw new \RuntimeException('No secret provided');
         }
 
-        if (!is_string($secret)) {
+        if ( ! is_string($secret)) {
             throw new \RuntimeException('The provided secret must be a string');
         }
 
         $this->secret = $secret;
 
-        if (!is_null($requestMethod)) {
+        if ( ! is_null($requestMethod)) {
             $this->requestMethod = $requestMethod;
         } else {
             $this->requestMethod = new RequestMethod\Post();

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Curl.php

Indentation +30 added lines, -30 removed lines

@@ -10,38 +10,38 @@
  */
 class Curl implements RequestMethod
 {
-    /**
-     * URL to which requests are sent via cURL.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+	/**
+	 * URL to which requests are sent via cURL.
+	 * @const string
+	 */
+	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
 
-    /**
-     * Submit the cURL request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        $handle = curl_init(self::SITE_VERIFY_URL);
+	/**
+	 * Submit the cURL request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params)
+	{
+		$handle = curl_init(self::SITE_VERIFY_URL);
 
-        $options = array(
-            CURLOPT_POST => true,
-            CURLOPT_POSTFIELDS => $params->toQueryString(),
-            CURLOPT_HTTPHEADER => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            ),
-            CURLINFO_HEADER_OUT => false,
-            CURLOPT_HEADER => false,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_SSL_VERIFYPEER => true
-        );
-        curl_setopt_array($handle, $options);
+		$options = array(
+			CURLOPT_POST => true,
+			CURLOPT_POSTFIELDS => $params->toQueryString(),
+			CURLOPT_HTTPHEADER => array(
+				'Content-Type: application/x-www-form-urlencoded'
+			),
+			CURLINFO_HEADER_OUT => false,
+			CURLOPT_HEADER => false,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_SSL_VERIFYPEER => true
+		);
+		curl_setopt_array($handle, $options);
 
-        $response = curl_exec($handle);
-        curl_close($handle);
+		$response = curl_exec($handle);
+		curl_close($handle);
 
-        return $response;
-    }
+		return $response;
+	}
 }

caffeinated/modules/recaptcha/ReCaptcha/RequestParameters.php

Spacing +2 added lines, -2 removed lines

@@ -80,11 +80,11 @@
     {
         $params = array('secret' => $this->secret, 'response' => $this->response);
 
-        if (!is_null($this->remoteIp)) {
+        if ( ! is_null($this->remoteIp)) {
             $params['remoteip'] = $this->remoteIp;
         }
 
-        if (!is_null($this->version)) {
+        if ( ! is_null($this->version)) {
             $params['version'] = $this->version;
         }
 

Indentation +60 added lines, -60 removed lines

@@ -31,73 +31,73 @@
  */
 class RequestParameters
 {
-    /**
-     * Site secret.
-     * @var string
-     */
-    private $secret;
+	/**
+	 * Site secret.
+	 * @var string
+	 */
+	private $secret;
 
-    /**
-     * Form response.
-     * @var string
-     */
-    private $response;
+	/**
+	 * Form response.
+	 * @var string
+	 */
+	private $response;
 
-    /**
-     * Remote user's IP address.
-     * @var string
-     */
-    private $remoteIp;
+	/**
+	 * Remote user's IP address.
+	 * @var string
+	 */
+	private $remoteIp;
 
-    /**
-     * Client version.
-     * @var string
-     */
-    private $version;
+	/**
+	 * Client version.
+	 * @var string
+	 */
+	private $version;
 
-    /**
-     * Initialise parameters.
-     *
-     * @param string $secret Site secret.
-     * @param string $response Value from g-captcha-response form field.
-     * @param string $remoteIp User's IP address.
-     * @param string $version Version of this client library.
-     */
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
-    {
-        $this->secret = $secret;
-        $this->response = $response;
-        $this->remoteIp = $remoteIp;
-        $this->version = $version;
-    }
+	/**
+	 * Initialise parameters.
+	 *
+	 * @param string $secret Site secret.
+	 * @param string $response Value from g-captcha-response form field.
+	 * @param string $remoteIp User's IP address.
+	 * @param string $version Version of this client library.
+	 */
+	public function __construct($secret, $response, $remoteIp = null, $version = null)
+	{
+		$this->secret = $secret;
+		$this->response = $response;
+		$this->remoteIp = $remoteIp;
+		$this->version = $version;
+	}
 
-    /**
-     * Array representation.
-     *
-     * @return array Array formatted parameters.
-     */
-    public function toArray()
-    {
-        $params = array('secret' => $this->secret, 'response' => $this->response);
+	/**
+	 * Array representation.
+	 *
+	 * @return array Array formatted parameters.
+	 */
+	public function toArray()
+	{
+		$params = array('secret' => $this->secret, 'response' => $this->response);
 
-        if (!is_null($this->remoteIp)) {
-            $params['remoteip'] = $this->remoteIp;
-        }
+		if (!is_null($this->remoteIp)) {
+			$params['remoteip'] = $this->remoteIp;
+		}
 
-        if (!is_null($this->version)) {
-            $params['version'] = $this->version;
-        }
+		if (!is_null($this->version)) {
+			$params['version'] = $this->version;
+		}
 
-        return $params;
-    }
+		return $params;
+	}
 
-    /**
-     * Query string representation for HTTP request.
-     *
-     * @return string Query string formatted parameters.
-     */
-    public function toQueryString()
-    {
-        return http_build_query($this->toArray(), '', '&');
-    }
+	/**
+	 * Query string representation for HTTP request.
+	 *
+	 * @return string Query string formatted parameters.
+	 */
+	public function toQueryString()
+	{
+		return http_build_query($this->toArray(), '', '&');
+	}
 }

public/Espresso_Arabica_2014/archive-espresso_events.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
 
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
-			<?php espresso_get_template_part( 'loop', 'espresso_events' ); ?>			
+			<?php espresso_get_template_part('loop', 'espresso_events'); ?>			
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();

public/Espresso_Arabica_2014/archive-espresso_venues.php

Spacing +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
-			<?php espresso_get_template_part( 'loop', 'espresso_venues' ); ?>			
+			<?php espresso_get_template_part('loop', 'espresso_venues'); ?>			
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();
\ No newline at end of file

public/Espresso_Arabica_2014/content-espresso_event_attendees.php

Spacing +6 added lines, -6 removed lines

@@ -11,14 +11,14 @@
  * @type EE_Attendee $contact
  * @type bool       $show_gravatar  whether to show gravatar or not.
  */
-if ( $show_gravatar ) {
-	$gravatar = get_avatar( $contact->email(),
-		(int) apply_filters( 'FHEE__loop-espresso_attendees-shortcode__template__avatar_size', 32 )
+if ($show_gravatar) {
+	$gravatar = get_avatar($contact->email(),
+		(int) apply_filters('FHEE__loop-espresso_attendees-shortcode__template__avatar_size', 32)
 		);
 } else {
 	$gravatar = '';
 }
 ?>
-<?php do_action( 'AHEE__content-espresso_event_attendees__before', $contact, $show_gravatar ); ?>
-<li><?php echo $gravatar . '&nbsp;' .  $contact->full_name(); ?></li>
-<?php do_action( 'AHEE__content-espresso_event_attendees__after', $contact, $show_gravatar ); ?>
\ No newline at end of file
+<?php do_action('AHEE__content-espresso_event_attendees__before', $contact, $show_gravatar); ?>
+<li><?php echo $gravatar.'&nbsp;'.$contact->full_name(); ?></li>
+<?php do_action('AHEE__content-espresso_event_attendees__after', $contact, $show_gravatar); ?>
\ No newline at end of file

public/Espresso_Arabica_2014/content-espresso_events-tickets.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 global $post;
-if ( espresso_display_ticket_selector( $post->ID ) && ( is_single() || ( is_archive() && espresso_display_ticket_selector_in_event_list() ))) :
+if (espresso_display_ticket_selector($post->ID) && (is_single() || (is_archive() && espresso_display_ticket_selector_in_event_list()))) :
 ?>
 <div class="event-tickets" style="clear: both;">
-	<?php espresso_ticket_selector( $post ); ?>
+	<?php espresso_ticket_selector($post); ?>
 </div>
 <!-- .event-tickets -->
-<?php elseif ( ! is_single() ) : ?>
-<?php espresso_view_details_btn( $post ); ?>
+<?php elseif ( ! is_single()) : ?>
+<?php espresso_view_details_btn($post); ?>
 <?php endif; ?>
\ No newline at end of file