@@ -3,27 +3,27 @@ |
||
| 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> |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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 |
@@ -1,7 +1,8 @@ |
||
| 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 | * |
@@ -169,14 +169,14 @@ |
||
| 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){ |
@@ -1,7 +1,8 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -3,10 +3,10 @@ discard block |
||
| 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 |
||
| 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 |
@@ -3,27 +3,27 @@ |
||
| 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 |
@@ -1,6 +1,6 @@ |
||
| 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 |
@@ -1,7 +1,8 @@ |
||
| 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 | * |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 25 | 25 | * |
| 26 | 26 | * ------------------------------------------------------------------------ |
| 27 | 27 | */ |
| 28 | -class EE_PMT_Paypal_Pro extends EE_PMT_Base{ |
|
| 28 | +class EE_PMT_Paypal_Pro extends EE_PMT_Base { |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * @param EE_Payment_Method $pm_instance |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | require_once($this->file_folder().'EEG_Paypal_Pro.gateway.php'); |
| 36 | 36 | $this->_gateway = new EEG_Paypal_Pro(); |
| 37 | 37 | $this->_pretty_name = __("Paypal Pro", 'event_espresso'); |
| 38 | - $this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' ); |
|
| 38 | + $this->_default_description = __('Please provide the following billing information.', 'event_espresso'); |
|
| 39 | 39 | $this->_requires_https = true; |
| 40 | 40 | parent::__construct($pm_instance); |
| 41 | 41 | } |
@@ -51,21 +51,21 @@ discard block |
||
| 51 | 51 | 'extra_meta_inputs'=>array( |
| 52 | 52 | // 'paypal_email'=>new EE_Email_Input(), not actually used |
| 53 | 53 | 'username'=>new EE_Text_Input(array( |
| 54 | - 'html_label_text'=> sprintf(__("Paypal API Username %s", "event_espresso"),$this->get_help_tab_link()), |
|
| 54 | + 'html_label_text'=> sprintf(__("Paypal API Username %s", "event_espresso"), $this->get_help_tab_link()), |
|
| 55 | 55 | 'required' => true |
| 56 | 56 | )), |
| 57 | 57 | 'password'=>new EE_Text_Input(array( |
| 58 | - 'html_label_text'=> sprintf(__("Paypal API Password %s", "event_espresso"),$this->get_help_tab_link()), |
|
| 58 | + 'html_label_text'=> sprintf(__("Paypal API Password %s", "event_espresso"), $this->get_help_tab_link()), |
|
| 59 | 59 | 'required' => true |
| 60 | 60 | )), |
| 61 | 61 | 'signature'=>new EE_Text_Input(array( |
| 62 | - 'html_label_text'=> sprintf(__("Paypal API Signature %s", "event_espresso"),$this->get_help_tab_link()), |
|
| 62 | + 'html_label_text'=> sprintf(__("Paypal API Signature %s", "event_espresso"), $this->get_help_tab_link()), |
|
| 63 | 63 | 'required' => true |
| 64 | 64 | )), |
| 65 | 65 | 'credit_card_types'=>new EE_Checkbox_Multi_Input( |
| 66 | 66 | $this->card_types_supported(), |
| 67 | 67 | array( |
| 68 | - 'html_label_text' => __( 'Card Types Supported', 'event_espresso' ), |
|
| 68 | + 'html_label_text' => __('Card Types Supported', 'event_espresso'), |
|
| 69 | 69 | 'required' => true )), |
| 70 | 70 | ) |
| 71 | 71 | ) |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | * @throws \EE_Error |
| 80 | 80 | * @return EE_Billing_Info_Form |
| 81 | 81 | */ |
| 82 | - public function generate_new_billing_form( EE_Transaction $transaction = NULL ) { |
|
| 83 | - $allowed_types = $this->_pm_instance->get_extra_meta( 'credit_card_types', TRUE ); |
|
| 82 | + public function generate_new_billing_form(EE_Transaction $transaction = NULL) { |
|
| 83 | + $allowed_types = $this->_pm_instance->get_extra_meta('credit_card_types', TRUE); |
|
| 84 | 84 | //if allowed types is a string or empty array or null... |
| 85 | - if( empty( $allowed_types )) { |
|
| 85 | + if (empty($allowed_types)) { |
|
| 86 | 86 | $allowed_types = array(); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -93,26 +93,26 @@ discard block |
||
| 93 | 93 | // 'html_id'=> 'ee-Paypal_Pro-billing-form', |
| 94 | 94 | 'subsections'=>array( |
| 95 | 95 | 'credit_card'=>new EE_Credit_Card_Input( |
| 96 | - array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Number', 'event_espresso' )) |
|
| 96 | + array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Number', 'event_espresso')) |
|
| 97 | 97 | ), |
| 98 | 98 | 'credit_card_type'=>new EE_Select_Input( |
| 99 | 99 | //the options are set dynamically |
| 100 | - array_intersect_key( EE_PMT_Paypal_Pro::card_types_supported(), array_flip( $allowed_types )), |
|
| 101 | - array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Card Type', 'event_espresso' )) |
|
| 100 | + array_intersect_key(EE_PMT_Paypal_Pro::card_types_supported(), array_flip($allowed_types)), |
|
| 101 | + array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Card Type', 'event_espresso')) |
|
| 102 | 102 | ), |
| 103 | 103 | 'exp_month'=>new EE_Month_Input( |
| 104 | - TRUE, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Month', 'event_espresso' ) ) |
|
| 104 | + TRUE, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Month', 'event_espresso')) |
|
| 105 | 105 | ), |
| 106 | 106 | 'exp_year'=>new EE_Credit_Card_Year_Input( |
| 107 | - array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'Expiry Year', 'event_espresso' ) ) |
|
| 107 | + array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('Expiry Year', 'event_espresso')) |
|
| 108 | 108 | ), |
| 109 | 109 | 'cvv'=>new EE_CVV_Input( |
| 110 | - array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __( 'CVV', 'event_espresso' ) ) |
|
| 110 | + array('required'=>TRUE, 'html_class' => 'ee-billing-qstn', 'html_label_text' => __('CVV', 'event_espresso')) |
|
| 111 | 111 | ), |
| 112 | 112 | ) |
| 113 | 113 | ) |
| 114 | 114 | ); |
| 115 | - return $this->apply_billing_form_debug_settings( $billing_form ); |
|
| 115 | + return $this->apply_billing_form_debug_settings($billing_form); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | |
@@ -124,20 +124,20 @@ discard block |
||
| 124 | 124 | * @param \EE_Billing_Info_Form $billing_form |
| 125 | 125 | * @return \EE_Billing_Info_Form |
| 126 | 126 | */ |
| 127 | - public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) { |
|
| 128 | - if ( $this->_pm_instance->debug_mode() ) { |
|
| 127 | + public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) { |
|
| 128 | + if ($this->_pm_instance->debug_mode()) { |
|
| 129 | 129 | $billing_form->add_subsections( |
| 130 | - array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ), |
|
| 130 | + array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()), |
|
| 131 | 131 | 'credit_card' |
| 132 | 132 | ); |
| 133 | 133 | $billing_form->add_subsections( |
| 134 | - array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php' )), |
|
| 134 | + array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'paypal_pro_debug_info.template.php')), |
|
| 135 | 135 | 'first_name' |
| 136 | 136 | ); |
| 137 | - $billing_form->get_input( 'credit_card' )->set_default( '5424180818927383' ); |
|
| 138 | - $billing_form->get_input( 'credit_card_type' )->set_default( 'MasterCard' ); |
|
| 139 | - $billing_form->get_input( 'exp_year' )->set_default( date('Y') + 6 ); |
|
| 140 | - $billing_form->get_input( 'cvv' )->set_default( '115' ); |
|
| 137 | + $billing_form->get_input('credit_card')->set_default('5424180818927383'); |
|
| 138 | + $billing_form->get_input('credit_card_type')->set_default('MasterCard'); |
|
| 139 | + $billing_form->get_input('exp_year')->set_default(date('Y') + 6); |
|
| 140 | + $billing_form->get_input('cvv')->set_default('115'); |
|
| 141 | 141 | } |
| 142 | 142 | return $billing_form; |
| 143 | 143 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * Keys are their values, values are their pretty names. |
| 150 | 150 | * @return array |
| 151 | 151 | */ |
| 152 | - public static function card_types_supported(){ |
|
| 152 | + public static function card_types_supported() { |
|
| 153 | 153 | return array( |
| 154 | 154 | 'Visa'=> __("Visa", 'event_espresso'), |
| 155 | 155 | 'MasterCard'=> __("MasterCard", 'event_espresso'), |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @see EE_PMT_Base::help_tabs_config() |
| 166 | 166 | * @return array |
| 167 | 167 | */ |
| 168 | - public function help_tabs_config(){ |
|
| 168 | + public function help_tabs_config() { |
|
| 169 | 169 | return array( |
| 170 | 170 | $this->get_help_tab_name() => array( |
| 171 | 171 | 'title' => __('PayPal Pro Settings', 'event_espresso'), |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | * @param EE_Billing_Info_Form $billing_form |
| 181 | 181 | * @return array |
| 182 | 182 | */ |
| 183 | - protected function _get_billing_values_from_form( $billing_form ){ |
|
| 184 | - $billing_values = parent::_get_billing_values_from_form( $billing_form ); |
|
| 185 | - $billing_values[ 'country' ] = $billing_form->get_input_value( 'country' ); |
|
| 186 | - $billing_values[ 'credit_card_type' ] = $billing_form->get_input_value( 'credit_card_type' ); |
|
| 183 | + protected function _get_billing_values_from_form($billing_form) { |
|
| 184 | + $billing_values = parent::_get_billing_values_from_form($billing_form); |
|
| 185 | + $billing_values['country'] = $billing_form->get_input_value('country'); |
|
| 186 | + $billing_values['credit_card_type'] = $billing_form->get_input_value('credit_card_type'); |
|
| 187 | 187 | return $billing_values; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -1,7 +1,8 @@ |
||
| 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 |
@@ -3,7 +3,7 @@ |
||
| 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> |
@@ -3,30 +3,30 @@ |
||
| 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> |
@@ -1,6 +1,6 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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"> |
@@ -1,7 +1,8 @@ |
||
| 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 | * |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | * @param array $arguments |
| 40 | 40 | * @return \EE_CPT_Attendee_Strategy |
| 41 | 41 | */ |
| 42 | - public function __construct( $arguments = array() ) { |
|
| 43 | - $this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL; |
|
| 44 | - $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL; |
|
| 42 | + public function __construct($arguments = array()) { |
|
| 43 | + $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL; |
|
| 44 | + $WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL; |
|
| 45 | 45 | // add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 ); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * @param WP_Query $wp_query |
| 56 | 56 | * @return void |
| 57 | 57 | */ |
| 58 | - public function the_posts( $posts, WP_Query $wp_query) { |
|
| 58 | + public function the_posts($posts, WP_Query $wp_query) { |
|
| 59 | 59 | //$EVT = EE_Registry::instance()->load_model( 'Event' ); |
| 60 | 60 | // EEH_Debug_Tools::printr( $EVT, '$EVT <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 61 | 61 | // $EVT_IDs = array(); |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * Event Espresso |
| 4 | 6 | * |
@@ -24,10 +24,10 @@ |
||
| 24 | 24 | class EE_CPT_Strategy extends EE_BASE { |
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | - * EE_CPT_Strategy Object |
|
| 28 | - * @private _instance |
|
| 29 | - * @private protected |
|
| 30 | - */ |
|
| 27 | + * EE_CPT_Strategy Object |
|
| 28 | + * @private _instance |
|
| 29 | + * @private protected |
|
| 30 | + */ |
|
| 31 | 31 | private static $_instance = NULL; |
| 32 | 32 | |
| 33 | 33 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public static function instance() { |
| 80 | 80 | // check if class object is instantiated |
| 81 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CPT_Strategy )) { |
|
| 81 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CPT_Strategy)) { |
|
| 82 | 82 | self::$_instance = new self(); |
| 83 | 83 | } |
| 84 | 84 | return self::$_instance; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | // d( $this->_CPT_endpoints ); |
| 102 | 102 | // d( $this->_CPT_taxonomies ); |
| 103 | 103 | // load EE_Request_Handler |
| 104 | - add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 5 ); |
|
| 104 | + add_action('pre_get_posts', array($this, 'pre_get_posts'), 5); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | private function _set_CPT_endpoints() { |
| 116 | 116 | $_CPT_endpoints = array(); |
| 117 | - if ( is_array( $this->_CPTs )) { |
|
| 118 | - foreach ( $this->_CPTs as $CPT_type => $CPT ) { |
|
| 119 | - $_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type; |
|
| 117 | + if (is_array($this->_CPTs)) { |
|
| 118 | + foreach ($this->_CPTs as $CPT_type => $CPT) { |
|
| 119 | + $_CPT_endpoints [$CPT['plural_slug']] = $CPT_type; |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | return $_CPT_endpoints; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @param WP_Query $WP_Query |
| 132 | 132 | * @return void |
| 133 | 133 | */ |
| 134 | - private function _set_EE_tags_on_WP_Query( WP_Query $WP_Query) { |
|
| 134 | + private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query) { |
|
| 135 | 135 | $WP_Query->is_espresso_event_single = FALSE; |
| 136 | 136 | $WP_Query->is_espresso_event_archive = FALSE; |
| 137 | 137 | $WP_Query->is_espresso_event_taxonomy = FALSE; |
@@ -158,16 +158,16 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | private function _set_CPT_taxonomies() { |
| 160 | 160 | // check if taxonomies have already been set |
| 161 | - if ( empty( $this->_CPT_taxonomies )) { |
|
| 161 | + if (empty($this->_CPT_taxonomies)) { |
|
| 162 | 162 | // and that this CPT has taxonomies registered for it |
| 163 | - if ( isset( $this->CPT['args'] ) && isset( $this->CPT['args']['taxonomies'] )) { |
|
| 163 | + if (isset($this->CPT['args']) && isset($this->CPT['args']['taxonomies'])) { |
|
| 164 | 164 | // if so then grab them, but we want the taxonomy name as the key |
| 165 | - $taxonomies = array_flip( $this->CPT['args']['taxonomies'] ); |
|
| 165 | + $taxonomies = array_flip($this->CPT['args']['taxonomies']); |
|
| 166 | 166 | // then grab the list of ALL taxonomies |
| 167 | 167 | $all_taxonomies = EE_Register_CPTs::get_taxonomies(); |
| 168 | - foreach ( $taxonomies as $taxonomy => $details ) { |
|
| 168 | + foreach ($taxonomies as $taxonomy => $details) { |
|
| 169 | 169 | // add details to our taxonomies if they exist |
| 170 | - $taxonomies[ $taxonomy ] = isset( $all_taxonomies[ $taxonomy ] ) ? $all_taxonomies[ $taxonomy ] : NULL; |
|
| 170 | + $taxonomies[$taxonomy] = isset($all_taxonomies[$taxonomy]) ? $all_taxonomies[$taxonomy] : NULL; |
|
| 171 | 171 | } |
| 172 | 172 | $this->_CPT_taxonomies = $taxonomies; |
| 173 | 173 | } |
@@ -183,10 +183,10 @@ discard block |
||
| 183 | 183 | * @return void |
| 184 | 184 | */ |
| 185 | 185 | private function _set_CPT_terms() { |
| 186 | - if ( empty( $this->_CPT_terms )) { |
|
| 186 | + if (empty($this->_CPT_terms)) { |
|
| 187 | 187 | $terms = EEM_Term::instance()->get_all_CPT_post_tags(); |
| 188 | - foreach ( $terms as $term ) { |
|
| 189 | - $this->_CPT_terms[ $term->slug() ] = $term; |
|
| 188 | + foreach ($terms as $term) { |
|
| 189 | + $this->_CPT_terms[$term->slug()] = $term; |
|
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | } |
@@ -200,24 +200,24 @@ discard block |
||
| 200 | 200 | * @param $WP_Query |
| 201 | 201 | * @return void |
| 202 | 202 | */ |
| 203 | - private function _set_post_type_for_terms( WP_Query $WP_Query ) { |
|
| 203 | + private function _set_post_type_for_terms(WP_Query $WP_Query) { |
|
| 204 | 204 | // is a tag set ? |
| 205 | - if ( isset( $WP_Query->query['tag'] )) { |
|
| 205 | + if (isset($WP_Query->query['tag'])) { |
|
| 206 | 206 | // set post_tags |
| 207 | 207 | $this->_set_CPT_terms(); |
| 208 | 208 | // is this tag archive term in the list of terms used by our CPTs ? |
| 209 | - $term = isset ( $this->_CPT_terms[ $WP_Query->query['tag'] ] ) ? $this->_CPT_terms[ $WP_Query->query['tag'] ] : NULL; |
|
| 209 | + $term = isset ($this->_CPT_terms[$WP_Query->query['tag']]) ? $this->_CPT_terms[$WP_Query->query['tag']] : NULL; |
|
| 210 | 210 | // verify the term |
| 211 | - if ( $term instanceof EE_Term ) { |
|
| 212 | - $term->post_type = array_merge( array( 'post', 'page' ), (array)$term->post_type ); |
|
| 213 | - $term->post_type = apply_filters( 'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term ); |
|
| 211 | + if ($term instanceof EE_Term) { |
|
| 212 | + $term->post_type = array_merge(array('post', 'page'), (array) $term->post_type); |
|
| 213 | + $term->post_type = apply_filters('FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term); |
|
| 214 | 214 | // if a post type is already set |
| 215 | - if ( isset( $WP_Query->query_vars['post_type'] )) { |
|
| 215 | + if (isset($WP_Query->query_vars['post_type'])) { |
|
| 216 | 216 | // add to existing array |
| 217 | - $term->post_type = array_merge ( (array)$WP_Query->query_vars['post_type'], $term->post_type ); |
|
| 217 | + $term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type); |
|
| 218 | 218 | } |
| 219 | 219 | // just set post_type to our CPT |
| 220 | - $WP_Query->set( 'post_type', $term->post_type ); |
|
| 220 | + $WP_Query->set('post_type', $term->post_type); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -232,17 +232,17 @@ discard block |
||
| 232 | 232 | * in order for is_archive() and is_single() methods to work properly. |
| 233 | 233 | * @return void |
| 234 | 234 | */ |
| 235 | - public function _possibly_set_ee_request_var(){ |
|
| 235 | + public function _possibly_set_ee_request_var() { |
|
| 236 | 236 | // check if ee action var has been set |
| 237 | - if ( ! EE_Registry::instance()->REQ->is_set( 'ee' )) { |
|
| 237 | + if ( ! EE_Registry::instance()->REQ->is_set('ee')) { |
|
| 238 | 238 | // check that route exists for CPT archive slug |
| 239 | - if ( is_archive() && EE_Config::get_route( $this->CPT['plural_slug'] )) { |
|
| 239 | + if (is_archive() && EE_Config::get_route($this->CPT['plural_slug'])) { |
|
| 240 | 240 | // ie: set "ee" to "events" |
| 241 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['plural_slug'] ); |
|
| 241 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['plural_slug']); |
|
| 242 | 242 | // or does it match a single page CPT like /event/ |
| 243 | - } else if ( is_single() && EE_Config::get_route( $this->CPT['singular_slug'] )) { |
|
| 243 | + } else if (is_single() && EE_Config::get_route($this->CPT['singular_slug'])) { |
|
| 244 | 244 | // ie: set "ee" to "event" |
| 245 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] ); |
|
| 245 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']); |
|
| 246 | 246 | } |
| 247 | 247 | } |
| 248 | 248 | } |
@@ -256,11 +256,11 @@ discard block |
||
| 256 | 256 | * @param WP_Query $WP_Query |
| 257 | 257 | * @return void |
| 258 | 258 | */ |
| 259 | - public function _set_paging( $WP_Query ) { |
|
| 260 | - if ( $WP_Query->is_main_query() && apply_filters( 'FHEE__EE_CPT_Strategy___set_paging', TRUE )) { |
|
| 261 | - $page = ( get_query_var('page') ) ? get_query_var('page') : NULL; |
|
| 262 | - $paged = ( get_query_var('paged') ) ? get_query_var('paged') : $page; |
|
| 263 | - $WP_Query->set( 'paged', $paged ); |
|
| 259 | + public function _set_paging($WP_Query) { |
|
| 260 | + if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', TRUE)) { |
|
| 261 | + $page = (get_query_var('page')) ? get_query_var('page') : NULL; |
|
| 262 | + $paged = (get_query_var('paged')) ? get_query_var('paged') : $page; |
|
| 263 | + $WP_Query->set('paged', $paged); |
|
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | |
@@ -277,34 +277,34 @@ discard block |
||
| 277 | 277 | * @param WP_Query $WP_Query |
| 278 | 278 | * @return void |
| 279 | 279 | */ |
| 280 | - public function pre_get_posts( $WP_Query ) { |
|
| 280 | + public function pre_get_posts($WP_Query) { |
|
| 281 | 281 | // check that postz-type is set |
| 282 | - if ( ! $WP_Query instanceof WP_Query ) { |
|
| 282 | + if ( ! $WP_Query instanceof WP_Query) { |
|
| 283 | 283 | return; |
| 284 | 284 | } |
| 285 | 285 | // add our conditionals |
| 286 | - $this->_set_EE_tags_on_WP_Query( $WP_Query ); |
|
| 286 | + $this->_set_EE_tags_on_WP_Query($WP_Query); |
|
| 287 | 287 | // check for terms |
| 288 | - $this->_set_post_type_for_terms( $WP_Query ); |
|
| 288 | + $this->_set_post_type_for_terms($WP_Query); |
|
| 289 | 289 | // make sure paging is always set |
| 290 | - $this->_set_paging( $WP_Query ); |
|
| 290 | + $this->_set_paging($WP_Query); |
|
| 291 | 291 | |
| 292 | 292 | // is a taxonomy set ? |
| 293 | - if ( $WP_Query->is_tax ) { |
|
| 293 | + if ($WP_Query->is_tax) { |
|
| 294 | 294 | // loop thru our taxonomies |
| 295 | - foreach ( $this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details ) { |
|
| 295 | + foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) { |
|
| 296 | 296 | // check if one of our taxonomies is set as a query var |
| 297 | - if ( isset( $WP_Query->query[ $CPT_taxonomy ] )) { |
|
| 297 | + if (isset($WP_Query->query[$CPT_taxonomy])) { |
|
| 298 | 298 | // but which CPT does that correspond to??? hmmm... guess we gotta go looping |
| 299 | - foreach ( $this->_CPTs as $post_type => $CPT ) { |
|
| 299 | + foreach ($this->_CPTs as $post_type => $CPT) { |
|
| 300 | 300 | // verify our CPT has args, is public and has taxonomies set |
| 301 | - if ( isset( $CPT['args'] ) && $CPT['args']['public'] && ! empty( $CPT['args']['taxonomies'] )) { |
|
| 301 | + if (isset($CPT['args']) && $CPT['args']['public'] && ! empty($CPT['args']['taxonomies'])) { |
|
| 302 | 302 | // does the captured taxonomy belong to this CPT ? |
| 303 | - if ( in_array( $CPT_taxonomy, $CPT['args']['taxonomies'] )) { |
|
| 303 | + if (in_array($CPT_taxonomy, $CPT['args']['taxonomies'])) { |
|
| 304 | 304 | // if so, then add this CPT post_type to the current query's array of post_types' |
| 305 | - $WP_Query->query_vars['post_type'] = isset( $WP_Query->query_vars['post_type'] ) ? (array)$WP_Query->query_vars['post_type'] : array(); |
|
| 305 | + $WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type']) ? (array) $WP_Query->query_vars['post_type'] : array(); |
|
| 306 | 306 | $WP_Query->query_vars['post_type'][] = $post_type; |
| 307 | - switch( $post_type ) { |
|
| 307 | + switch ($post_type) { |
|
| 308 | 308 | case 'espresso_events' : |
| 309 | 309 | $WP_Query->is_espresso_event_taxonomy = TRUE; |
| 310 | 310 | break; |
@@ -325,21 +325,21 @@ discard block |
||
| 325 | 325 | // d( $CPT_taxonomy ); |
| 326 | 326 | // d( $WP_Query ); |
| 327 | 327 | |
| 328 | - if ( isset( $WP_Query->query_vars['post_type'] )) { |
|
| 328 | + if (isset($WP_Query->query_vars['post_type'])) { |
|
| 329 | 329 | // loop thru post_types as array |
| 330 | - foreach ( (array)$WP_Query->query_vars['post_type'] as $post_type ) { |
|
| 330 | + foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) { |
|
| 331 | 331 | // is current query for an EE CPT ? |
| 332 | - if ( isset( $this->_CPTs[ $post_type ] )) { |
|
| 332 | + if (isset($this->_CPTs[$post_type])) { |
|
| 333 | 333 | // is EE on or off ? |
| 334 | - if ( EE_Maintenance_Mode::instance()->level() ) { |
|
| 334 | + if (EE_Maintenance_Mode::instance()->level()) { |
|
| 335 | 335 | // reroute CPT template view to maintenance_mode.template.php |
| 336 | - if( ! has_filter( 'template_include',array( 'EE_Maintenance_Mode', 'template_include' ))){ |
|
| 337 | - add_filter( 'template_include', array( 'EE_Maintenance_Mode', 'template_include' ), 99999 ); |
|
| 336 | + if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) { |
|
| 337 | + add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999); |
|
| 338 | 338 | } |
| 339 | 339 | return; |
| 340 | 340 | } |
| 341 | 341 | // grab details for the CPT the current query is for |
| 342 | - $this->CPT = $this->_CPTs[ $post_type ]; |
|
| 342 | + $this->CPT = $this->_CPTs[$post_type]; |
|
| 343 | 343 | // set post type |
| 344 | 344 | $this->CPT['post_type'] = $post_type; |
| 345 | 345 | // set taxonomies |
@@ -347,27 +347,27 @@ discard block |
||
| 347 | 347 | // the post or category or term that is triggering EE |
| 348 | 348 | $this->CPT['espresso_page'] = EE_Registry::instance()->REQ->is_espresso_page(); |
| 349 | 349 | // requested post name |
| 350 | - $this->CPT['post_name'] = EE_Registry::instance()->REQ->get( 'post_name' ); |
|
| 350 | + $this->CPT['post_name'] = EE_Registry::instance()->REQ->get('post_name'); |
|
| 351 | 351 | //d( $this->CPT ); |
| 352 | 352 | // add support for viewing 'private', 'draft', or 'pending' posts |
| 353 | - if ( is_user_logged_in() && isset( $WP_Query->query_vars['p'] ) && $WP_Query->query_vars['p'] != 0 && current_user_can( 'edit_post', $WP_Query->query_vars['p'] )) { |
|
| 353 | + if (is_user_logged_in() && isset($WP_Query->query_vars['p']) && $WP_Query->query_vars['p'] != 0 && current_user_can('edit_post', $WP_Query->query_vars['p'])) { |
|
| 354 | 354 | // we can just inject directly into the WP_Query object |
| 355 | - $WP_Query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' ); |
|
| 355 | + $WP_Query->query['post_status'] = array('publish', 'private', 'draft', 'pending'); |
|
| 356 | 356 | // now set the main 'ee' request var so that the appropriate module can load the appropriate template(s) |
| 357 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] ); |
|
| 357 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']); |
|
| 358 | 358 | } |
| 359 | - $this->_possibly_set_ee_request_var( $post_type ); |
|
| 359 | + $this->_possibly_set_ee_request_var($post_type); |
|
| 360 | 360 | // convert post_type to model name |
| 361 | - $model_name = str_replace( 'EE_', '', $this->CPT['class_name'] ); |
|
| 361 | + $model_name = str_replace('EE_', '', $this->CPT['class_name']); |
|
| 362 | 362 | // get CPT table data via CPT Model |
| 363 | - $this->CPT_model = EE_Registry::instance()->load_model( $model_name ); |
|
| 363 | + $this->CPT_model = EE_Registry::instance()->load_model($model_name); |
|
| 364 | 364 | $this->CPT['tables'] = $this->CPT_model->get_tables(); |
| 365 | 365 | // is there a Meta Table for this CPT? |
| 366 | - $this->CPT['meta_table'] = isset( $this->CPT['tables'][ $model_name . '_Meta' ] ) ? $this->CPT['tables'][ $model_name . '_Meta' ] : FALSE; |
|
| 366 | + $this->CPT['meta_table'] = isset($this->CPT['tables'][$model_name.'_Meta']) ? $this->CPT['tables'][$model_name.'_Meta'] : FALSE; |
|
| 367 | 367 | // creates classname like: CPT_Event_Strategy |
| 368 | - $CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy'; |
|
| 368 | + $CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy'; |
|
| 369 | 369 | // load and instantiate |
| 370 | - $CPT_Strategy = EE_Registry::instance()->load_core ( $CPT_Strategy_class_name, array( 'WP_Query' => $WP_Query, 'CPT' => $this->CPT )); |
|
| 370 | + $CPT_Strategy = EE_Registry::instance()->load_core($CPT_Strategy_class_name, array('WP_Query' => $WP_Query, 'CPT' => $this->CPT)); |
|
| 371 | 371 | |
| 372 | 372 | // !!!!!!!!!! IMPORTANT !!!!!!!!!!!! |
| 373 | 373 | // here's the list of available filters in the WP_Query object |
@@ -379,13 +379,13 @@ discard block |
||
| 379 | 379 | // 'post_limits' |
| 380 | 380 | // 'posts_fields' |
| 381 | 381 | // 'posts_join' |
| 382 | - add_filter( 'posts_fields', array( $this, 'posts_fields' )); |
|
| 383 | - add_filter( 'posts_join', array( $this, 'posts_join' )); |
|
| 384 | - add_filter( 'get_' . $this->CPT['post_type'] . '_metadata', array( $CPT_Strategy, 'get_EE_post_type_metadata' ), 1, 4 ); |
|
| 385 | - add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 1 ); |
|
| 386 | - add_filter( 'get_edit_post_link', array( $this, 'get_edit_post_link' ), 10, 2 ); |
|
| 382 | + add_filter('posts_fields', array($this, 'posts_fields')); |
|
| 383 | + add_filter('posts_join', array($this, 'posts_join')); |
|
| 384 | + add_filter('get_'.$this->CPT['post_type'].'_metadata', array($CPT_Strategy, 'get_EE_post_type_metadata'), 1, 4); |
|
| 385 | + add_filter('the_posts', array($this, 'the_posts'), 1, 1); |
|
| 386 | + add_filter('get_edit_post_link', array($this, 'get_edit_post_link'), 10, 2); |
|
| 387 | 387 | |
| 388 | - $this->_do_template_filters( $WP_Query ); |
|
| 388 | + $this->_do_template_filters($WP_Query); |
|
| 389 | 389 | } |
| 390 | 390 | } |
| 391 | 391 | } |
@@ -400,13 +400,13 @@ discard block |
||
| 400 | 400 | * @param $SQL |
| 401 | 401 | * @return string |
| 402 | 402 | */ |
| 403 | - public function posts_fields( $SQL ) { |
|
| 403 | + public function posts_fields($SQL) { |
|
| 404 | 404 | // does this CPT have a meta table ? |
| 405 | - if ( ! empty( $this->CPT['meta_table'] )) { |
|
| 405 | + if ( ! empty($this->CPT['meta_table'])) { |
|
| 406 | 406 | // adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement |
| 407 | - $SQL .= ', ' . $this->CPT['meta_table']->get_table_name() . '.* ' ; |
|
| 407 | + $SQL .= ', '.$this->CPT['meta_table']->get_table_name().'.* '; |
|
| 408 | 408 | } |
| 409 | - remove_filter( 'posts_fields', array( $this, 'posts_fields' )); |
|
| 409 | + remove_filter('posts_fields', array($this, 'posts_fields')); |
|
| 410 | 410 | return $SQL; |
| 411 | 411 | } |
| 412 | 412 | |
@@ -419,14 +419,14 @@ discard block |
||
| 419 | 419 | * @param $SQL |
| 420 | 420 | * @return string |
| 421 | 421 | */ |
| 422 | - public function posts_join( $SQL ) { |
|
| 422 | + public function posts_join($SQL) { |
|
| 423 | 423 | // does this CPT have a meta table ? |
| 424 | - if ( ! empty( $this->CPT['meta_table'] )) { |
|
| 424 | + if ( ! empty($this->CPT['meta_table'])) { |
|
| 425 | 425 | global $wpdb; |
| 426 | 426 | // adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement |
| 427 | - $SQL .= ' LEFT JOIN ' . $this->CPT['meta_table']->get_table_name() . ' ON ( ' . $this->CPT['meta_table']->get_table_name() . '.' . $this->CPT['meta_table']->get_fk_on_table() . ' = ' . $wpdb->posts . '.ID ) '; |
|
| 427 | + $SQL .= ' LEFT JOIN '.$this->CPT['meta_table']->get_table_name().' ON ( '.$this->CPT['meta_table']->get_table_name().'.'.$this->CPT['meta_table']->get_fk_on_table().' = '.$wpdb->posts.'.ID ) '; |
|
| 428 | 428 | } |
| 429 | - remove_filter( 'posts_join', array( $this, 'posts_join' )); |
|
| 429 | + remove_filter('posts_join', array($this, 'posts_join')); |
|
| 430 | 430 | return $SQL; |
| 431 | 431 | } |
| 432 | 432 | |
@@ -439,18 +439,18 @@ discard block |
||
| 439 | 439 | * @param \WP_Post[] $posts |
| 440 | 440 | * @return \WP_Post[] |
| 441 | 441 | */ |
| 442 | - public function the_posts( $posts ) { |
|
| 442 | + public function the_posts($posts) { |
|
| 443 | 443 | // d( $posts ); |
| 444 | 444 | $CPT_class = $this->CPT['class_name']; |
| 445 | 445 | // loop thru posts |
| 446 | - if ( is_array( $posts )) { |
|
| 447 | - foreach( $posts as $key => $post ) { |
|
| 448 | - if ( isset( $this->_CPTs[ $post->post_type ] )) { |
|
| 449 | - $post->$CPT_class = $this->CPT_model->instantiate_class_from_post_object( $post ); |
|
| 446 | + if (is_array($posts)) { |
|
| 447 | + foreach ($posts as $key => $post) { |
|
| 448 | + if (isset($this->_CPTs[$post->post_type])) { |
|
| 449 | + $post->$CPT_class = $this->CPT_model->instantiate_class_from_post_object($post); |
|
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | - remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 1 ); |
|
| 453 | + remove_filter('the_posts', array($this, 'the_posts'), 1, 1); |
|
| 454 | 454 | return $posts; |
| 455 | 455 | } |
| 456 | 456 | |
@@ -461,17 +461,17 @@ discard block |
||
| 461 | 461 | * @param $ID |
| 462 | 462 | * @return string |
| 463 | 463 | */ |
| 464 | - function get_edit_post_link( $url, $ID ) { |
|
| 464 | + function get_edit_post_link($url, $ID) { |
|
| 465 | 465 | //need to make sure we only edit links if our cpt |
| 466 | 466 | global $post; |
| 467 | - if ( ! isset( $this->_CPTs[ $post->post_type ] )) { |
|
| 467 | + if ( ! isset($this->_CPTs[$post->post_type])) { |
|
| 468 | 468 | return $url; |
| 469 | 469 | } |
| 470 | 470 | //k made it here so all is good. |
| 471 | 471 | $scheme = is_ssl() ? 'https' : 'http'; |
| 472 | - $url = get_admin_url( EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme ); |
|
| 472 | + $url = get_admin_url(EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme); |
|
| 473 | 473 | // http://example.com/wp-admin/admin.php?page=espresso_events&action=edit&post=205&edit_nonce=0d403530d6 |
| 474 | - return wp_nonce_url( add_query_arg( array( 'page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit' ), $url ), 'edit', 'edit_nonce' ); |
|
| 474 | + return wp_nonce_url(add_query_arg(array('page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit'), $url), 'edit', 'edit_nonce'); |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | |
@@ -485,11 +485,11 @@ discard block |
||
| 485 | 485 | * @param WP_Query $WP_Query |
| 486 | 486 | * @return void |
| 487 | 487 | */ |
| 488 | - protected function _do_template_filters( WP_Query $WP_Query ) { |
|
| 488 | + protected function _do_template_filters(WP_Query $WP_Query) { |
|
| 489 | 489 | // if it's the main query and requested cpt supports page_templates, |
| 490 | - if ( $WP_Query->is_main_query() && ! empty( $this->CPT['args']['page_templates'] ) ) { |
|
| 490 | + if ($WP_Query->is_main_query() && ! empty($this->CPT['args']['page_templates'])) { |
|
| 491 | 491 | // then let's hook into the appropriate query_template hook |
| 492 | - add_filter( 'single_template', array( $this, 'single_cpt_template' ) ); |
|
| 492 | + add_filter('single_template', array($this, 'single_cpt_template')); |
|
| 493 | 493 | } |
| 494 | 494 | } |
| 495 | 495 | |
@@ -503,16 +503,16 @@ discard block |
||
| 503 | 503 | * @param string $current_template Existing default template path derived for this page call. |
| 504 | 504 | * @return string the path to the full template file. |
| 505 | 505 | */ |
| 506 | - public function single_cpt_template( $current_template ) { |
|
| 506 | + public function single_cpt_template($current_template) { |
|
| 507 | 507 | $object = get_queried_object(); |
| 508 | 508 | //does this called object HAVE a page template set that is something other than the default. |
| 509 | - $template = get_post_meta( $object->ID, '_wp_page_template', true ); |
|
| 509 | + $template = get_post_meta($object->ID, '_wp_page_template', true); |
|
| 510 | 510 | //exit early if default or not set or invalid path (accounts for theme changes) |
| 511 | - if ( $template == 'default' || empty( $template ) || validate_file( $template ) != 0 || ! is_readable( $template ) ) { |
|
| 511 | + if ($template == 'default' || empty($template) || validate_file($template) != 0 || ! is_readable($template)) { |
|
| 512 | 512 | return $current_template; |
| 513 | 513 | } |
| 514 | 514 | //made it here so we SHOULD be able to just locate the template and then return it. |
| 515 | - $template = locate_template( array($template) ); |
|
| 515 | + $template = locate_template(array($template)); |
|
| 516 | 516 | |
| 517 | 517 | return $template; |
| 518 | 518 | } |
@@ -560,9 +560,9 @@ discard block |
||
| 560 | 560 | * @param array $arguments |
| 561 | 561 | * @return \EE_CPT_Default_Strategy |
| 562 | 562 | */ |
| 563 | - public function __construct( $arguments = array() ) { |
|
| 564 | - $this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL; |
|
| 565 | - $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL; |
|
| 563 | + public function __construct($arguments = array()) { |
|
| 564 | + $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL; |
|
| 565 | + $WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL; |
|
| 566 | 566 | //EEH_Debug_Tools::printr( $this->CPT, '$this->CPT <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 567 | 567 | // add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 ); |
| 568 | 568 | // add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 ); |
@@ -577,9 +577,9 @@ discard block |
||
| 577 | 577 | * @param \WP_Query $WP_Query |
| 578 | 578 | * @return \WP_Query |
| 579 | 579 | */ |
| 580 | - public function pre_get_posts( WP_Query $WP_Query ) { |
|
| 580 | + public function pre_get_posts(WP_Query $WP_Query) { |
|
| 581 | 581 | //EEH_Debug_Tools::printr( $WP_Query, '$WP_Query <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 582 | - if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) { |
|
| 582 | + if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) { |
|
| 583 | 583 | return $WP_Query; |
| 584 | 584 | } |
| 585 | 585 | // $WP_Query->set( 'post_type', array( $this->CPT['post_type'] )); |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | * @param \WP_Query $WP_Query |
| 598 | 598 | * @return \WP_Post[] |
| 599 | 599 | */ |
| 600 | - public function the_posts( $posts, WP_Query $WP_Query ) { |
|
| 600 | + public function the_posts($posts, WP_Query $WP_Query) { |
|
| 601 | 601 | return $posts; |
| 602 | 602 | } |
| 603 | 603 | |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | * @param string $single |
| 614 | 614 | * @return mixed |
| 615 | 615 | */ |
| 616 | - public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) { |
|
| 616 | + public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) { |
|
| 617 | 617 | return $meta_value; |
| 618 | 618 | } |
| 619 | 619 | |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * Event Espresso |
| 4 | 6 | * |