Completed
Branch FET-8394-move-rules-into-core (5a0f96)
by
unknown
09:47 queued 10s
created
modules/mijireh_slurper/templates/slurping_in_progress_notice.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <div class="updated">
2
-        <p><?php _e( "Mijireh is currently slurping your content. This will usually take a few minutes. Please login to Mijireh to see the slurp's progress", 'event_espresso' ); ?></p>
2
+        <p><?php _e("Mijireh is currently slurping your content. This will usually take a few minutes. Please login to Mijireh to see the slurp's progress", 'event_espresso'); ?></p>
3 3
     </div>
4 4
\ No newline at end of file
Please login to merge, or discard this patch.
caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_PMT_Aim extends EE_PMT_Base{
28
+class EE_PMT_Aim extends EE_PMT_Base {
29 29
 
30 30
 
31 31
 	/**
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		require_once($this->file_folder().'EEG_Aim.gateway.php');
38 38
 		$this->_gateway = new EEG_AIM();
39 39
 		$this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
40
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
40
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
41 41
 		$this->_requires_https = true;
42 42
 		$this->_has_billing_form = true;
43 43
 		parent::__construct($pm_instance);
@@ -48,26 +48,26 @@  discard block
 block discarded – undo
48 48
 	 * @param \EE_Transaction $transaction
49 49
 	 * @return EE_Billing_Info_Form
50 50
 	 */
51
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
52
-		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance,array(
51
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
52
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
53 53
 			'name'=>'AIM_Form',
54 54
 			'subsections'=>array(
55 55
 				'credit_card'=>new EE_Credit_Card_Input(array(
56 56
 					'required'=>true,
57
-					'html_label_text' => __( 'Card Number', 'event_espresso' )
57
+					'html_label_text' => __('Card Number', 'event_espresso')
58 58
 				)),
59 59
 				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
60 60
 					'required'=>true,
61
-					'html_label_text' => __( 'Expiry Month', 'event_espresso' )
61
+					'html_label_text' => __('Expiry Month', 'event_espresso')
62 62
 				)),
63
-				'exp_year'=>new EE_Credit_Card_Year_Input( array( '
63
+				'exp_year'=>new EE_Credit_Card_Year_Input(array('
64 64
 					required'=> true,
65
-					'html_label_text' => __( 'Expiry Year', 'event_espresso' ) ) ),
66
-				'cvv'=>new EE_CVV_Input( array(
67
-					'html_label_text' => __( 'CVV', 'event_espresso' ) ) ),
65
+					'html_label_text' => __('Expiry Year', 'event_espresso'))),
66
+				'cvv'=>new EE_CVV_Input(array(
67
+					'html_label_text' => __('CVV', 'event_espresso') )),
68 68
 			)
69 69
 		));
70
-		return $this->apply_billing_form_debug_settings( $billing_form );
70
+		return $this->apply_billing_form_debug_settings($billing_form);
71 71
 	}
72 72
 
73 73
 
@@ -79,17 +79,17 @@  discard block
 block discarded – undo
79 79
 	 * @param \EE_Billing_Info_Form $billing_form
80 80
 	 * @return \EE_Billing_Info_Form
81 81
 	 */
82
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
83
-		if ( $this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta( 'test_transactions', TRUE, FALSE )) {
84
-			$billing_form->get_input( 'credit_card' )->set_default( '4007000000027' );
85
-			$billing_form->get_input( 'exp_year' )->set_default( '2020' );
86
-			$billing_form->get_input( 'cvv' )->set_default(( '123' ));
82
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
83
+		if ($this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta('test_transactions', TRUE, FALSE)) {
84
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
85
+			$billing_form->get_input('exp_year')->set_default('2020');
86
+			$billing_form->get_input('cvv')->set_default(('123'));
87 87
 			$billing_form->add_subsections(
88
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
88
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
89 89
 				'credit_card'
90 90
 			);
91 91
 			$billing_form->add_subsections(
92
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php' )),
92
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php')),
93 93
 				'first_name'
94 94
 			);
95 95
 		}
@@ -108,17 +108,17 @@  discard block
 block discarded – undo
108 108
 				'extra_meta_inputs'=>array(
109 109
 					'login_id'=>new EE_Text_Input(
110 110
 						array(
111
-							'html_label_text'=>  sprintf( __("Authorize.net API Login ID %s", "event_espresso"),  $this->get_help_tab_link() ),
111
+							'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
112 112
 							'required' => true )
113 113
 					),
114 114
 					'transaction_key'=>new EE_Text_Input(
115 115
 						array(
116
-							'html_label_text'=> sprintf( __("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link() ),
116
+							'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
117 117
 							'required' => true )
118 118
 					),
119 119
 					'test_transactions'=>new EE_Yes_No_Input(
120 120
 						array(
121
-							'html_label_text'=>  sprintf( __("Send test transactions? %s", 'event_espresso'),  $this->get_help_tab_link() ),
121
+							'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
122 122
 							'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
123 123
 							'required' => true
124 124
 						)
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 * @see EE_PMT_Base::help_tabs_config()
136 136
 	 * @return array
137 137
 	 */
138
-	public function help_tabs_config(){
138
+	public function help_tabs_config() {
139 139
 		return array(
140 140
 			$this->get_help_tab_name() => array(
141 141
 				'title' => __('Authorize.net AIM Settings', 'event_espresso'),
Please login to merge, or discard this patch.
payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 <?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/'  target='_blank'>","</a>" ); ?>
6
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/'  target='_blank'>", "</a>"); ?>
7 7
 </p>
8 8
 <h3><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></h3>
9 9
 <ul>
Please login to merge, or discard this patch.
payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * authorize_net_aim_debug_info
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * authorize_net_aim_debug_info
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 ?>
28 28
 	<div class="sandbox-panel">
29 29
 		<h2>
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
@@ -27,22 +27,22 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 	<div class="sandbox-panel">
29 29
 		<h2>
30
-			<?php _e( 'Authorize.net AIM Test Mode', 'event_espresso' ); ?>
30
+			<?php _e('Authorize.net AIM Test Mode', 'event_espresso'); ?>
31 31
 		</h2>
32 32
 
33 33
 		<p>
34
-			<?php _e( 'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso' ); ?>
34
+			<?php _e('Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso'); ?>
35 35
 		</p>
36 36
 
37 37
 		<p>
38
-			<strong><?php _e( 'Example Card Numbers:', 'event_espresso' ); ?></strong>
38
+			<strong><?php _e('Example Card Numbers:', 'event_espresso'); ?></strong>
39 39
 		</p>
40 40
 
41 41
 		<p>
42
-			370000000000002 (<?php _e( 'American Express', 'event_espresso' ); ?>)<br/>
43
-			6011000000000012 (<?php _e( 'Discover', 'event_espresso' ); ?>)<br/>
44
-			5424000000000015 (<?php _e( 'MasterCard', 'event_espresso' ); ?>)<br/>
45
-			4007000000027 (<?php _e( 'Visa', 'event_espresso' ); ?>)
42
+			370000000000002 (<?php _e('American Express', 'event_espresso'); ?>)<br/>
43
+			6011000000000012 (<?php _e('Discover', 'event_espresso'); ?>)<br/>
44
+			5424000000000015 (<?php _e('MasterCard', 'event_espresso'); ?>)<br/>
45
+			4007000000027 (<?php _e('Visa', 'event_espresso'); ?>)
46 46
 		</p>
47 47
 	</div>
48 48
 <?php
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -169,14 +169,14 @@
 block discarded – undo
169 169
 		}
170 170
 	}
171 171
 /**
172
- * Handles the payment update (note: mijireh doesn't send an IPN in the usual sense,
173
- * instead they just redirect the user back to our website and then we need to query them
174
- * for the payment's status). Also note that the $update_info should be an array with the key
175
- * 'payment' containing the EEI_Payment to update
176
- * @param array $update_info unused. We just use the $transaction
177
- * @param EEI_Transaction $transaction
178
- * @throws EE_Error
179
- */
172
+	 * Handles the payment update (note: mijireh doesn't send an IPN in the usual sense,
173
+	 * instead they just redirect the user back to our website and then we need to query them
174
+	 * for the payment's status). Also note that the $update_info should be an array with the key
175
+	 * 'payment' containing the EEI_Payment to update
176
+	 * @param array $update_info unused. We just use the $transaction
177
+	 * @param EEI_Transaction $transaction
178
+	 * @throws EE_Error
179
+	 */
180 180
 	public function handle_payment_update($update_info, $transaction) {
181 181
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
182 182
 		if($payment && $payment instanceof EEI_Payment){
Please login to merge, or discard this patch.
Braces   +10 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -62,7 +63,7 @@  discard block
 block discarded – undo
62 63
 					'quantity'=>$line_item->quantity()
63 64
 				);
64 65
 			}
65
-		}else{//its a partial payment
66
+		} else{//its a partial payment
66 67
 			$tax_total = 0;
67 68
 			//partial payment, so just add 1 item
68 69
 			$items[] = array(
@@ -123,14 +124,14 @@  discard block
 block discarded – undo
123 124
 					foreach($response_body_as_array as $problem_parameter => $problems){
124 125
 						$problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
125 126
 					}
126
-				}else{
127
+				} else{
127 128
 					$problems_string = $response['body'];
128 129
 				}
129 130
 				if( $problems_string == ''){
130 131
 					//no message to show? wack
131 132
 					if( isset( $response[ 'headers' ][ 'status' ] ) ){
132 133
 						$problems_string = $response[ 'headers' ][ 'status' ];
133
-					}else{
134
+					} else{
134 135
 						$problems_string = __( 'No response from Mijireh', 'event_espresso' );
135 136
 					}
136 137
 				}
@@ -140,7 +141,7 @@  discard block
 block discarded – undo
140 141
 			$payment->set_redirect_url($response_body->checkout_url);
141 142
 			$payment->set_txn_id_chq_nmbr($response_body->order_number);
142 143
 			$payment->set_details($response['body']);
143
-		}else{
144
+		} else{
144 145
 			$error_message = sprintf(__("Errors communicating with Mijireh: %s", 'event_espresso'),implode(",",$response->get_error_messages()));
145 146
 			EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__ );
146 147
 			throw new EE_Error($error_message);
@@ -162,9 +163,9 @@  discard block
 block discarded – undo
162 163
 				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
163 164
 			}
164 165
 			return $prepared_data;
165
-		}elseif(is_string( $data ) ){
166
+		} elseif(is_string( $data ) ){
166 167
 			return str_replace( '%', 'percent', $data );
167
-		}else{
168
+		} else{
168 169
 			return $data;
169 170
 		}
170 171
 	}
@@ -204,13 +205,13 @@  discard block
 block discarded – undo
204 205
 						$payment->set_status($this->_pay_model->declined_status());
205 206
 				}
206 207
 
207
-			}else{
208
+			} else{
208 209
 				$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
209 210
 				$payment->set_details( $response );
210 211
 				$payment->set_status( $this->_pay_model->failed_status() );
211 212
 			}
212 213
 			return $payment;
213
-		}else{
214
+		} else{
214 215
 			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s",'event_espresso'),$transaction->ID()));
215 216
 		}
216 217
 	}
Please login to merge, or discard this patch.
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EEG_Mijireh extends EE_Offsite_Gateway{
28
+class EEG_Mijireh extends EE_Offsite_Gateway {
29 29
 	protected $_access_key;
30 30
 
31 31
 	protected $_currencies_supported = EE_Gateway::all_currencies_supported;
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
 		$primary_attendee = $primary_registrant->attendee();
52 52
 		$items = array();
53 53
 		//if we're are charging for the full amount, show the normal line items
54
-		if( $this->_can_easily_itemize_transaction_for( $payment )){
54
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
55 55
 			$total_line_item = $transaction->total_line_item();
56 56
 			$tax_total = $total_line_item->get_total_tax();
57
-			foreach($total_line_item->get_items() as $line_item){
57
+			foreach ($total_line_item->get_items() as $line_item) {
58 58
 				$items[] = array(
59 59
 					'name'=>$line_item->name(),
60 60
 					'price'=>$this->format_currency($line_item->unit_price()),
@@ -62,11 +62,11 @@  discard block
 block discarded – undo
62 62
 					'quantity'=>$line_item->quantity()
63 63
 				);
64 64
 			}
65
-		}else{//its a partial payment
65
+		} else {//its a partial payment
66 66
 			$tax_total = 0;
67 67
 			//partial payment, so just add 1 item
68 68
 			$items[] = array(
69
-				'name'=>  sprintf(__("Partial payment for registration %s", 'event_espresso'),$primary_registrant->reg_code()),
69
+				'name'=>  sprintf(__("Partial payment for registration %s", 'event_espresso'), $primary_registrant->reg_code()),
70 70
 				'price'=> $this->format_currency($payment->amount()),
71 71
 				'sku'=>$primary_registrant->reg_code(),
72 72
 				'quantity'=>1
@@ -75,18 +75,18 @@  discard block
 block discarded – undo
75 75
 		$order = array(
76 76
 			'total'=>$this->format_currency($payment->amount()),
77 77
 			'return_url'=>$return_url,
78
-			'items'=>$this->_prepare_for_mijireh( $items ),
78
+			'items'=>$this->_prepare_for_mijireh($items),
79 79
 			'email'=>$primary_attendee->email(),
80 80
 			'first_name'=>$primary_attendee->fname(),
81 81
 			'last_name'=>$primary_attendee->lname(),
82 82
 			'tax'=>$this->format_currency($tax_total),
83 83
 			'partner_id'=>'ee');
84 84
 		//setup address?
85
-		if(		$primary_attendee->address()  &&
86
-				$primary_attendee->city()  &&
87
-				$primary_attendee->state_name()  &&
88
-				$primary_attendee->country_name()  &&
89
-				$primary_attendee->zip()  ){
85
+		if ($primary_attendee->address() &&
86
+				$primary_attendee->city() &&
87
+				$primary_attendee->state_name() &&
88
+				$primary_attendee->country_name() &&
89
+				$primary_attendee->zip()) {
90 90
 			$shipping_address = array(
91 91
 				'first_name'=>$primary_attendee->fname(),
92 92
 				'last_name'=>$primary_attendee->lname(),
@@ -96,54 +96,54 @@  discard block
 block discarded – undo
96 96
 				'zip_code' => $primary_attendee->zip(),
97 97
 				'country' => $primary_attendee->country_name()
98 98
 			);
99
-			if( $primary_attendee->address2() ){
100
-				$shipping_address[ 'apt_suite' ] = $primary_attendee->address2();
99
+			if ($primary_attendee->address2()) {
100
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
101 101
 			}
102
-			if( $primary_attendee->phone() ){
103
-				$shipping_address[ 'phone' ] = $primary_attendee->phone();
102
+			if ($primary_attendee->phone()) {
103
+				$shipping_address['phone'] = $primary_attendee->phone();
104 104
 			}
105
-			$order[ 'billing_address' ] = $shipping_address;
106
-			$order[ 'shipping_address' ] = $shipping_address;
105
+			$order['billing_address'] = $shipping_address;
106
+			$order['shipping_address'] = $shipping_address;
107 107
 		}
108
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) );
108
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
109 109
 				$args = array(
110 110
 		'headers' => array(
111
-			'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
111
+			'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
112 112
 			'Accept'=>'application/json'
113 113
 			),
114 114
 		'body'=>  json_encode($order)
115 115
 		);
116
-		$response = wp_remote_post( 'https://secure.mijireh.com/api/1/orders', $args );
117
-		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
118
-		if( ! $response instanceof WP_Error ){
116
+		$response = wp_remote_post('https://secure.mijireh.com/api/1/orders', $args);
117
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
118
+		if ( ! $response instanceof WP_Error) {
119 119
 			$response_body = json_decode($response['body']);
120
-			if($response_body == NULL || ! isset($response_body->checkout_url)){
121
-				if( is_array( $response_body ) || is_object( $response_body)){
122
-					$response_body_as_array = (array)$response_body;
120
+			if ($response_body == NULL || ! isset($response_body->checkout_url)) {
121
+				if (is_array($response_body) || is_object($response_body)) {
122
+					$response_body_as_array = (array) $response_body;
123 123
 					$problems_string = '';
124
-					foreach($response_body_as_array as $problem_parameter => $problems){
125
-						$problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
124
+					foreach ($response_body_as_array as $problem_parameter => $problems) {
125
+						$problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems));
126 126
 					}
127
-				}else{
127
+				} else {
128 128
 					$problems_string = $response['body'];
129 129
 				}
130
-				if( $problems_string == ''){
130
+				if ($problems_string == '') {
131 131
 					//no message to show? wack
132
-					if( isset( $response[ 'headers' ][ 'status' ] ) ){
133
-						$problems_string = $response[ 'headers' ][ 'status' ];
134
-					}else{
135
-						$problems_string = __( 'No response from Mijireh', 'event_espresso' );
132
+					if (isset($response['headers']['status'])) {
133
+						$problems_string = $response['headers']['status'];
134
+					} else {
135
+						$problems_string = __('No response from Mijireh', 'event_espresso');
136 136
 					}
137 137
 				}
138 138
 
139
-				throw new EE_Error(sprintf(__('Errors occurred communicating with Mijireh: %s.','event_espresso'),$problems_string));
139
+				throw new EE_Error(sprintf(__('Errors occurred communicating with Mijireh: %s.', 'event_espresso'), $problems_string));
140 140
 			}
141 141
 			$payment->set_redirect_url($response_body->checkout_url);
142 142
 			$payment->set_txn_id_chq_nmbr($response_body->order_number);
143 143
 			$payment->set_details($response['body']);
144
-		}else{
145
-			$error_message = sprintf(__("Errors communicating with Mijireh: %s", 'event_espresso'),implode(",",$response->get_error_messages()));
146
-			EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__ );
144
+		} else {
145
+			$error_message = sprintf(__("Errors communicating with Mijireh: %s", 'event_espresso'), implode(",", $response->get_error_messages()));
146
+			EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
147 147
 			throw new EE_Error($error_message);
148 148
 
149 149
 		}
@@ -156,16 +156,16 @@  discard block
 block discarded – undo
156 156
 	 * @param mixed $data
157 157
 	 * @return mixed same type as $data
158 158
 	 */
159
-	private function _prepare_for_mijireh( $data ){
160
-		if( is_array( $data ) ){
159
+	private function _prepare_for_mijireh($data) {
160
+		if (is_array($data)) {
161 161
 			$prepared_data = array();
162
-			foreach($data as $key => $datum ){
163
-				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
162
+			foreach ($data as $key => $datum) {
163
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
164 164
 			}
165 165
 			return $prepared_data;
166
-		}elseif(is_string( $data ) ){
167
-			return str_replace( '%', 'percent', $data );
168
-		}else{
166
+		}elseif (is_string($data)) {
167
+			return str_replace('%', 'percent', $data);
168
+		} else {
169 169
 			return $data;
170 170
 		}
171 171
 	}
@@ -180,21 +180,21 @@  discard block
 block discarded – undo
180 180
  */
181 181
 	public function handle_payment_update($update_info, $transaction) {
182 182
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
183
-		if($payment && $payment instanceof EEI_Payment){
183
+		if ($payment && $payment instanceof EEI_Payment) {
184 184
 			$url = 'https://secure.mijireh.com/api/1/orders/'.$payment->txn_id_chq_nmbr();
185 185
 			$request_args = array(
186 186
 				'headers' => array(
187
-					'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
187
+					'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
188 188
 					'Accept'=>'application/json'
189 189
 				)
190 190
 			);
191
-			$response = wp_remote_get($url, $request_args );
191
+			$response = wp_remote_get($url, $request_args);
192 192
 			$this->log(
193
-				array( 'get payment status request_args' => $request_args, 'response' => $response ),
193
+				array('get payment status request_args' => $request_args, 'response' => $response),
194 194
 				$payment
195 195
 			);
196
-			if($response && isset($response['body']) && $response_body = json_decode($response['body'])){
197
-				switch($response_body->status){
196
+			if ($response && isset($response['body']) && $response_body = json_decode($response['body'])) {
197
+				switch ($response_body->status) {
198 198
 					case 'paid':
199 199
 						$payment->set_status($this->_pay_model->approved_status());
200 200
 						break;
@@ -205,14 +205,14 @@  discard block
 block discarded – undo
205 205
 						$payment->set_status($this->_pay_model->declined_status());
206 206
 				}
207 207
 
208
-			}else{
209
-				$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
210
-				$payment->set_details( $response );
211
-				$payment->set_status( $this->_pay_model->failed_status() );
208
+			} else {
209
+				$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
210
+				$payment->set_details($response);
211
+				$payment->set_status($this->_pay_model->failed_status());
212 212
 			}
213 213
 			return $payment;
214
-		}else{
215
-			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s",'event_espresso'),$transaction->ID()));
214
+		} else {
215
+			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID()));
216 216
 		}
217 217
 	}
218 218
 
Please login to merge, or discard this patch.
Mijireh/help_tabs/payment_methods_overview_mijireh.help_tab.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@  discard block
 block discarded – undo
3 3
 <?php _e('Adjust the settings for the Mijireh payment gateway.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'),'<a href="http://www.mijireh.com/" target="_blank">','</a>','<a href="http://www.mijireh.com/docs/payment-gateways/" target="_blank">','</a>'); ?>
6
+<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'), '<a href="http://www.mijireh.com/" target="_blank">', '</a>', '<a href="http://www.mijireh.com/docs/payment-gateways/" target="_blank">', '</a>'); ?>
7 7
 </p>
8 8
 <p>
9
-<?php _e( 'For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso' ) ?>
9
+<?php _e('For information on what currencies you can use with Mijireh, please consult the payment gateway Mijireh is setup to use.', 'event_espresso') ?>
10 10
 </p>
11 11
 <ul>
12 12
 <li>
@@ -20,6 +20,6 @@  discard block
 block discarded – undo
20 20
 </ul>
21 21
 <h3><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></h3>
22 22
 <p>
23
-<?php _e("As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso');?>
24
-<?php printf(__("In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso'),'<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">','</a>');?>
23
+<?php _e("As you are probably aware, when users pay with Mijireh Payment Method, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page.", 'event_espresso'); ?>
24
+<?php printf(__("In order to do this, we automatically create a new WordPress page which is designed to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft.", 'event_espresso'), '<a href="http://ee-screenshots.s3.amazonaws.com/ee4/event-espresso-mijireh-slurp-page-example.jpg" target="_blank">', '</a>'); ?>
25 25
 </p>
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
payment_methods/Mijireh/templates/mijireh_settings_after_form.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * mijireh_settings_after_form
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * mijireh_settings_after_form
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 do_action('AHEE__EE_Mijireh__settings_end');
28 28
 ?><br/><?php
29 29
 // End of file mijireh_settings_after_form.template.php
30 30
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
Paypal_Pro/help_tabs/payment_methods_overview_paypalpro.help_tab.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 <?php _e('Adjust the settings for the PayPal Pro payment gateway.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency'>","</a>" ); ?>
6
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Pro.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency'>", "</a>"); ?>
7 7
 </p>
8 8
 <h3><?php _e('PayPal Pro Settings', 'event_espresso'); ?></h3>
9 9
 <ul>
Please login to merge, or discard this patch.
payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -3,30 +3,30 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * paypal_pro_billing_form
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * paypal_pro_billing_form
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 /**
28
- * @var $form_section EE_Billing_Attendee_Info_Form
29
- */
28
+	 * @var $form_section EE_Billing_Attendee_Info_Form
29
+	 */
30 30
 ?><div class="sandbox-panel">
31 31
 					<h2 class="section-title"><?php _e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
32 32
 					<h3 style="color:#ff0000;"><?php _e('Debug Mode Is Turned On. Payments will not be processed', 'event_espresso'); ?></h3>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 					<ul style="margin:1em 2em 1.5em; line-height:1.2em;">
38 38
 						<li><?php _e('While testing, use the credit card number listed below. Other numbers will produce an error.', 'event_espresso'); ?></li>
39 39
 						<li><?php _e('Expiry Date can be any valid date in the future', 'event_espresso'); ?></li>
40
-						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'),'<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">','</a>'); ?></li>
40
+						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'), '<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">', '</a>'); ?></li>
41 41
 					</ul>
42 42
 
43 43
 					<p class="test-credit-cards-info-pg">
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 					<p class="test-credit-cards-info-pg">
66 66
 						<strong><?php _e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
67
-						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'),"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>","</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>","</a>","<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>","</a>"); ?></span>
67
+						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'), "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>", "</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>", "</a>", "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>", "</a>"); ?></span>
68 68
 					</p>
69 69
 
70 70
 					<div class="tbl-wrap">
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.