@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * ------------------------------------------------------------------------ |
26 | 26 | */ |
27 | -abstract class EE_Offsite_Gateway extends EE_Gateway{ |
|
27 | +abstract class EE_Offsite_Gateway extends EE_Gateway { |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * whether or not the gateway uses an IPN |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param string $cancel_url URL to send the user to after a cancelled payment attempt on teh payment provider's website |
57 | 57 | * @return EE_Payment |
58 | 58 | */ |
59 | - public abstract function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL); |
|
59 | + public abstract function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL); |
|
60 | 60 | |
61 | 61 | |
62 | 62 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param EEI_Transaction $transaction |
69 | 69 | * @return EEI_Payment updated |
70 | 70 | */ |
71 | - public abstract function handle_payment_update($update_info,$transaction); |
|
71 | + public abstract function handle_payment_update($update_info, $transaction); |
|
72 | 72 | |
73 | 73 | |
74 | 74 | |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | * @access protected |
95 | 95 | * @param boolean $uses_separate_IPN_request |
96 | 96 | */ |
97 | - protected function set_uses_separate_IPN_request( $uses_separate_IPN_request ) { |
|
98 | - $this->_uses_separate_IPN_request = filter_var( $uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN ); |
|
97 | + protected function set_uses_separate_IPN_request($uses_separate_IPN_request) { |
|
98 | + $this->_uses_separate_IPN_request = filter_var($uses_separate_IPN_request, FILTER_VALIDATE_BOOLEAN); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * ------------------------------------------------------------------------ |
26 | 26 | */ |
27 | -abstract class EE_Onsite_Gateway extends EE_Gateway{ |
|
27 | +abstract class EE_Onsite_Gateway extends EE_Gateway { |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * @return EE_Onsite_Gateway |
@@ -53,5 +53,5 @@ discard block |
||
53 | 53 | * } unless a child class specifies these array keys are NOT present |
54 | 54 | * @return EE_Payment updated |
55 | 55 | */ |
56 | - public abstract function do_direct_payment($payment,$billing_info = null); |
|
56 | + public abstract function do_direct_payment($payment, $billing_info = null); |
|
57 | 57 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public static function instance() { |
32 | 32 | // check if class object is instantiated, and instantiated properly |
33 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Payment_Method_Manager )) { |
|
33 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Payment_Method_Manager)) { |
|
34 | 34 | self::$_instance = new self(); |
35 | 35 | } |
36 | 36 | EE_Registry::instance()->load_lib('PMT_Base'); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * Resets the instance and returns a new one |
42 | 42 | * @return EE_Payment_Method_Manager |
43 | 43 | */ |
44 | - public static function reset(){ |
|
44 | + public static function reset() { |
|
45 | 45 | self::$_instance = NULL; |
46 | 46 | return self::instance(); |
47 | 47 | } |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | * or just re-use the PMTs we found last time we checked during this request (if |
53 | 53 | * we have not yet checked during this request, then we need to check anyways) |
54 | 54 | */ |
55 | - public function maybe_register_payment_methods( $force_recheck = FALSE ){ |
|
56 | - if( ! $this->_payment_method_types || $force_recheck ){ |
|
55 | + public function maybe_register_payment_methods($force_recheck = FALSE) { |
|
56 | + if ( ! $this->_payment_method_types || $force_recheck) { |
|
57 | 57 | $this->_register_payment_methods(); |
58 | 58 | //if in admin lets ensure caps are set. |
59 | - if ( is_admin() ) { |
|
60 | - add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( $this, 'add_payment_method_caps' ) ); |
|
59 | + if (is_admin()) { |
|
60 | + add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array($this, 'add_payment_method_caps')); |
|
61 | 61 | EE_Registry::instance()->CAP->init_caps(); |
62 | 62 | } |
63 | 63 | } |
@@ -70,19 +70,19 @@ discard block |
||
70 | 70 | */ |
71 | 71 | protected function _register_payment_methods() { |
72 | 72 | // grab list of installed modules |
73 | - $pm_to_register = glob( EE_PAYMENT_METHODS . '*', GLOB_ONLYDIR ); |
|
73 | + $pm_to_register = glob(EE_PAYMENT_METHODS.'*', GLOB_ONLYDIR); |
|
74 | 74 | // filter list of modules to register |
75 | - $pm_to_register = apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register ); |
|
75 | + $pm_to_register = apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', $pm_to_register); |
|
76 | 76 | |
77 | 77 | // loop through folders |
78 | - foreach ( $pm_to_register as $pm_path ) { |
|
79 | - $this->register_payment_method( $pm_path ); |
|
78 | + foreach ($pm_to_register as $pm_path) { |
|
79 | + $this->register_payment_method($pm_path); |
|
80 | 80 | } |
81 | - do_action( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods' ); |
|
81 | + do_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods'); |
|
82 | 82 | // filter list of installed modules |
83 | 83 | //keep them organized alphabetically by the payment method type's name |
84 | - ksort( $this->_payment_method_types ); |
|
85 | - return apply_filters( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types ); |
|
84 | + ksort($this->_payment_method_types); |
|
85 | + return apply_filters('FHEE__EE_Payment_Method_Manager__register_payment_methods__installed_payment_methods', $this->_payment_method_types); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -94,35 +94,35 @@ discard block |
||
94 | 94 | * @param string $payment_method_path - full path up to and including payment method folder |
95 | 95 | * @return boolean |
96 | 96 | */ |
97 | - public function register_payment_method( $payment_method_path = '' ) { |
|
98 | - do_action( 'AHEE__EE_Payment_Method_Manager__register_payment_method__begin',$payment_method_path ); |
|
97 | + public function register_payment_method($payment_method_path = '') { |
|
98 | + do_action('AHEE__EE_Payment_Method_Manager__register_payment_method__begin', $payment_method_path); |
|
99 | 99 | $module_ext = '.pm.php'; |
100 | 100 | // make all separators match |
101 | - $payment_method_path = rtrim( str_replace( '/\\', DS, $payment_method_path ), DS ); |
|
101 | + $payment_method_path = rtrim(str_replace('/\\', DS, $payment_method_path), DS); |
|
102 | 102 | // grab and sanitize module name |
103 | - $module_dir = basename( $payment_method_path ); |
|
103 | + $module_dir = basename($payment_method_path); |
|
104 | 104 | // create classname from module directory name |
105 | - $module = str_replace( ' ', '_', str_replace( '_', ' ', $module_dir )); |
|
105 | + $module = str_replace(' ', '_', str_replace('_', ' ', $module_dir)); |
|
106 | 106 | // add class prefix |
107 | - $module_class = 'EE_PMT_' . $module; |
|
107 | + $module_class = 'EE_PMT_'.$module; |
|
108 | 108 | // does the module exist ? |
109 | - if ( ! is_readable( $payment_method_path . DS . $module_class . $module_ext )) { |
|
110 | - $msg = sprintf( __( 'The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module ); |
|
111 | - EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
109 | + if ( ! is_readable($payment_method_path.DS.$module_class.$module_ext)) { |
|
110 | + $msg = sprintf(__('The requested %s payment method file could not be found or is not readable due to file permissions.', 'event_espresso'), $module); |
|
111 | + EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__); |
|
112 | 112 | return FALSE; |
113 | 113 | } |
114 | - if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->start_timer(); } |
|
114 | + if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->start_timer(); } |
|
115 | 115 | // load the module class file |
116 | - require_once( $payment_method_path . DS . $module_class . $module_ext ); |
|
117 | - if ( WP_DEBUG === TRUE ) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); } |
|
116 | + require_once($payment_method_path.DS.$module_class.$module_ext); |
|
117 | + if (WP_DEBUG === TRUE) { EEH_Debug_Tools::instance()->stop_timer("Requiring payment method $module_class"); } |
|
118 | 118 | // verify that class exists |
119 | - if ( ! class_exists( $module_class )) { |
|
120 | - $msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class ); |
|
121 | - EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
119 | + if ( ! class_exists($module_class)) { |
|
120 | + $msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class); |
|
121 | + EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__); |
|
122 | 122 | return FALSE; |
123 | 123 | } |
124 | 124 | // add to array of registered modules |
125 | - $this->_payment_method_types[ $module ] = $payment_method_path . DS . $module_class . $module_ext; |
|
125 | + $this->_payment_method_types[$module] = $payment_method_path.DS.$module_class.$module_ext; |
|
126 | 126 | return TRUE; |
127 | 127 | } |
128 | 128 | /** |
@@ -131,15 +131,15 @@ discard block |
||
131 | 131 | * @param boolean $force_recheck whether to force re-checking for new payment method types |
132 | 132 | * @return boolean |
133 | 133 | */ |
134 | - public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE){ |
|
135 | - if ( ! is_array( $this->_payment_method_types ) || ! isset( $this->_payment_method_types[$payment_method_name] ) |
|
136 | - || $force_recheck ) { |
|
134 | + public function payment_method_type_exists($payment_method_name, $force_recheck = FALSE) { |
|
135 | + if ( ! is_array($this->_payment_method_types) || ! isset($this->_payment_method_types[$payment_method_name]) |
|
136 | + || $force_recheck) { |
|
137 | 137 | $this->maybe_register_payment_methods($force_recheck); |
138 | 138 | } |
139 | - if(isset($this->_payment_method_types[$payment_method_name])){ |
|
139 | + if (isset($this->_payment_method_types[$payment_method_name])) { |
|
140 | 140 | require_once($this->_payment_method_types[$payment_method_name]); |
141 | 141 | return true; |
142 | - }else{ |
|
142 | + } else { |
|
143 | 143 | return false; |
144 | 144 | } |
145 | 145 | } |
@@ -150,16 +150,16 @@ discard block |
||
150 | 150 | * @param boolean $force_recheck whether to force re-checking for new payment method types |
151 | 151 | * @return array |
152 | 152 | */ |
153 | - public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE ){ |
|
153 | + public function payment_method_type_names($with_prefixes = FALSE, $force_recheck = FALSE) { |
|
154 | 154 | $this->maybe_register_payment_methods($force_recheck); |
155 | - if($with_prefixes){ |
|
155 | + if ($with_prefixes) { |
|
156 | 156 | $classnames = array_keys($this->_payment_method_types); |
157 | 157 | $payment_methods = array(); |
158 | - foreach($classnames as $classname){ |
|
158 | + foreach ($classnames as $classname) { |
|
159 | 159 | $payment_methods[] = $this->payment_method_class_from_type($classname); |
160 | 160 | } |
161 | 161 | return $payment_methods; |
162 | - }else{ |
|
162 | + } else { |
|
163 | 163 | return array_keys($this->_payment_method_types); |
164 | 164 | } |
165 | 165 | } |
@@ -169,10 +169,10 @@ discard block |
||
169 | 169 | * @param boolean $force_recheck whether to force re-checking for new payment method types |
170 | 170 | * @return EE_PMT_Base[] |
171 | 171 | */ |
172 | - public function payment_method_types( $force_recheck = FALSE ){ |
|
172 | + public function payment_method_types($force_recheck = FALSE) { |
|
173 | 173 | $this->maybe_register_payment_methods($force_recheck); |
174 | 174 | $pmt_objs = array(); |
175 | - foreach($this->payment_method_type_names(true) as $classname){ |
|
175 | + foreach ($this->payment_method_type_names(true) as $classname) { |
|
176 | 176 | $pmt_objs[] = new $classname; |
177 | 177 | } |
178 | 178 | return $pmt_objs; |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | * @param string $classname |
185 | 185 | * @return string |
186 | 186 | */ |
187 | - public function payment_method_type_sans_class_prefix($classname){ |
|
188 | - $pmt_name = str_replace("EE_PMT_","",$classname); |
|
187 | + public function payment_method_type_sans_class_prefix($classname) { |
|
188 | + $pmt_name = str_replace("EE_PMT_", "", $classname); |
|
189 | 189 | return $pmt_name; |
190 | 190 | } |
191 | 191 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * @param string $type |
195 | 195 | * @return string |
196 | 196 | */ |
197 | - public function payment_method_class_from_type($type){ |
|
197 | + public function payment_method_class_from_type($type) { |
|
198 | 198 | $this->maybe_register_payment_methods(); |
199 | 199 | return "EE_PMT_".$type; |
200 | 200 | } |
@@ -205,52 +205,52 @@ discard block |
||
205 | 205 | * @param string $payment_method_type the PMT_type; for EE_PMT_Invoice this would be 'Invoice' |
206 | 206 | * @return EE_Payment_Method |
207 | 207 | */ |
208 | - public function activate_a_payment_method_of_type( $payment_method_type ){ |
|
208 | + public function activate_a_payment_method_of_type($payment_method_type) { |
|
209 | 209 | $payment_method = EEM_Payment_Method::instance()->get_one_of_type($payment_method_type); |
210 | - if( ! $payment_method){ |
|
210 | + if ( ! $payment_method) { |
|
211 | 211 | global $current_user; |
212 | 212 | $pm_type_class = $this->payment_method_class_from_type($payment_method_type); |
213 | - if(class_exists($pm_type_class)){ |
|
213 | + if (class_exists($pm_type_class)) { |
|
214 | 214 | /** @var $pm_type_obj EE_PMT_Base */ |
215 | 215 | $pm_type_obj = new $pm_type_class; |
216 | 216 | $payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_type_obj->system_name()); |
217 | - if( ! $payment_method){ |
|
217 | + if ( ! $payment_method) { |
|
218 | 218 | $payment_method = EE_Payment_Method::new_instance(array( |
219 | 219 | 'PMD_type'=>$pm_type_obj->system_name(), |
220 | 220 | 'PMD_name'=>$pm_type_obj->pretty_name(), |
221 | 221 | 'PMD_admin_name'=>$pm_type_obj->pretty_name(), |
222 | - 'PMD_slug'=>$pm_type_obj->system_name(),//automatically converted to slug |
|
222 | + 'PMD_slug'=>$pm_type_obj->system_name(), //automatically converted to slug |
|
223 | 223 | 'PMD_wp_user'=>$current_user->ID, |
224 | - 'PMD_order' => EEM_Payment_Method::instance()->count( array( array( 'PMD_type' => array( '!=', 'Admin_Only' )))) * 10, |
|
224 | + 'PMD_order' => EEM_Payment_Method::instance()->count(array(array('PMD_type' => array('!=', 'Admin_Only')))) * 10, |
|
225 | 225 | )); |
226 | 226 | } |
227 | 227 | $payment_method->set_active(); |
228 | - $payment_method->set_description( $pm_type_obj->default_description() ); |
|
228 | + $payment_method->set_description($pm_type_obj->default_description()); |
|
229 | 229 | //handles the goofy case where someone activates the invoice gateway which is also |
230 | 230 | $payment_method->set_type($pm_type_obj->system_name()); |
231 | - if( ! $payment_method->button_url() ){ |
|
232 | - $payment_method->set_button_url( $pm_type_obj->default_button_url() ); |
|
231 | + if ( ! $payment_method->button_url()) { |
|
232 | + $payment_method->set_button_url($pm_type_obj->default_button_url()); |
|
233 | 233 | } |
234 | 234 | $payment_method->save(); |
235 | - foreach($payment_method->get_all_usable_currencies() as $currency_obj){ |
|
235 | + foreach ($payment_method->get_all_usable_currencies() as $currency_obj) { |
|
236 | 236 | $payment_method->_add_relation_to($currency_obj, 'Currency'); |
237 | 237 | } |
238 | 238 | //now add setup its default extra meta properties |
239 | 239 | $extra_metas = $payment_method->type_obj()->settings_form()->extra_meta_inputs(); |
240 | - foreach( $extra_metas as $meta_name => $input ){ |
|
241 | - $payment_method->update_extra_meta($meta_name, $input->raw_value() ); |
|
240 | + foreach ($extra_metas as $meta_name => $input) { |
|
241 | + $payment_method->update_extra_meta($meta_name, $input->raw_value()); |
|
242 | 242 | } |
243 | 243 | } |
244 | 244 | |
245 | - }else{ |
|
245 | + } else { |
|
246 | 246 | $payment_method->set_active(); |
247 | 247 | $payment_method->save(); |
248 | 248 | } |
249 | - if( $payment_method->type() == 'Invoice' ){ |
|
250 | - $messages = EE_Registry::instance()->load_lib( 'messages' ); |
|
251 | - $messages->ensure_message_type_is_active( 'invoice', 'html' ); |
|
252 | - $messages->ensure_messenger_is_active( 'pdf' ); |
|
253 | - EE_Error::add_attention( sprintf( __( 'Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso' ), '<a href="' . admin_url( 'admin.php?page=espresso_messages') . '">', '</a>' ) ); |
|
249 | + if ($payment_method->type() == 'Invoice') { |
|
250 | + $messages = EE_Registry::instance()->load_lib('messages'); |
|
251 | + $messages->ensure_message_type_is_active('invoice', 'html'); |
|
252 | + $messages->ensure_messenger_is_active('pdf'); |
|
253 | + EE_Error::add_attention(sprintf(__('Note, when the invoice payment method is activated, the invoice message type, html messenger, and pdf messenger are activated as well for the %1$smessages system%2$s.', 'event_espresso'), '<a href="'.admin_url('admin.php?page=espresso_messages').'">', '</a>')); |
|
254 | 254 | } |
255 | 255 | return $payment_method; |
256 | 256 | } |
@@ -265,8 +265,8 @@ discard block |
||
265 | 265 | * |
266 | 266 | * @return int count of rows updated. |
267 | 267 | */ |
268 | - public function deactivate_payment_method( $payment_method_slug ) { |
|
269 | - $count_updated = EEM_Payment_Method::instance()->update(array('PMD_scope'=>array()),array(array('PMD_slug'=>$payment_method_slug))); |
|
268 | + public function deactivate_payment_method($payment_method_slug) { |
|
269 | + $count_updated = EEM_Payment_Method::instance()->update(array('PMD_scope'=>array()), array(array('PMD_slug'=>$payment_method_slug))); |
|
270 | 270 | return $count_updated; |
271 | 271 | } |
272 | 272 | |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @param array $caps capabilities being filtered |
281 | 281 | */ |
282 | - public function add_payment_method_caps( $caps ) { |
|
282 | + public function add_payment_method_caps($caps) { |
|
283 | 283 | /* add dynamic caps from payment methods |
284 | 284 | * at the time of writing, october 20 2014, these are the caps added: |
285 | 285 | * ee_payment_method_admin_only |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | * their related capability automatically added too, so long as they are |
295 | 295 | * registered properly using EE_Register_Payment_Method::register() |
296 | 296 | */ |
297 | - foreach( $this->payment_method_types() as $payment_method_type_obj ){ |
|
297 | + foreach ($this->payment_method_types() as $payment_method_type_obj) { |
|
298 | 298 | $caps['administrator'][] = $payment_method_type_obj->cap_name(); |
299 | 299 | } |
300 | 300 | return $caps; |
@@ -1,4 +1,6 @@ discard block |
||
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 | * |
4 | 6 | * Class EE_Payment_Method_Manager |
@@ -139,7 +141,7 @@ discard block |
||
139 | 141 | if(isset($this->_payment_method_types[$payment_method_name])){ |
140 | 142 | require_once($this->_payment_method_types[$payment_method_name]); |
141 | 143 | return true; |
142 | - }else{ |
|
144 | + } else{ |
|
143 | 145 | return false; |
144 | 146 | } |
145 | 147 | } |
@@ -159,7 +161,7 @@ discard block |
||
159 | 161 | $payment_methods[] = $this->payment_method_class_from_type($classname); |
160 | 162 | } |
161 | 163 | return $payment_methods; |
162 | - }else{ |
|
164 | + } else{ |
|
163 | 165 | return array_keys($this->_payment_method_types); |
164 | 166 | } |
165 | 167 | } |
@@ -242,7 +244,7 @@ discard block |
||
242 | 244 | } |
243 | 245 | } |
244 | 246 | |
245 | - }else{ |
|
247 | + } else{ |
|
246 | 248 | $payment_method->set_active(); |
247 | 249 | $payment_method->save(); |
248 | 250 | } |
@@ -2,10 +2,10 @@ |
||
2 | 2 | if (!defined('EVENT_ESPRESSO_VERSION')) |
3 | 3 | exit('No direct script access allowed'); |
4 | 4 | /** |
5 | - * payment_details_content |
|
6 | - * @var EE_Payment $payment |
|
7 | - * @var EE_Payment_Method $payment_method |
|
8 | - */ |
|
5 | + * payment_details_content |
|
6 | + * @var EE_Payment $payment |
|
7 | + * @var EE_Payment_Method $payment_method |
|
8 | + */ |
|
9 | 9 | $gateway_response = $payment->gateway_response(); |
10 | 10 | if ( ! empty( $gateway_response )) { |
11 | 11 | echo '<span class="error payment-problem">' . $gateway_response . '</span>'; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('No direct script access allowed'); |
4 | 4 | /** |
5 | 5 | * payment_details_content |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @var EE_Payment_Method $payment_method |
8 | 8 | */ |
9 | 9 | $gateway_response = $payment->gateway_response(); |
10 | -if ( ! empty( $gateway_response )) { |
|
11 | - echo '<span class="error payment-problem">' . $gateway_response . '</span>'; |
|
10 | +if ( ! empty($gateway_response)) { |
|
11 | + echo '<span class="error payment-problem">'.$gateway_response.'</span>'; |
|
12 | 12 | } |
13 | 13 | // End of file payment_details_content.template.php |
14 | 14 | \ No newline at end of file |
@@ -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 | * |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @param array $setup_args an array of key value pairs of info for registering the component |
35 | 35 | * @return void |
36 | 36 | */ |
37 | - public static function register( $ID = NULL, $setup_args = array() ); |
|
37 | + public static function register($ID = NULL, $setup_args = array()); |
|
38 | 38 | |
39 | 39 | |
40 | 40 | |
@@ -45,5 +45,5 @@ discard block |
||
45 | 45 | * @param string $ID a unique name or ID for the component being registered |
46 | 46 | * @return void |
47 | 47 | */ |
48 | - public static function deregister( $ID = NULL ); |
|
48 | + public static function deregister($ID = NULL); |
|
49 | 49 | } |
@@ -5,7 +5,9 @@ |
||
5 | 5 | * @subpackage plugin api, messages |
6 | 6 | * @since 4.5.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister a new message template pack variation for the EE messages system. |
@@ -18,30 +18,30 @@ discard block |
||
18 | 18 | class EE_Register_Admin_Page implements EEI_Plugin_API { |
19 | 19 | |
20 | 20 | |
21 | - /** |
|
22 | - * Holds registered EE_Admin_Pages |
|
23 | - * @var array |
|
24 | - */ |
|
25 | - protected static $_ee_admin_page_registry = array(); |
|
21 | + /** |
|
22 | + * Holds registered EE_Admin_Pages |
|
23 | + * @var array |
|
24 | + */ |
|
25 | + protected static $_ee_admin_page_registry = array(); |
|
26 | 26 | |
27 | 27 | |
28 | 28 | |
29 | 29 | |
30 | - /** |
|
31 | - * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system). |
|
32 | - * |
|
33 | - * @since 4.3.0 |
|
34 | - * |
|
30 | + /** |
|
31 | + * The purpose of this method is to provide an easy way for addons to register their admin pages (using the EE Admin Page loader system). |
|
32 | + * |
|
33 | + * @since 4.3.0 |
|
34 | + * |
|
35 | 35 | * @param string $page_basename This string represents the basename of the Admin Page init. |
36 | 36 | * The init file must use this basename in its name and class (i.e. {page_basename}_Admin_Page_Init.core.php). |
37 | - * @param array $config { An array of configuration options that will be used in different circumstances |
|
37 | + * @param array $config { An array of configuration options that will be used in different circumstances |
|
38 | 38 | * |
39 | 39 | * @type string $page_path This is the path where the registered admin pages reside ( used to setup autoloaders). |
40 | 40 | * |
41 | 41 | * } |
42 | - * @return void |
|
43 | - */ |
|
44 | - public static function register( $page_basename = NULL, $config = array() ) { |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public static function register( $page_basename = NULL, $config = array() ) { |
|
45 | 45 | |
46 | 46 | // check that an admin_page has not already been registered with that name |
47 | 47 | if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) { |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) { |
62 | - EE_Error::doing_it_wrong( |
|
62 | + EE_Error::doing_it_wrong( |
|
63 | 63 | __METHOD__, |
64 | 64 | sprintf( |
65 | 65 | __('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time. Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'), |
@@ -67,36 +67,36 @@ discard block |
||
67 | 67 | ), |
68 | 68 | '4.3' |
69 | 69 | ); |
70 | - } |
|
70 | + } |
|
71 | 71 | |
72 | - //add incoming stuff to our registry property |
|
73 | - self::$_ee_admin_page_registry[ $page_basename ] = array( |
|
74 | - 'page_path' => $config['page_path'], |
|
75 | - 'config' => $config |
|
76 | - ); |
|
72 | + //add incoming stuff to our registry property |
|
73 | + self::$_ee_admin_page_registry[ $page_basename ] = array( |
|
74 | + 'page_path' => $config['page_path'], |
|
75 | + 'config' => $config |
|
76 | + ); |
|
77 | 77 | |
78 | - //add filters |
|
78 | + //add filters |
|
79 | 79 | |
80 | - add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 ); |
|
81 | - add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 ); |
|
80 | + add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 ); |
|
81 | + add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 ); |
|
82 | 82 | |
83 | - } |
|
83 | + } |
|
84 | 84 | |
85 | 85 | |
86 | 86 | |
87 | - /** |
|
88 | - * This deregisters a EE_Admin page that is already registered. Note, this MUST be loaded after the |
|
89 | - * page being deregistered is loaded. |
|
90 | - * |
|
91 | - * @since 4.3.0 |
|
92 | - * |
|
93 | - * @param string $page_basename Use whatever string was used to register the admin page. |
|
94 | - * @return void |
|
95 | - */ |
|
96 | - public static function deregister( $page_basename = NULL ) { |
|
97 | - if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) |
|
98 | - unset( self::$_ee_admin_page_registry[$page_basename] ); |
|
99 | - } |
|
87 | + /** |
|
88 | + * This deregisters a EE_Admin page that is already registered. Note, this MUST be loaded after the |
|
89 | + * page being deregistered is loaded. |
|
90 | + * |
|
91 | + * @since 4.3.0 |
|
92 | + * |
|
93 | + * @param string $page_basename Use whatever string was used to register the admin page. |
|
94 | + * @return void |
|
95 | + */ |
|
96 | + public static function deregister( $page_basename = NULL ) { |
|
97 | + if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) |
|
98 | + unset( self::$_ee_admin_page_registry[$page_basename] ); |
|
99 | + } |
|
100 | 100 | |
101 | 101 | |
102 | 102 | |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | $installed_refs[ $basename ] = $args['page_path']; |
113 | 113 | } |
114 | 114 | } |
115 | - return $installed_refs; |
|
116 | - } |
|
115 | + return $installed_refs; |
|
116 | + } |
|
117 | 117 | |
118 | 118 | |
119 | 119 | |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | * @return mixed |
125 | 125 | */ |
126 | 126 | public static function set_page_path( $paths ) { |
127 | - foreach ( self::$_ee_admin_page_registry as $basename => $args ) { |
|
128 | - $paths[ $basename ] = $args['page_path']; |
|
129 | - } |
|
130 | - return $paths; |
|
131 | - } |
|
127 | + foreach ( self::$_ee_admin_page_registry as $basename => $args ) { |
|
128 | + $paths[ $basename ] = $args['page_path']; |
|
129 | + } |
|
130 | + return $paths; |
|
131 | + } |
|
132 | 132 | } |
@@ -41,28 +41,28 @@ discard block |
||
41 | 41 | * } |
42 | 42 | * @return void |
43 | 43 | */ |
44 | - public static function register( $page_basename = NULL, $config = array() ) { |
|
44 | + public static function register($page_basename = NULL, $config = array()) { |
|
45 | 45 | |
46 | 46 | // check that an admin_page has not already been registered with that name |
47 | - if ( isset(self::$_ee_admin_page_registry[ $page_basename ] )) { |
|
48 | - throw new EE_Error( sprintf( __( 'An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso' ), $page_basename )); |
|
47 | + if (isset(self::$_ee_admin_page_registry[$page_basename])) { |
|
48 | + throw new EE_Error(sprintf(__('An Admin Page with the name "%s" has already been registered and each Admin Page requires a unique name.', 'event_espresso'), $page_basename)); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | // required fields MUST be present, so let's make sure they are. |
52 | - if ( empty( $page_basename ) || ! is_array( $config ) || empty( $config['page_path'] )) { |
|
53 | - throw new EE_Error( __( 'In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso' )); |
|
52 | + if (empty($page_basename) || ! is_array($config) || empty($config['page_path'])) { |
|
53 | + throw new EE_Error(__('In order to register an Admin Page with EE_Register_Admin_Page::register(), you must include the "page_basename" (the class name of the page), and an array containing the following keys: "page_path" (the path where the registered admin pages reside)', 'event_espresso')); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | //make sure we don't register twice |
57 | - if( isset( self::$_ee_admin_page_registry[ $page_basename ] ) ){ |
|
57 | + if (isset(self::$_ee_admin_page_registry[$page_basename])) { |
|
58 | 58 | return; |
59 | 59 | } |
60 | 60 | |
61 | - if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_Admin__loaded' )) { |
|
61 | + if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_Admin__loaded')) { |
|
62 | 62 | EE_Error::doing_it_wrong( |
63 | 63 | __METHOD__, |
64 | 64 | sprintf( |
65 | - __('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time. Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.','event_espresso'), |
|
65 | + __('An attempt was made to register "%s" as an EE Admin page has failed because it was not registered at the correct time. Please use the "AHEE__EE_Admin__loaded" hook to register Admin pages.', 'event_espresso'), |
|
66 | 66 | $page_basename |
67 | 67 | ), |
68 | 68 | '4.3' |
@@ -70,15 +70,15 @@ discard block |
||
70 | 70 | } |
71 | 71 | |
72 | 72 | //add incoming stuff to our registry property |
73 | - self::$_ee_admin_page_registry[ $page_basename ] = array( |
|
73 | + self::$_ee_admin_page_registry[$page_basename] = array( |
|
74 | 74 | 'page_path' => $config['page_path'], |
75 | 75 | 'config' => $config |
76 | 76 | ); |
77 | 77 | |
78 | 78 | //add filters |
79 | 79 | |
80 | - add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array( 'EE_Register_Admin_Page', 'set_page_basename' ), 10 ); |
|
81 | - add_filter('FHEE__EEH_Autoloader__load_admin_core', array( 'EE_Register_Admin_Page', 'set_page_path' ), 10 ); |
|
80 | + add_filter('FHEE__EE_Admin_Page_Loader___get_installed_pages__installed_refs', array('EE_Register_Admin_Page', 'set_page_basename'), 10); |
|
81 | + add_filter('FHEE__EEH_Autoloader__load_admin_core', array('EE_Register_Admin_Page', 'set_page_path'), 10); |
|
82 | 82 | |
83 | 83 | } |
84 | 84 | |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @param string $page_basename Use whatever string was used to register the admin page. |
94 | 94 | * @return void |
95 | 95 | */ |
96 | - public static function deregister( $page_basename = NULL ) { |
|
97 | - if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) |
|
98 | - unset( self::$_ee_admin_page_registry[$page_basename] ); |
|
96 | + public static function deregister($page_basename = NULL) { |
|
97 | + if ( ! empty(self::$_ee_admin_page_registry[$page_basename])) |
|
98 | + unset(self::$_ee_admin_page_registry[$page_basename]); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -106,10 +106,10 @@ discard block |
||
106 | 106 | * @param $installed_refs |
107 | 107 | * @return mixed |
108 | 108 | */ |
109 | - public static function set_page_basename( $installed_refs ) { |
|
110 | - if ( ! empty( self::$_ee_admin_page_registry )) { |
|
111 | - foreach ( self::$_ee_admin_page_registry as $basename => $args ) { |
|
112 | - $installed_refs[ $basename ] = $args['page_path']; |
|
109 | + public static function set_page_basename($installed_refs) { |
|
110 | + if ( ! empty(self::$_ee_admin_page_registry)) { |
|
111 | + foreach (self::$_ee_admin_page_registry as $basename => $args) { |
|
112 | + $installed_refs[$basename] = $args['page_path']; |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | return $installed_refs; |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | * @param $paths |
124 | 124 | * @return mixed |
125 | 125 | */ |
126 | - public static function set_page_path( $paths ) { |
|
127 | - foreach ( self::$_ee_admin_page_registry as $basename => $args ) { |
|
128 | - $paths[ $basename ] = $args['page_path']; |
|
126 | + public static function set_page_path($paths) { |
|
127 | + foreach (self::$_ee_admin_page_registry as $basename => $args) { |
|
128 | + $paths[$basename] = $args['page_path']; |
|
129 | 129 | } |
130 | 130 | return $paths; |
131 | 131 | } |
@@ -5,7 +5,9 @@ discard block |
||
5 | 5 | * @subpackage helpers |
6 | 6 | * @since 4.3.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister an EE Admin Page. |
@@ -94,8 +96,9 @@ discard block |
||
94 | 96 | * @return void |
95 | 97 | */ |
96 | 98 | public static function deregister( $page_basename = NULL ) { |
97 | - if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) |
|
98 | - unset( self::$_ee_admin_page_registry[$page_basename] ); |
|
99 | + if ( !empty( self::$_ee_admin_page_registry[$page_basename] ) ) { |
|
100 | + unset( self::$_ee_admin_page_registry[$page_basename] ); |
|
101 | + } |
|
99 | 102 | } |
100 | 103 | |
101 | 104 |
@@ -66,33 +66,33 @@ discard block |
||
66 | 66 | * @throws EE_Error |
67 | 67 | * @return void |
68 | 68 | */ |
69 | - public static function register( $cpt_ref = NULL, $setup_args = array() ) { |
|
69 | + public static function register($cpt_ref = NULL, $setup_args = array()) { |
|
70 | 70 | |
71 | 71 | //check for requred params |
72 | - if ( empty( $cpt_ref ) ) { |
|
72 | + if (empty($cpt_ref)) { |
|
73 | 73 | throw new EE_Error( |
74 | - __('In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered', 'event_espresso' ) |
|
74 | + __('In order to register custom post types and custom taxonomies, you must include a value to reference what had been registered', 'event_espresso') |
|
75 | 75 | ); |
76 | 76 | } |
77 | 77 | |
78 | - if ( ! is_array( $setup_args ) || ( empty( $setup_args['cpts'] ) && empty( $setup_args['cts'] ) ) ) { |
|
78 | + if ( ! is_array($setup_args) || (empty($setup_args['cpts']) && empty($setup_args['cts']))) { |
|
79 | 79 | throw new EE_Error( |
80 | - __( 'In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.', 'event_espresso' ) |
|
80 | + __('In order to register custom post types or custom taxonomies, you must include an array containing either an array of custom post types to register (key "cpts"), an array of custom taxonomies ("cts") or both.', 'event_espresso') |
|
81 | 81 | ); |
82 | 82 | } |
83 | 83 | |
84 | 84 | //make sure we don't register twice |
85 | - if( isset( self::$_registry[ $cpt_ref ] ) ){ |
|
85 | + if (isset(self::$_registry[$cpt_ref])) { |
|
86 | 86 | return; |
87 | 87 | } |
88 | 88 | |
89 | 89 | //make sure cpt ref is unique. |
90 | - if ( isset( self::$_registry[$cpt_ref] ) ) { |
|
91 | - $cpt_ref = uniqid() . '_' . $cpt_ref; |
|
90 | + if (isset(self::$_registry[$cpt_ref])) { |
|
91 | + $cpt_ref = uniqid().'_'.$cpt_ref; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | //make sure this was called in the right place! |
95 | - if ( did_action( 'AHEE__EE_System__load_CPTs_and_session__complete' ) ) { |
|
95 | + if (did_action('AHEE__EE_System__load_CPTs_and_session__complete')) { |
|
96 | 96 | EE_Error::doing_it_wrong( |
97 | 97 | __METHOD__, |
98 | 98 | sprintf( |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | |
106 | 106 | //validate incoming args |
107 | 107 | $validated = array( |
108 | - 'cpts' => isset( $setup_args['cpts'] ) ? (array) $setup_args['cpts'] : array(), |
|
109 | - 'cts' => isset( $setup_args['cts'] ) ? (array) $setup_args['cts'] : array(), |
|
110 | - 'default_terms' => isset( $setup_args['default_terms'] ) ? (array) $setup_args['default_terms'] : array() |
|
108 | + 'cpts' => isset($setup_args['cpts']) ? (array) $setup_args['cpts'] : array(), |
|
109 | + 'cts' => isset($setup_args['cts']) ? (array) $setup_args['cts'] : array(), |
|
110 | + 'default_terms' => isset($setup_args['default_terms']) ? (array) $setup_args['default_terms'] : array() |
|
111 | 111 | ); |
112 | 112 | |
113 | 113 | self::$_registry[$cpt_ref] = $validated; |
114 | 114 | |
115 | 115 | //hook into to cpt system |
116 | - add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array( __CLASS__, 'filter_cpts' ), 5 ); |
|
117 | - add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array( __CLASS__, 'filter_cts' ), 5 ); |
|
118 | - add_action( 'AHEE__EE_Register_CPTs__construct_end', array( __CLASS__, 'default_terms'), 5 ); |
|
116 | + add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(__CLASS__, 'filter_cpts'), 5); |
|
117 | + add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(__CLASS__, 'filter_cts'), 5); |
|
118 | + add_action('AHEE__EE_Register_CPTs__construct_end', array(__CLASS__, 'default_terms'), 5); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | |
@@ -129,9 +129,9 @@ discard block |
||
129 | 129 | * |
130 | 130 | * @return array new array of cpts and their registration information |
131 | 131 | */ |
132 | - public static function filter_cpts( $cpts ) { |
|
133 | - foreach( self::$_registry as $registries ) { |
|
134 | - foreach ( $registries['cpts'] as $cpt_name => $cpt_settings ) { |
|
132 | + public static function filter_cpts($cpts) { |
|
133 | + foreach (self::$_registry as $registries) { |
|
134 | + foreach ($registries['cpts'] as $cpt_name => $cpt_settings) { |
|
135 | 135 | $cpts[$cpt_name] = $cpt_settings; |
136 | 136 | } |
137 | 137 | } |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | * |
149 | 149 | * @return array new array of cts and their registration information. |
150 | 150 | */ |
151 | - public static function filter_cts( $cts ) { |
|
152 | - foreach( self::$_registry as $registries ) { |
|
153 | - foreach( $registries['cts'] as $ct_name => $ct_settings ) { |
|
151 | + public static function filter_cts($cts) { |
|
152 | + foreach (self::$_registry as $registries) { |
|
153 | + foreach ($registries['cts'] as $ct_name => $ct_settings) { |
|
154 | 154 | $cts[$ct_name] = $ct_settings; |
155 | 155 | } |
156 | 156 | } |
@@ -167,11 +167,11 @@ discard block |
||
167 | 167 | * |
168 | 168 | * @return void |
169 | 169 | */ |
170 | - public static function default_terms( EE_Register_CPTs $cpt_class ) { |
|
171 | - foreach( self::$_registry as $registries ) { |
|
172 | - foreach( $registries['default_terms'] as $taxonomy => $terms ) { |
|
173 | - foreach ( $terms as $term => $cpts ) { |
|
174 | - $cpt_class->set_default_term( $taxonomy, $term, $cpts ); |
|
170 | + public static function default_terms(EE_Register_CPTs $cpt_class) { |
|
171 | + foreach (self::$_registry as $registries) { |
|
172 | + foreach ($registries['default_terms'] as $taxonomy => $terms) { |
|
173 | + foreach ($terms as $term => $cpts) { |
|
174 | + $cpt_class->set_default_term($taxonomy, $term, $cpts); |
|
175 | 175 | } |
176 | 176 | } |
177 | 177 | } |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | * |
189 | 189 | * @return void |
190 | 190 | */ |
191 | - public static function deregister( $cpt_ref = null ) { |
|
192 | - if ( !empty( self::$_registry[$cpt_ref] ) ) { |
|
193 | - unset( self::$_registry[$cpt_ref] ); |
|
191 | + public static function deregister($cpt_ref = null) { |
|
192 | + if ( ! empty(self::$_registry[$cpt_ref])) { |
|
193 | + unset(self::$_registry[$cpt_ref]); |
|
194 | 194 | } |
195 | 195 | } |
196 | 196 | } //end class EE_Register_CPT |
@@ -5,7 +5,9 @@ |
||
5 | 5 | * @subpackage plugin api, messages |
6 | 6 | * @since 4.5.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister a new message template pack variation for the EE messages system. |
@@ -47,33 +47,33 @@ discard block |
||
47 | 47 | * @throws EE_Error |
48 | 48 | * @return void |
49 | 49 | */ |
50 | - public static function register( $cap_reference = NULL, $setup_args = array() ) { |
|
50 | + public static function register($cap_reference = NULL, $setup_args = array()) { |
|
51 | 51 | //required fields MUST be present, so let's make sure they are. |
52 | - if ( ! isset( $cap_reference ) || ! is_array( $setup_args ) || empty( $setup_args['capabilities'] ) ) { |
|
52 | + if ( ! isset($cap_reference) || ! is_array($setup_args) || empty($setup_args['capabilities'])) { |
|
53 | 53 | throw new EE_Error( |
54 | - __( 'In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso' ) |
|
54 | + __('In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso') |
|
55 | 55 | ); |
56 | 56 | } |
57 | 57 | //make sure we don't register twice |
58 | - if( isset( self::$_registry[ $cap_reference ] ) ){ |
|
58 | + if (isset(self::$_registry[$cap_reference])) { |
|
59 | 59 | return; |
60 | 60 | } |
61 | 61 | //make sure this is not registered too late or too early. |
62 | - if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' ) ) { |
|
63 | - EE_Error::doing_it_wrong( __METHOD__, sprintf( __('%s has been registered too late. Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference ), '4.5.0' ); |
|
62 | + if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) { |
|
63 | + EE_Error::doing_it_wrong(__METHOD__, sprintf(__('%s has been registered too late. Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference), '4.5.0'); |
|
64 | 64 | } |
65 | 65 | //some preliminary sanitization and setting to the $_registry property |
66 | 66 | self::$_registry[$cap_reference] = array( |
67 | - 'caps' => isset( $setup_args['capabilities'] ) && is_array( $setup_args['capabilities'] ) ? $setup_args['capabilities'] : array(), |
|
68 | - 'cap_maps' => isset( $setup_args['capability_maps'] ) ? $setup_args['capability_maps'] : array() |
|
67 | + 'caps' => isset($setup_args['capabilities']) && is_array($setup_args['capabilities']) ? $setup_args['capabilities'] : array(), |
|
68 | + 'cap_maps' => isset($setup_args['capability_maps']) ? $setup_args['capability_maps'] : array() |
|
69 | 69 | ); |
70 | 70 | //set initial caps (note that EE_Capabilities takes care of making sure that the caps get added only once) |
71 | - add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( 'EE_Register_Capabilities', 'register_capabilities' ), 10 ); |
|
71 | + add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array('EE_Register_Capabilities', 'register_capabilities'), 10); |
|
72 | 72 | //add filter for cap maps |
73 | - add_filter( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', array( 'EE_Register_Capabilities', 'register_cap_maps' ), 10 ); |
|
73 | + add_filter('FHEE__EE_Capabilities___set_meta_caps__meta_caps', array('EE_Register_Capabilities', 'register_cap_maps'), 10); |
|
74 | 74 | //init_role_caps to register new capabilities |
75 | - if ( is_admin() ) { |
|
76 | - EE_Registry::instance()->load_core( 'Capabilities' ); |
|
75 | + if (is_admin()) { |
|
76 | + EE_Registry::instance()->load_core('Capabilities'); |
|
77 | 77 | EE_Capabilities::instance()->init_caps(); |
78 | 78 | } |
79 | 79 | } |
@@ -88,9 +88,9 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return array merged in new caps. |
90 | 90 | */ |
91 | - public static function register_capabilities( $incoming_caps ) { |
|
92 | - foreach ( self::$_registry as $ref => $caps_and_cap_map ) { |
|
93 | - $incoming_caps = array_merge_recursive( $incoming_caps, $caps_and_cap_map[ 'caps' ] ); |
|
91 | + public static function register_capabilities($incoming_caps) { |
|
92 | + foreach (self::$_registry as $ref => $caps_and_cap_map) { |
|
93 | + $incoming_caps = array_merge_recursive($incoming_caps, $caps_and_cap_map['caps']); |
|
94 | 94 | } |
95 | 95 | return $incoming_caps; |
96 | 96 | } |
@@ -105,13 +105,13 @@ discard block |
||
105 | 105 | * @return EE_Meta_Capability_Map[] |
106 | 106 | * @throws EE_Error |
107 | 107 | */ |
108 | - public static function register_cap_maps( $cap_maps ) { |
|
108 | + public static function register_cap_maps($cap_maps) { |
|
109 | 109 | //loop through and instantiate cap maps. |
110 | - foreach ( self::$_registry as $cap_reference => $setup ) { |
|
111 | - if ( ! isset( $setup['cap_maps'] ) ) { |
|
110 | + foreach (self::$_registry as $cap_reference => $setup) { |
|
111 | + if ( ! isset($setup['cap_maps'])) { |
|
112 | 112 | continue; |
113 | 113 | } |
114 | - foreach ( $setup['cap_maps'] as $cap_class => $args ) { |
|
114 | + foreach ($setup['cap_maps'] as $cap_class => $args) { |
|
115 | 115 | |
116 | 116 | /** |
117 | 117 | * account for cases where capability maps may be indexed |
@@ -138,19 +138,19 @@ discard block |
||
138 | 138 | * ... |
139 | 139 | * ) |
140 | 140 | */ |
141 | - if ( is_numeric( $cap_class ) ) { |
|
142 | - $cap_class = key( $args ); |
|
141 | + if (is_numeric($cap_class)) { |
|
142 | + $cap_class = key($args); |
|
143 | 143 | $args = $args[$cap_class]; |
144 | 144 | } |
145 | 145 | |
146 | - if ( ! class_exists( $cap_class ) ) { |
|
147 | - throw new EE_Error( sprintf( __( 'An addon (%s) has tried to register a capability map improperly. Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso' ), $cap_reference ) ); |
|
146 | + if ( ! class_exists($cap_class)) { |
|
147 | + throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly. Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso'), $cap_reference)); |
|
148 | 148 | } |
149 | 149 | |
150 | - if ( count( $args ) !== 2 ) { |
|
151 | - throw new EE_Error( sprintf( __('An addon (%s) has tried to register a capability map improperly. Capability map arrays must be indexed by capability map classname, and an array for the class arguments. The array should have two values the first being a string and the second an array.', 'event_espresso' ), $cap_reference ) ); |
|
150 | + if (count($args) !== 2) { |
|
151 | + throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly. Capability map arrays must be indexed by capability map classname, and an array for the class arguments. The array should have two values the first being a string and the second an array.', 'event_espresso'), $cap_reference)); |
|
152 | 152 | } |
153 | - $cap_maps[] = new $cap_class( $args[0], $args[1] ); |
|
153 | + $cap_maps[] = new $cap_class($args[0], $args[1]); |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | return $cap_maps; |
@@ -159,9 +159,9 @@ discard block |
||
159 | 159 | |
160 | 160 | |
161 | 161 | |
162 | - public static function deregister( $cap_reference = NULL ) { |
|
163 | - if ( !empty( self::$_registry[$cap_reference] ) ) { |
|
164 | - unset( self::$_registry[ $cap_reference ] ); |
|
162 | + public static function deregister($cap_reference = NULL) { |
|
163 | + if ( ! empty(self::$_registry[$cap_reference])) { |
|
164 | + unset(self::$_registry[$cap_reference]); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | //re init caps to grab the changes due to removed caps. |
@@ -5,7 +5,9 @@ |
||
5 | 5 | * @subpackage plugin api, messages |
6 | 6 | * @since 4.5.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister a new message template pack variation for the EE messages system. |
@@ -5,7 +5,9 @@ discard block |
||
5 | 5 | * @subpackage helpers |
6 | 6 | * @since 4.3.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister a new config with the EE_Registry::instance->CFG property. |
@@ -111,7 +113,8 @@ discard block |
||
111 | 113 | * @param mixed $config_class_name |
112 | 114 | */ |
113 | 115 | public static function deregister( $config_class_name = NULL ) { |
114 | - if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) |
|
115 | - unset( self::$_ee_config_registry[ $config_class_name ] ); |
|
116 | + if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) { |
|
117 | + unset( self::$_ee_config_registry[ $config_class_name ] ); |
|
118 | + } |
|
116 | 119 | } |
117 | 120 | } |
@@ -42,24 +42,24 @@ discard block |
||
42 | 42 | * } |
43 | 43 | * @return void |
44 | 44 | */ |
45 | - public static function register( $config_class = NULL, $setup_args = array() ) { |
|
45 | + public static function register($config_class = NULL, $setup_args = array()) { |
|
46 | 46 | |
47 | - $setup_args['config_name'] = isset( $setup_args['config_name'] ) && ! empty( $setup_args['config_name'] ) ? $setup_args['config_name'] : $config_class; |
|
48 | - $setup_args['config_section'] = isset( $setup_args['config_section'] ) && ! empty( $setup_args['config_section'] ) ? $setup_args['config_section'] : 'addons'; |
|
47 | + $setup_args['config_name'] = isset($setup_args['config_name']) && ! empty($setup_args['config_name']) ? $setup_args['config_name'] : $config_class; |
|
48 | + $setup_args['config_section'] = isset($setup_args['config_section']) && ! empty($setup_args['config_section']) ? $setup_args['config_section'] : 'addons'; |
|
49 | 49 | |
50 | 50 | //required fields MUST be present, so let's make sure they are. |
51 | - if ( empty( $config_class ) || ! is_array( $setup_args ) || empty( $setup_args['config_name'] )) { |
|
52 | - throw new EE_Error( __( 'In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso' )); |
|
51 | + if (empty($config_class) || ! is_array($setup_args) || empty($setup_args['config_name'])) { |
|
52 | + throw new EE_Error(__('In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso')); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | //make sure we don't register twice |
56 | - if( isset( self::$_ee_config_registry[ $config_class ] ) ){ |
|
56 | + if (isset(self::$_ee_config_registry[$config_class])) { |
|
57 | 57 | return; |
58 | 58 | } |
59 | 59 | |
60 | 60 | |
61 | 61 | //first find out if this happened too late. |
62 | - if ( did_action( 'AHEE__EE_System__load_core_configuration__begin' ) ) { |
|
62 | + if (did_action('AHEE__EE_System__load_core_configuration__begin')) { |
|
63 | 63 | EE_Error::doing_it_wrong( |
64 | 64 | __METHOD__, |
65 | 65 | sprintf( |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | ); |
71 | 71 | } |
72 | 72 | //add incoming stuff to our registry property |
73 | - self::$_ee_config_registry[ $config_class ] = array( |
|
73 | + self::$_ee_config_registry[$config_class] = array( |
|
74 | 74 | 'section' => $setup_args['config_section'], |
75 | 75 | 'name' => $setup_args['config_name'] |
76 | 76 | ); |
77 | 77 | |
78 | - add_filter( 'AHEE__EE_Config___load_core_config__end', array( 'EE_Register_Config', 'set_config' ), 15 ); |
|
78 | + add_filter('AHEE__EE_Config___load_core_config__end', array('EE_Register_Config', 'set_config'), 15); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | |
@@ -89,18 +89,18 @@ discard block |
||
89 | 89 | * @param \EE_Config $EE_Config |
90 | 90 | * @return \StdClass |
91 | 91 | */ |
92 | - public static function set_config( EE_Config $EE_Config ) { |
|
93 | - foreach ( self::$_ee_config_registry as $config_class => $settings ) { |
|
92 | + public static function set_config(EE_Config $EE_Config) { |
|
93 | + foreach (self::$_ee_config_registry as $config_class => $settings) { |
|
94 | 94 | //first some validation of our incoming class_name. We'll throw an error early if its' not registered correctly |
95 | - if ( ! class_exists( $config_class )) { |
|
95 | + if ( ! class_exists($config_class)) { |
|
96 | 96 | throw new EE_Error( |
97 | 97 | sprintf( |
98 | - __( 'The "%s" config class can not be registered with EE_Config because it does not exist. Verify that an autoloader has been set for this class', 'event_espresso' ), |
|
98 | + __('The "%s" config class can not be registered with EE_Config because it does not exist. Verify that an autoloader has been set for this class', 'event_espresso'), |
|
99 | 99 | $config_class |
100 | 100 | ) |
101 | 101 | ); |
102 | 102 | } |
103 | - $EE_Config->get_config( $settings['section'], $settings['name'], $config_class ); |
|
103 | + $EE_Config->get_config($settings['section'], $settings['name'], $config_class); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | /** |
111 | 111 | * @param mixed $config_class_name |
112 | 112 | */ |
113 | - public static function deregister( $config_class_name = NULL ) { |
|
114 | - if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) |
|
115 | - unset( self::$_ee_config_registry[ $config_class_name ] ); |
|
113 | + public static function deregister($config_class_name = NULL) { |
|
114 | + if ( ! empty(self::$_ee_config_registry[$config_class_name])) |
|
115 | + unset(self::$_ee_config_registry[$config_class_name]); |
|
116 | 116 | } |
117 | 117 | } |
@@ -113,6 +113,6 @@ |
||
113 | 113 | */ |
114 | 114 | public static function deregister( $config_class_name = NULL ) { |
115 | 115 | if ( ! empty( self::$_ee_config_registry[ $config_class_name ] )) |
116 | - unset( self::$_ee_config_registry[ $config_class_name ] ); |
|
116 | + unset( self::$_ee_config_registry[ $config_class_name ] ); |
|
117 | 117 | } |
118 | 118 | } |