@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | |
52 | 52 | /** |
53 | - * @param $this_model_name |
|
53 | + * @param string $this_model_name |
|
54 | 54 | * @param $other_model_name |
55 | 55 | * @throws EE_Error |
56 | 56 | */ |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Gets the model where this relation is defined. |
70 | - * @return EEM_Base |
|
70 | + * @return boolean |
|
71 | 71 | */ |
72 | 72 | function get_this_model(){ |
73 | 73 | return $this->_get_model($this->_this_model_name); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | /** |
79 | 79 | * Gets the model which this relation establishes the relation TO (ie, |
80 | 80 | * this relation object was defined on get_this_model(), get_other_model() is the other one) |
81 | - * @return EEM_Base |
|
81 | + * @return boolean |
|
82 | 82 | */ |
83 | 83 | function get_other_model(){ |
84 | 84 | return $this->_get_model($this->_other_model_name); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | /** |
90 | 90 | * Internally used by get_this_model() and get_other_model() |
91 | 91 | * @param string $model_name like Event, Question_Group, etc. omit the EEM_ |
92 | - * @return EEM_Base |
|
92 | + * @return boolean |
|
93 | 93 | */ |
94 | 94 | protected function _get_model($model_name){ |
95 | 95 | $modelInstance = EE_Registry::instance()->load_model( $model_name ); |
@@ -112,9 +112,9 @@ discard block |
||
112 | 112 | |
113 | 113 | /** |
114 | 114 | * @param $other_table |
115 | - * @param $other_table_alias |
|
115 | + * @param string $other_table_alias |
|
116 | 116 | * @param $other_table_column |
117 | - * @param $this_table_alias |
|
117 | + * @param string $this_table_alias |
|
118 | 118 | * @param $this_table_join_column |
119 | 119 | * @param string $extra_join_sql |
120 | 120 | * @return string |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * parameters are specified, then all related model objects will be deleted. |
169 | 169 | * Note: If the related model is extends EEM_Soft_Delete_Base, then the related |
170 | 170 | * model objects will only be soft-deleted. |
171 | - * @param EE_Base_Class|int|string $model_object_or_id |
|
171 | + * @param EE_Base_Class $model_object_or_id |
|
172 | 172 | * @param array $query_params |
173 | 173 | * @return int of how many related models got deleted |
174 | 174 | */ |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | * parameters are specified, then all related model objects will be deleted. |
197 | 197 | * Note: If the related model is extends EEM_Soft_Delete_Base, then the related |
198 | 198 | * model objects will only be soft-deleted. |
199 | - * @param EE_Base_Class|int|string $model_object_or_id |
|
199 | + * @param EE_Base_Class $model_object_or_id |
|
200 | 200 | * @param array $query_params |
201 | 201 | * @return int of how many related models got deleted |
202 | 202 | */ |
@@ -104,8 +104,9 @@ discard block |
||
104 | 104 | * @param string $timezone timezone to set. |
105 | 105 | */ |
106 | 106 | public function set_timezone( $timezone ) { |
107 | - if($timezone !== NULL) |
|
108 | - $this->_timezone = $timezone; |
|
107 | + if($timezone !== NULL) { |
|
108 | + $this->_timezone = $timezone; |
|
109 | + } |
|
109 | 110 | } |
110 | 111 | |
111 | 112 | |
@@ -213,12 +214,12 @@ discard block |
||
213 | 214 | $deleted_count++; |
214 | 215 | if( ! $delete_is_blocked ){ |
215 | 216 | $related_model_object->delete_permanently(); |
216 | - }else{ |
|
217 | + } else{ |
|
217 | 218 | //delete is blocked |
218 | 219 | //brent and darren, in this case, wanted to just soft delete it then |
219 | 220 | $related_model_object->delete(); |
220 | 221 | } |
221 | - }else{ |
|
222 | + } else{ |
|
222 | 223 | //its not a soft-deletable thing anyways. do the normal logic. |
223 | 224 | if( ! $delete_is_blocked ){ |
224 | 225 | $this->remove_relation_to($model_object_or_id, $related_model_object); |
@@ -241,7 +242,7 @@ discard block |
||
241 | 242 | protected function _get_model_object_id($model_object_or_id) { |
242 | 243 | if($model_object_or_id instanceof EE_Base_Class){ |
243 | 244 | $model_object_id = $model_object_or_id->ID(); |
244 | - }else{ |
|
245 | + } else{ |
|
245 | 246 | $model_object_id = $model_object_or_id; |
246 | 247 | } |
247 | 248 | if( ! $model_object_id){ |
@@ -316,7 +317,7 @@ discard block |
||
316 | 317 | public function get_deletion_error_message(){ |
317 | 318 | if($this->_blocking_delete_error_message){ |
318 | 319 | return $this->_blocking_delete_error_message; |
319 | - }else{ |
|
320 | + } else{ |
|
320 | 321 | // return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2)); |
321 | 322 | return sprintf( |
322 | 323 | __( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"), |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * Once those two models are setup correctly, and the relation object has the names of each, it can |
8 | 8 | * magically figure out what tables must be joined on what fields during querying. |
9 | 9 | */ |
10 | -abstract class EE_Model_Relation_Base{ |
|
10 | +abstract class EE_Model_Relation_Base { |
|
11 | 11 | /** |
12 | 12 | * The model name of which this relation is a component (ie, the model that called new EE_Model_Relation_Base) |
13 | 13 | * @var string eg Event, Question_Group, Registration |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | * @param boolean $block_deletes if there are related models across this relation, block (prevent and add an error) the deletion of this model |
43 | 43 | * @param string $blocking_delete_error_message a customized error message on blocking deletes instead of the default |
44 | 44 | */ |
45 | - function __construct($block_deletes, $blocking_delete_error_message){ |
|
45 | + function __construct($block_deletes, $blocking_delete_error_message) { |
|
46 | 46 | $this->_blocking_delete = $block_deletes; |
47 | - $this->_blocking_delete_error_message=$blocking_delete_error_message; |
|
47 | + $this->_blocking_delete_error_message = $blocking_delete_error_message; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | |
@@ -54,12 +54,12 @@ discard block |
||
54 | 54 | * @param $other_model_name |
55 | 55 | * @throws EE_Error |
56 | 56 | */ |
57 | - function _construct_finalize_set_models($this_model_name, $other_model_name){ |
|
57 | + function _construct_finalize_set_models($this_model_name, $other_model_name) { |
|
58 | 58 | $this->_this_model_name = $this_model_name; |
59 | 59 | $this->_other_model_name = $other_model_name; |
60 | - if(is_string($this->_blocking_delete)){ |
|
60 | + if (is_string($this->_blocking_delete)) { |
|
61 | 61 | throw new EE_Error(sprintf(__("When instantiating the relation of type %s from %s to %s, the \$block_deletes argument should be a boolean, not a string (%s)", "event_espresso"), |
62 | - get_class($this),$this_model_name,$other_model_name,$this->_blocking_delete)); |
|
62 | + get_class($this), $this_model_name, $other_model_name, $this->_blocking_delete)); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * Gets the model where this relation is defined. |
70 | 70 | * @return EEM_Base |
71 | 71 | */ |
72 | - function get_this_model(){ |
|
72 | + function get_this_model() { |
|
73 | 73 | return $this->_get_model($this->_this_model_name); |
74 | 74 | } |
75 | 75 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * this relation object was defined on get_this_model(), get_other_model() is the other one) |
81 | 81 | * @return EEM_Base |
82 | 82 | */ |
83 | - function get_other_model(){ |
|
83 | + function get_other_model() { |
|
84 | 84 | return $this->_get_model($this->_other_model_name); |
85 | 85 | } |
86 | 86 | |
@@ -91,9 +91,9 @@ discard block |
||
91 | 91 | * @param string $model_name like Event, Question_Group, etc. omit the EEM_ |
92 | 92 | * @return EEM_Base |
93 | 93 | */ |
94 | - protected function _get_model($model_name){ |
|
95 | - $modelInstance = EE_Registry::instance()->load_model( $model_name ); |
|
96 | - $modelInstance->set_timezone( $this->_timezone ); |
|
94 | + protected function _get_model($model_name) { |
|
95 | + $modelInstance = EE_Registry::instance()->load_model($model_name); |
|
96 | + $modelInstance->set_timezone($this->_timezone); |
|
97 | 97 | return $modelInstance; |
98 | 98 | } |
99 | 99 | |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | * entirely possible that relations may be called from a model and we need to make sure those relations have their timezone set correctly. |
104 | 104 | * @param string $timezone timezone to set. |
105 | 105 | */ |
106 | - public function set_timezone( $timezone ) { |
|
107 | - if($timezone !== NULL) |
|
106 | + public function set_timezone($timezone) { |
|
107 | + if ($timezone !== NULL) |
|
108 | 108 | $this->_timezone = $timezone; |
109 | 109 | } |
110 | 110 | |
@@ -119,8 +119,8 @@ discard block |
||
119 | 119 | * @param string $extra_join_sql |
120 | 120 | * @return string |
121 | 121 | */ |
122 | - protected function _left_join($other_table,$other_table_alias,$other_table_column,$this_table_alias,$this_table_join_column, $extra_join_sql = ''){ |
|
123 | - return " LEFT JOIN ".$other_table." AS ".$other_table_alias. " ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column. ($extra_join_sql ? " AND $extra_join_sql" : ''); |
|
122 | + protected function _left_join($other_table, $other_table_alias, $other_table_column, $this_table_alias, $this_table_join_column, $extra_join_sql = '') { |
|
123 | + return " LEFT JOIN ".$other_table." AS ".$other_table_alias." ON ".$other_table_alias.".".$other_table_column."=".$this_table_alias.".".$this_table_join_column.($extra_join_sql ? " AND $extra_join_sql" : ''); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | * @param boolean $values_already_prepared_by_model_object |
137 | 137 | * @return EE_Base_Class[] |
138 | 138 | */ |
139 | - public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false){ |
|
139 | + public function get_all_related($model_object_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) { |
|
140 | 140 | $query_params = $this->_disable_default_where_conditions_on_query_param($query_params); |
141 | 141 | $query_param_where_this_model_pk = $this->get_this_model()->get_this_model_name().".".$this->get_this_model()->get_primary_key_field()->get_name(); |
142 | - $model_object_id = $this->_get_model_object_id( $model_object_or_id ); |
|
142 | + $model_object_id = $this->_get_model_object_id($model_object_or_id); |
|
143 | 143 | $query_params[0][$query_param_where_this_model_pk] = $model_object_id; |
144 | 144 | return $this->get_other_model()->get_all($query_params); |
145 | 145 | } |
@@ -151,9 +151,9 @@ discard block |
||
151 | 151 | * @param string $query_params |
152 | 152 | * @return string |
153 | 153 | */ |
154 | - protected function _disable_default_where_conditions_on_query_param($query_params){ |
|
155 | - if( ! isset($query_params['default_where_conditions'])){ |
|
156 | - $query_params['default_where_conditions']='none'; |
|
154 | + protected function _disable_default_where_conditions_on_query_param($query_params) { |
|
155 | + if ( ! isset($query_params['default_where_conditions'])) { |
|
156 | + $query_params['default_where_conditions'] = 'none'; |
|
157 | 157 | } |
158 | 158 | return $query_params; |
159 | 159 | } |
@@ -169,15 +169,15 @@ discard block |
||
169 | 169 | * @param array $query_params |
170 | 170 | * @return int of how many related models got deleted |
171 | 171 | */ |
172 | - public function delete_all_related($model_object_or_id,$query_params = array()){ |
|
172 | + public function delete_all_related($model_object_or_id, $query_params = array()) { |
|
173 | 173 | //for each thing we would delete, |
174 | - $related_model_objects = $this->get_all_related($model_object_or_id,$query_params); |
|
174 | + $related_model_objects = $this->get_all_related($model_object_or_id, $query_params); |
|
175 | 175 | //determine if it's blocked by anything else before it can be deletedx |
176 | 176 | $deleted_count = 0; |
177 | - foreach($related_model_objects as $related_model_object){ |
|
177 | + foreach ($related_model_objects as $related_model_object) { |
|
178 | 178 | $delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id); |
179 | 179 | /* @var $model_object_or_id EE_Base_Class */ |
180 | - if( ! $delete_is_blocked ){ |
|
180 | + if ( ! $delete_is_blocked) { |
|
181 | 181 | $this->remove_relation_to($model_object_or_id, $related_model_object); |
182 | 182 | $related_model_object->delete(); |
183 | 183 | $deleted_count++; |
@@ -197,27 +197,27 @@ discard block |
||
197 | 197 | * @param array $query_params |
198 | 198 | * @return int of how many related models got deleted |
199 | 199 | */ |
200 | - public function delete_related_permanently($model_object_or_id,$query_params = array()){ |
|
200 | + public function delete_related_permanently($model_object_or_id, $query_params = array()) { |
|
201 | 201 | //for each thing we would delete, |
202 | - $related_model_objects = $this->get_all_related($model_object_or_id,$query_params); |
|
202 | + $related_model_objects = $this->get_all_related($model_object_or_id, $query_params); |
|
203 | 203 | //determine if it's blocked by anything else before it can be deletedx |
204 | 204 | $deleted_count = 0; |
205 | - foreach($related_model_objects as $related_model_object){ |
|
205 | + foreach ($related_model_objects as $related_model_object) { |
|
206 | 206 | $delete_is_blocked = $this->get_other_model()->delete_is_blocked_by_related_models($related_model_object, $model_object_or_id); |
207 | 207 | /* @var $model_object_or_id EE_Base_Class */ |
208 | - if( $related_model_object instanceof EE_Soft_Delete_Base_Class ){ |
|
208 | + if ($related_model_object instanceof EE_Soft_Delete_Base_Class) { |
|
209 | 209 | $this->remove_relation_to($model_object_or_id, $related_model_object); |
210 | 210 | $deleted_count++; |
211 | - if( ! $delete_is_blocked ){ |
|
211 | + if ( ! $delete_is_blocked) { |
|
212 | 212 | $related_model_object->delete_permanently(); |
213 | - }else{ |
|
213 | + } else { |
|
214 | 214 | //delete is blocked |
215 | 215 | //brent and darren, in this case, wanted to just soft delete it then |
216 | 216 | $related_model_object->delete(); |
217 | 217 | } |
218 | - }else{ |
|
218 | + } else { |
|
219 | 219 | //its not a soft-deletable thing anyways. do the normal logic. |
220 | - if( ! $delete_is_blocked ){ |
|
220 | + if ( ! $delete_is_blocked) { |
|
221 | 221 | $this->remove_relation_to($model_object_or_id, $related_model_object); |
222 | 222 | $related_model_object->delete(); |
223 | 223 | $deleted_count++; |
@@ -236,13 +236,13 @@ discard block |
||
236 | 236 | * @return int |
237 | 237 | */ |
238 | 238 | protected function _get_model_object_id($model_object_or_id) { |
239 | - if($model_object_or_id instanceof EE_Base_Class){ |
|
239 | + if ($model_object_or_id instanceof EE_Base_Class) { |
|
240 | 240 | $model_object_id = $model_object_or_id->ID(); |
241 | - }else{ |
|
241 | + } else { |
|
242 | 242 | $model_object_id = $model_object_or_id; |
243 | 243 | } |
244 | - if( ! $model_object_id){ |
|
245 | - throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"),$this->get_other_model()->get_this_model_name(),$this->get_this_model()->get_this_model_name())); |
|
244 | + if ( ! $model_object_id) { |
|
245 | + throw new EE_Error(sprintf(__("Sorry, we cant get the related %s model objects to %s model object before it has an ID. You can solve that by just saving it before trying to get its related model objects", "event_espresso"), $this->get_other_model()->get_this_model_name(), $this->get_this_model()->get_this_model_name())); |
|
246 | 246 | } |
247 | 247 | return $model_object_id; |
248 | 248 | } |
@@ -285,10 +285,10 @@ discard block |
||
285 | 285 | * @param array $where_query_param like EEM_Base::get_all's $query_params[0] (where conditions) |
286 | 286 | * @return EE_Base_Class[] |
287 | 287 | */ |
288 | - public function remove_relations($this_obj_or_id,$where_query_param = array()){ |
|
289 | - $related_things = $this->get_all_related($this_obj_or_id,array($where_query_param)); |
|
288 | + public function remove_relations($this_obj_or_id, $where_query_param = array()) { |
|
289 | + $related_things = $this->get_all_related($this_obj_or_id, array($where_query_param)); |
|
290 | 290 | $objs_removed = array(); |
291 | - foreach($related_things as $related_thing){ |
|
291 | + foreach ($related_things as $related_thing) { |
|
292 | 292 | $objs_removed[] = $this->remove_relation_to($this_obj_or_id, $related_thing); |
293 | 293 | } |
294 | 294 | return $objs_removed; |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * related objects exist, returns false. |
302 | 302 | * @return boolean |
303 | 303 | */ |
304 | - public function block_delete_if_related_models_exist(){ |
|
304 | + public function block_delete_if_related_models_exist() { |
|
305 | 305 | return $this->_blocking_delete; |
306 | 306 | } |
307 | 307 | |
@@ -310,13 +310,13 @@ discard block |
||
310 | 310 | * Gets the error message to show |
311 | 311 | * @return string |
312 | 312 | */ |
313 | - public function get_deletion_error_message(){ |
|
314 | - if($this->_blocking_delete_error_message){ |
|
313 | + public function get_deletion_error_message() { |
|
314 | + if ($this->_blocking_delete_error_message) { |
|
315 | 315 | return $this->_blocking_delete_error_message; |
316 | - }else{ |
|
316 | + } else { |
|
317 | 317 | // return sprintf(__('Cannot delete %1$s when there are related %2$s', "event_espresso"),$this->get_this_model()->item_name(2),$this->get_other_model()->item_name(2)); |
318 | 318 | return sprintf( |
319 | - __( 'This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"), |
|
319 | + __('This %1$s is currently linked to one or more %2$s records. If this %1$s is incorrect, then please remove it from all %3$s before attempting to delete it.', "event_espresso"), |
|
320 | 320 | $this->get_this_model()->item_name(1), |
321 | 321 | $this->get_other_model()->item_name(1), |
322 | 322 | $this->get_other_model()->item_name(2) |
@@ -7,6 +7,11 @@ discard block |
||
7 | 7 | |
8 | 8 | protected $_post_type; |
9 | 9 | protected $_meta_field; |
10 | + |
|
11 | + /** |
|
12 | + * @param string $post_type |
|
13 | + * @param string $meta_field_to_chk |
|
14 | + */ |
|
10 | 15 | function __construct($post_type, $meta_field_to_chk){ |
11 | 16 | $this->_post_type = $post_type; |
12 | 17 | $this->_meta_field = $meta_field_to_chk; |
@@ -27,7 +32,6 @@ discard block |
||
27 | 32 | } |
28 | 33 | /** |
29 | 34 | * Gets the where default where conditions for a custom post type model |
30 | - * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment" |
|
31 | 35 | * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions) |
32 | 36 | */ |
33 | 37 | protected function _get_default_where_conditions() { |
@@ -3,11 +3,11 @@ discard block |
||
3 | 3 | /* |
4 | 4 | * Strategy specifically for adding where conditions specific to CPT models. |
5 | 5 | */ |
6 | -class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions{ |
|
6 | +class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions { |
|
7 | 7 | |
8 | 8 | protected $_post_type; |
9 | 9 | protected $_meta_field; |
10 | - function __construct($post_type, $meta_field_to_chk){ |
|
10 | + function __construct($post_type, $meta_field_to_chk) { |
|
11 | 11 | $this->_post_type = $post_type; |
12 | 12 | $this->_meta_field = $meta_field_to_chk; |
13 | 13 | } |
@@ -17,10 +17,10 @@ discard block |
||
17 | 17 | * @param string $column column name |
18 | 18 | * @return EE_Model_Field_Base |
19 | 19 | */ |
20 | - protected function _get_field_on_column($column){ |
|
20 | + protected function _get_field_on_column($column) { |
|
21 | 21 | $all_fields = $this->_model->field_settings(true); |
22 | - foreach($all_fields as $field_name => $field_obj){ |
|
23 | - if($column == $field_obj->get_table_column()){ |
|
22 | + foreach ($all_fields as $field_name => $field_obj) { |
|
23 | + if ($column == $field_obj->get_table_column()) { |
|
24 | 24 | return $field_obj; |
25 | 25 | } |
26 | 26 | } |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | //find post_type field |
35 | 35 | $post_type_field = $this->_get_field_on_column('post_type'); |
36 | 36 | $status_field = $this->_get_field_on_column('post_status'); |
37 | - return array( $post_type_field->get_name() => $this->_post_type, |
|
38 | - $status_field->get_name() => array('NOT IN',array('auto-draft','trash')) |
|
37 | + return array($post_type_field->get_name() => $this->_post_type, |
|
38 | + $status_field->get_name() => array('NOT IN', array('auto-draft', 'trash')) |
|
39 | 39 | ); |
40 | 40 | } |
41 | 41 | } |
@@ -110,7 +110,7 @@ |
||
110 | 110 | /** |
111 | 111 | * Sets addon_name |
112 | 112 | * @param string $addon_name |
113 | - * @return boolean |
|
113 | + * @return string |
|
114 | 114 | */ |
115 | 115 | function set_name( $addon_name ) { |
116 | 116 | return $this->_addon_name = $addon_name; |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | /** |
74 | 74 | * @param mixed $version |
75 | 75 | */ |
76 | - public function set_version( $version = NULL ) { |
|
76 | + public function set_version($version = NULL) { |
|
77 | 77 | $this->_version = $version; |
78 | 78 | } |
79 | 79 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | /** |
92 | 92 | * @param mixed $min_core_version |
93 | 93 | */ |
94 | - public function set_min_core_version( $min_core_version = NULL ) { |
|
94 | + public function set_min_core_version($min_core_version = NULL) { |
|
95 | 95 | $this->_min_core_version = $min_core_version; |
96 | 96 | } |
97 | 97 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @param string $addon_name |
113 | 113 | * @return boolean |
114 | 114 | */ |
115 | - function set_name( $addon_name ) { |
|
115 | + function set_name($addon_name) { |
|
116 | 116 | return $this->_addon_name = $addon_name; |
117 | 117 | } |
118 | 118 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | do_action("AHEE__{$classname}__new_install"); |
139 | 139 | do_action("AHEE__EE_Addon__new_install", $this); |
140 | 140 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
141 | - add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) ); |
|
141 | + add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | |
@@ -153,16 +153,16 @@ discard block |
||
153 | 153 | do_action("AHEE__{$classname}__reactivation"); |
154 | 154 | do_action("AHEE__EE_Addon__reactivation", $this); |
155 | 155 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
156 | - add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) ); |
|
156 | + add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')); |
|
157 | 157 | } |
158 | 158 | |
159 | - public function deactivation(){ |
|
159 | + public function deactivation() { |
|
160 | 160 | $classname = get_class($this); |
161 | 161 | // echo "Deactivating $classname";die; |
162 | 162 | do_action("AHEE__{$classname}__deactivation"); |
163 | 163 | do_action("AHEE__EE_Addon__deactivation", $this); |
164 | 164 | //check if the site no longer needs to be in maintenance mode |
165 | - EE_Register_Addon::deregister( $this->name() ); |
|
165 | + EE_Register_Addon::deregister($this->name()); |
|
166 | 166 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
167 | 167 | } |
168 | 168 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @return void |
176 | 176 | */ |
177 | 177 | public function initialize_db_if_no_migrations_required() { |
178 | - if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ) { |
|
178 | + if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) { |
|
179 | 179 | $this->initialize_db(); |
180 | 180 | $this->initialize_default_data(); |
181 | 181 | //@todo: this will probably need to be adjusted in 4.4 as the array changed formats I believe |
@@ -188,11 +188,11 @@ discard block |
||
188 | 188 | */ |
189 | 189 | EE_Registry::instance()->load_helper('Activation'); |
190 | 190 | EEH_Activation::initialize_db_content(); |
191 | - update_option( 'ee_flush_rewrite_rules', TRUE ); |
|
192 | - }else{ |
|
191 | + update_option('ee_flush_rewrite_rules', TRUE); |
|
192 | + } else { |
|
193 | 193 | //ask the data migration manager to init this addon's data |
194 | 194 | //when migrations are finished because we can't do it now |
195 | - EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( $this->name() ); |
|
195 | + EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for($this->name()); |
|
196 | 196 | } |
197 | 197 | } |
198 | 198 | |
@@ -206,20 +206,20 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function initialize_db() { |
208 | 208 | //find the migration script that sets the database to be compatible with the code |
209 | - $current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms( $this->name() ); |
|
210 | - if( $current_dms_name ){ |
|
211 | - $current_data_migration_script = EE_Registry::instance()->load_dms( $current_dms_name ); |
|
212 | - $current_data_migration_script->set_migrating( FALSE ); |
|
209 | + $current_dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms($this->name()); |
|
210 | + if ($current_dms_name) { |
|
211 | + $current_data_migration_script = EE_Registry::instance()->load_dms($current_dms_name); |
|
212 | + $current_data_migration_script->set_migrating(FALSE); |
|
213 | 213 | $current_data_migration_script->schema_changes_before_migration(); |
214 | 214 | $current_data_migration_script->schema_changes_after_migration(); |
215 | - if ( $current_data_migration_script->get_errors() ) { |
|
216 | - foreach( $current_data_migration_script->get_errors() as $error ) { |
|
217 | - EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ ); |
|
215 | + if ($current_data_migration_script->get_errors()) { |
|
216 | + foreach ($current_data_migration_script->get_errors() as $error) { |
|
217 | + EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__); |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | } |
221 | 221 | //if not DMS was found that should be ok. This addon just doesn't require any database changes |
222 | - EE_Data_Migration_Manager::instance()->update_current_database_state_to( array( 'slug' => $this->name(), 'version' => $this->version() ) ); |
|
222 | + EE_Data_Migration_Manager::instance()->update_current_database_state_to(array('slug' => $this->name(), 'version' => $this->version())); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | * default data) |
242 | 242 | * @param EE_Addon $addon the addon that called this |
243 | 243 | */ |
244 | - do_action( 'AHEE__EE_Addon__initialize_default_data__begin', $this ); |
|
244 | + do_action('AHEE__EE_Addon__initialize_default_data__begin', $this); |
|
245 | 245 | //override to insert default data. It is safe to use the models here |
246 | 246 | //because the site should not be in maintenance mode |
247 | 247 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | do_action("AHEE__EE_Addon__upgrade", $this); |
261 | 261 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
262 | 262 | //also it's possible there is new default data that needs to be added |
263 | - add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) ); |
|
263 | + add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | do_action("AHEE__{$classname}__downgrade"); |
274 | 274 | do_action("AHEE__EE_Addon__downgrade", $this); |
275 | 275 | //it's possible there's old default data that needs to be double-checked |
276 | - add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ) ); |
|
276 | + add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | * plugin activation only. In the future, we'll want to do it on plugin updates too |
285 | 285 | * @return bool |
286 | 286 | */ |
287 | - public function set_db_update_option_name(){ |
|
287 | + public function set_db_update_option_name() { |
|
288 | 288 | EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Addon::set_db_update_option_name was renamed to EE_Addon::set_activation_indicator_option', 'event_espresso'), '4.3.0.alpha.016'); |
289 | 289 | //let's just handle this on the next request, ok? right now we're just not really ready |
290 | 290 | return $this->set_activation_indicator_option(); |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | */ |
313 | 313 | public function set_activation_indicator_option() { |
314 | 314 | // let's just handle this on the next request, ok? right now we're just not really ready |
315 | - return update_option( $this->get_activation_indicator_option_name(), TRUE ); |
|
315 | + return update_option($this->get_activation_indicator_option_name(), TRUE); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | |
@@ -320,8 +320,8 @@ discard block |
||
320 | 320 | * Gets the name of the wp option which is used to temporarily indicate that this addon was activated |
321 | 321 | * @return string |
322 | 322 | */ |
323 | - public function get_activation_indicator_option_name(){ |
|
324 | - return 'ee_activation_' . $this->name(); |
|
323 | + public function get_activation_indicator_option_name() { |
|
324 | + return 'ee_activation_'.$this->name(); |
|
325 | 325 | } |
326 | 326 | |
327 | 327 | |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | * Used by EE_System to set the request type of this addon. Should not be used by addon developers |
332 | 332 | * @param int $req_type |
333 | 333 | */ |
334 | - function set_req_type( $req_type ) { |
|
334 | + function set_req_type($req_type) { |
|
335 | 335 | $this->_req_type = $req_type; |
336 | 336 | } |
337 | 337 | |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | * of addons |
343 | 343 | */ |
344 | 344 | function detect_req_type() { |
345 | - if( ! $this->_req_type ){ |
|
345 | + if ( ! $this->_req_type) { |
|
346 | 346 | $this->detect_activation_or_upgrade(); |
347 | 347 | } |
348 | 348 | return $this->_req_type; |
@@ -355,36 +355,36 @@ discard block |
||
355 | 355 | * Should only be called once per request |
356 | 356 | * @return void |
357 | 357 | */ |
358 | - function detect_activation_or_upgrade(){ |
|
358 | + function detect_activation_or_upgrade() { |
|
359 | 359 | $activation_history_for_addon = $this->get_activation_history(); |
360 | 360 | // d($activation_history_for_addon); |
361 | 361 | $request_type = EE_System::detect_req_type_given_activation_history($activation_history_for_addon, $this->get_activation_indicator_option_name(), $this->version()); |
362 | 362 | $this->set_req_type($request_type); |
363 | 363 | $classname = get_class($this); |
364 | - switch($request_type){ |
|
364 | + switch ($request_type) { |
|
365 | 365 | case EE_System::req_type_new_activation: |
366 | - do_action( "AHEE__{$classname}__detect_activations_or_upgrades__new_activation" ); |
|
367 | - do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this ); |
|
366 | + do_action("AHEE__{$classname}__detect_activations_or_upgrades__new_activation"); |
|
367 | + do_action("AHEE__EE_Addon__detect_activations_or_upgrades__new_activation", $this); |
|
368 | 368 | $this->new_install(); |
369 | - $this->update_list_of_installed_versions( $activation_history_for_addon ); |
|
369 | + $this->update_list_of_installed_versions($activation_history_for_addon); |
|
370 | 370 | break; |
371 | 371 | case EE_System::req_type_reactivation: |
372 | - do_action( "AHEE__{$classname}__detect_activations_or_upgrades__reactivation" ); |
|
373 | - do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this ); |
|
372 | + do_action("AHEE__{$classname}__detect_activations_or_upgrades__reactivation"); |
|
373 | + do_action("AHEE__EE_Addon__detect_activations_or_upgrades__reactivation", $this); |
|
374 | 374 | $this->reactivation(); |
375 | - $this->update_list_of_installed_versions( $activation_history_for_addon ); |
|
375 | + $this->update_list_of_installed_versions($activation_history_for_addon); |
|
376 | 376 | break; |
377 | 377 | case EE_System::req_type_upgrade: |
378 | - do_action( "AHEE__{$classname}__detect_activations_or_upgrades__upgrade" ); |
|
379 | - do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this ); |
|
378 | + do_action("AHEE__{$classname}__detect_activations_or_upgrades__upgrade"); |
|
379 | + do_action("AHEE__EE_Addon__detect_activations_or_upgrades__upgrade", $this); |
|
380 | 380 | $this->upgrade(); |
381 | - $this->update_list_of_installed_versions($activation_history_for_addon ); |
|
381 | + $this->update_list_of_installed_versions($activation_history_for_addon); |
|
382 | 382 | break; |
383 | 383 | case EE_System::req_type_downgrade: |
384 | - do_action( "AHEE__{$classname}__detect_activations_or_upgrades__downgrade" ); |
|
385 | - do_action( "AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this ); |
|
384 | + do_action("AHEE__{$classname}__detect_activations_or_upgrades__downgrade"); |
|
385 | + do_action("AHEE__EE_Addon__detect_activations_or_upgrades__downgrade", $this); |
|
386 | 386 | $this->downgrade(); |
387 | - $this->update_list_of_installed_versions($activation_history_for_addon ); |
|
387 | + $this->update_list_of_installed_versions($activation_history_for_addon); |
|
388 | 388 | break; |
389 | 389 | case EE_System::req_type_normal: |
390 | 390 | default: |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | break; |
393 | 393 | } |
394 | 394 | |
395 | - do_action( "AHEE__{$classname}__detect_if_activation_or_upgrade__complete" ); |
|
395 | + do_action("AHEE__{$classname}__detect_if_activation_or_upgrade__complete"); |
|
396 | 396 | } |
397 | 397 | |
398 | 398 | /** |
@@ -401,17 +401,17 @@ discard block |
||
401 | 401 | * @param string $current_version_to_add |
402 | 402 | * @return boolean success |
403 | 403 | */ |
404 | - public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) { |
|
405 | - if( ! $version_history ) { |
|
404 | + public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) { |
|
405 | + if ( ! $version_history) { |
|
406 | 406 | $version_history = $this->get_activation_history(); |
407 | 407 | } |
408 | - if( $current_version_to_add == NULL){ |
|
408 | + if ($current_version_to_add == NULL) { |
|
409 | 409 | $current_version_to_add = $this->version(); |
410 | 410 | } |
411 | - $version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() ); |
|
411 | + $version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time()); |
|
412 | 412 | // resave |
413 | 413 | // echo "updating list of installed versions:".$this->get_activation_history_option_name();d($version_history); |
414 | - return update_option( $this->get_activation_history_option_name(), $version_history ); |
|
414 | + return update_option($this->get_activation_history_option_name(), $version_history); |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | /** |
@@ -419,8 +419,8 @@ discard block |
||
419 | 419 | * of this addon |
420 | 420 | * @return string |
421 | 421 | */ |
422 | - function get_activation_history_option_name(){ |
|
423 | - return self::ee_addon_version_history_option_prefix . $this->name(); |
|
422 | + function get_activation_history_option_name() { |
|
423 | + return self::ee_addon_version_history_option_prefix.$this->name(); |
|
424 | 424 | } |
425 | 425 | |
426 | 426 | |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | * Gets the wp option which stores the activation history for this addon |
430 | 430 | * @return array |
431 | 431 | */ |
432 | - function get_activation_history(){ |
|
432 | + function get_activation_history() { |
|
433 | 433 | return get_option($this->get_activation_history_option_name(), NULL); |
434 | 434 | } |
435 | 435 | |
@@ -438,8 +438,8 @@ discard block |
||
438 | 438 | /** |
439 | 439 | * @param string $config_section |
440 | 440 | */ |
441 | - public function set_config_section( $config_section = '' ) { |
|
442 | - $this->_config_section = ! empty( $config_section ) ? $config_section : 'addons'; |
|
441 | + public function set_config_section($config_section = '') { |
|
442 | + $this->_config_section = ! empty($config_section) ? $config_section : 'addons'; |
|
443 | 443 | } |
444 | 444 | /** |
445 | 445 | * filepath to the main file, which can be used for register_activation_hook, register_deactivation_hook, etc. |
@@ -452,14 +452,14 @@ discard block |
||
452 | 452 | * Sets the filepath to the main plugin file |
453 | 453 | * @param string $filepath |
454 | 454 | */ |
455 | - public function set_main_plugin_file( $filepath ) { |
|
455 | + public function set_main_plugin_file($filepath) { |
|
456 | 456 | $this->_main_plugin_file = $filepath; |
457 | 457 | } |
458 | 458 | /** |
459 | 459 | * gets the filepath to teh main file |
460 | 460 | * @return string |
461 | 461 | */ |
462 | - public function get_main_plugin_file(){ |
|
462 | + public function get_main_plugin_file() { |
|
463 | 463 | return $this->_main_plugin_file; |
464 | 464 | } |
465 | 465 | |
@@ -469,15 +469,15 @@ discard block |
||
469 | 469 | * @return string |
470 | 470 | */ |
471 | 471 | public function get_main_plugin_file_basename() { |
472 | - return plugin_basename( $this->get_main_plugin_file() ); |
|
472 | + return plugin_basename($this->get_main_plugin_file()); |
|
473 | 473 | } |
474 | 474 | |
475 | 475 | /** |
476 | 476 | * Gets the folder name which contains the main plugin file |
477 | 477 | * @return string |
478 | 478 | */ |
479 | - public function get_main_plugin_file_dirname(){ |
|
480 | - return dirname( $this->get_main_plugin_file() ); |
|
479 | + public function get_main_plugin_file_dirname() { |
|
480 | + return dirname($this->get_main_plugin_file()); |
|
481 | 481 | } |
482 | 482 | |
483 | 483 | } |
@@ -319,7 +319,7 @@ |
||
319 | 319 | } |
320 | 320 | |
321 | 321 | /** |
322 | - * @param $method_name |
|
322 | + * @param string $method_name |
|
323 | 323 | */ |
324 | 324 | public static function doing_it_wrong_call( $method_name ) { |
325 | 325 | EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED ); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @param \EE_Checkout $checkout |
14 | 14 | * @return string |
15 | 15 | */ |
16 | -function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) { |
|
16 | +function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) { |
|
17 | 17 | // list of old filters |
18 | 18 | $deprecated_filters = array( |
19 | 19 | 'update_registration_details' => true, |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | 'proceed_to' => true, |
24 | 24 | ); |
25 | 25 | // loop thru and call doing_it_wrong() or remove any that aren't being used |
26 | - foreach ( $deprecated_filters as $deprecated_filter => $on ) { |
|
26 | + foreach ($deprecated_filters as $deprecated_filter => $on) { |
|
27 | 27 | // was this filter called ? |
28 | - if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) { |
|
28 | + if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) { |
|
29 | 29 | // only display doing_it_wrong() notice to Event Admins during non-AJAX requests |
30 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) { |
|
30 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) { |
|
31 | 31 | EE_Error::doing_it_wrong( |
32 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
32 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
33 | 33 | sprintf( |
34 | - __( 'The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ), |
|
35 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
34 | + __('The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'), |
|
35 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
36 | 36 | '<br />', |
37 | 37 | 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', |
38 | 38 | '/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php' |
@@ -41,24 +41,24 @@ discard block |
||
41 | 41 | ); |
42 | 42 | } |
43 | 43 | } else { |
44 | - unset( $deprecated_filters[ $deprecated_filter ] ); |
|
44 | + unset($deprecated_filters[$deprecated_filter]); |
|
45 | 45 | } |
46 | 46 | } |
47 | - if ( ! empty( $deprecated_filters )) { |
|
48 | - |
|
49 | - if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) { |
|
50 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text ); |
|
51 | - } else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) { |
|
52 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text ); |
|
53 | - } else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) { |
|
54 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text ); |
|
47 | + if ( ! empty($deprecated_filters)) { |
|
48 | + |
|
49 | + if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) { |
|
50 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text); |
|
51 | + } else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) { |
|
52 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text); |
|
53 | + } else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) { |
|
54 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text); |
|
55 | 55 | } |
56 | - if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) { |
|
57 | - if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) { |
|
58 | - $submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text ); |
|
56 | + if ($checkout->next_step instanceof EE_SPCO_Reg_Step) { |
|
57 | + if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) { |
|
58 | + $submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text); |
|
59 | 59 | } |
60 | - if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) { |
|
61 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name(); |
|
60 | + if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) { |
|
61 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name(); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | return $submit_button_text; |
67 | 67 | |
68 | 68 | } |
69 | -add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 ); |
|
69 | +add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2); |
|
70 | 70 | |
71 | 71 | |
72 | 72 | |
@@ -77,16 +77,16 @@ discard block |
||
77 | 77 | * @param \EE_Checkout $checkout |
78 | 78 | * @param boolean $status_updates |
79 | 79 | */ |
80 | -function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) { |
|
80 | +function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) { |
|
81 | 81 | $action_ref = NULL; |
82 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
83 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
84 | - if ( $action_ref ) { |
|
82 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
83 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
84 | + if ($action_ref) { |
|
85 | 85 | |
86 | 86 | EE_Error::doing_it_wrong( |
87 | 87 | $action_ref, |
88 | 88 | sprintf( |
89 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ), |
|
89 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'), |
|
90 | 90 | '<br />', |
91 | 91 | '/core/business/EE_Transaction_Processor.class.php', |
92 | 92 | 'AHEE__EE_Transaction_Processor__finalize', |
@@ -96,39 +96,39 @@ discard block |
||
96 | 96 | ), |
97 | 97 | '4.6.0' |
98 | 98 | ); |
99 | - switch ( $action_ref ) { |
|
99 | + switch ($action_ref) { |
|
100 | 100 | case 'AHEE__EE_Transaction__finalize__new_transaction' : |
101 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request ); |
|
101 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request); |
|
102 | 102 | break; |
103 | 103 | case 'AHEE__EE_Transaction__finalize__all_transaction' : |
104 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request ); |
|
104 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request); |
|
105 | 105 | break; |
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
109 | -add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
|
109 | +add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2); |
|
110 | 110 | /** |
111 | 111 | * ee_deprecated_finalize_registration |
112 | 112 | * |
113 | 113 | * @param EE_Registration $registration |
114 | 114 | */ |
115 | -function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
|
116 | - $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
117 | - if ( $action_ref ) { |
|
115 | +function ee_deprecated_finalize_registration(EE_Registration $registration) { |
|
116 | + $action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
117 | + if ($action_ref) { |
|
118 | 118 | EE_Error::doing_it_wrong( |
119 | 119 | $action_ref, |
120 | 120 | sprintf( |
121 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ), |
|
121 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'), |
|
122 | 122 | '<br />', |
123 | 123 | '/core/business/EE_Registration_Processor.class.php', |
124 | 124 | 'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook' |
125 | 125 | ), |
126 | 126 | '4.6.0' |
127 | 127 | ); |
128 | - do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ))); |
|
128 | + do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX))); |
|
129 | 129 | } |
130 | 130 | } |
131 | -add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 ); |
|
131 | +add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1); |
|
132 | 132 | |
133 | 133 | |
134 | 134 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * |
150 | 150 | * @return array |
151 | 151 | */ |
152 | -function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) { |
|
152 | +function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) { |
|
153 | 153 | $old_default_classnames = array( |
154 | 154 | 'EE_Messages_Email_Cancelled_Registration_Defaults', |
155 | 155 | 'EE_Messages_Email_Declined_Registration_Defaults', |
@@ -165,23 +165,23 @@ discard block |
||
165 | 165 | |
166 | 166 | $old_class_instance = new stdClass(); |
167 | 167 | |
168 | - foreach ( $old_default_classnames as $classname ) { |
|
169 | - $filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates'; |
|
170 | - if ( has_filter( $filter_ref ) ) { |
|
171 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' ); |
|
168 | + foreach ($old_default_classnames as $classname) { |
|
169 | + $filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates'; |
|
170 | + if (has_filter($filter_ref)) { |
|
171 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0'); |
|
172 | 172 | } |
173 | - $templates = apply_filters( $filter_ref, $templates, $old_class_instance ); |
|
173 | + $templates = apply_filters($filter_ref, $templates, $old_class_instance); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | return $templates; |
177 | 177 | } |
178 | -add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 ); |
|
178 | +add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4); |
|
179 | 179 | |
180 | 180 | /** |
181 | 181 | * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called. |
182 | 182 | * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately. |
183 | 183 | */ |
184 | -function ee_deprecated_hooks(){ |
|
184 | +function ee_deprecated_hooks() { |
|
185 | 185 | /** |
186 | 186 | * @var $hooks array where keys are hook names, and their values are array{ |
187 | 187 | * @type string $version when deprecated |
@@ -192,25 +192,25 @@ discard block |
||
192 | 192 | $hooks = array( |
193 | 193 | 'AHEE__EE_System___do_setup_validations' => array( |
194 | 194 | 'version' => '4.6.0', |
195 | - 'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ), |
|
195 | + 'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'), |
|
196 | 196 | 'still_works' => FALSE |
197 | 197 | ) |
198 | 198 | ); |
199 | - foreach( $hooks as $name => $deprecation_info ){ |
|
200 | - if( has_action( $name ) ){ |
|
199 | + foreach ($hooks as $name => $deprecation_info) { |
|
200 | + if (has_action($name)) { |
|
201 | 201 | EE_Error::doing_it_wrong( |
202 | 202 | $name, |
203 | 203 | sprintf( |
204 | - __('This filter is deprecated. %1$s%2$s','event_espresso'), |
|
205 | - $deprecation_info[ 'still_works' ] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ), |
|
206 | - isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' ) |
|
204 | + __('This filter is deprecated. %1$s%2$s', 'event_espresso'), |
|
205 | + $deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'), |
|
206 | + isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso') |
|
207 | 207 | ), |
208 | - isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ) |
|
208 | + isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso') |
|
209 | 209 | ); |
210 | 210 | } |
211 | 211 | } |
212 | 212 | } |
213 | -add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' ); |
|
213 | +add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks'); |
|
214 | 214 | |
215 | 215 | |
216 | 216 | |
@@ -233,25 +233,25 @@ discard block |
||
233 | 233 | * |
234 | 234 | * @return string The default contents for the messenger, message type, context and field. |
235 | 235 | */ |
236 | -function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) { |
|
236 | +function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) { |
|
237 | 237 | |
238 | 238 | $classnames_to_try = array( |
239 | - get_class( $messenger ) => $messenger, |
|
240 | - get_class( $message_type ) => $message_type, |
|
239 | + get_class($messenger) => $messenger, |
|
240 | + get_class($message_type) => $message_type, |
|
241 | 241 | 'EE_Messages_Base' => $message_type |
242 | 242 | ); |
243 | 243 | |
244 | - foreach ( $classnames_to_try as $classname => $obj ) { |
|
245 | - $filter_ref = 'FHEE__' . $classname . '__get_default_field_content'; |
|
246 | - if ( has_filter( $filter_ref ) ) { |
|
247 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' ); |
|
244 | + foreach ($classnames_to_try as $classname => $obj) { |
|
245 | + $filter_ref = 'FHEE__'.$classname.'__get_default_field_content'; |
|
246 | + if (has_filter($filter_ref)) { |
|
247 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0'); |
|
248 | 248 | } |
249 | - $contents = apply_filters( $filter_ref, $contents, $obj ); |
|
249 | + $contents = apply_filters($filter_ref, $contents, $obj); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | return $contents; |
253 | 253 | } |
254 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 ); |
|
254 | +add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7); |
|
255 | 255 | |
256 | 256 | |
257 | 257 | |
@@ -279,23 +279,23 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @return string The path to the file being used. |
281 | 281 | */ |
282 | -function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) { |
|
282 | +function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) { |
|
283 | 283 | |
284 | - if ( $messenger == 'email' ) { |
|
284 | + if ($messenger == 'email') { |
|
285 | 285 | $filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path'; |
286 | - } elseif ( $messenger == 'html' ) { |
|
286 | + } elseif ($messenger == 'html') { |
|
287 | 287 | $filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path'; |
288 | 288 | } else { |
289 | 289 | return $variation_path; |
290 | 290 | } |
291 | 291 | |
292 | - if ( has_filter( $filter_ref ) ) { |
|
293 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0' ); |
|
292 | + if (has_filter($filter_ref)) { |
|
293 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0'); |
|
294 | 294 | } |
295 | 295 | |
296 | - return apply_filters( $filter_ref, $variation_path, $url, $type ); |
|
296 | + return apply_filters($filter_ref, $variation_path, $url, $type); |
|
297 | 297 | } |
298 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 ); |
|
298 | +add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8); |
|
299 | 299 | |
300 | 300 | |
301 | 301 | |
@@ -311,78 +311,78 @@ discard block |
||
311 | 311 | class EE_Messages_Init extends EE_Base { |
312 | 312 | |
313 | 313 | public function __construct() { |
314 | - self::doing_it_wrong_call( __METHOD__ ); |
|
314 | + self::doing_it_wrong_call(__METHOD__); |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | /** |
318 | 318 | * @param $method_name |
319 | 319 | */ |
320 | - public static function doing_it_wrong_call( $method_name ) { |
|
321 | - EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0' ); |
|
320 | + public static function doing_it_wrong_call($method_name) { |
|
321 | + EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0'); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | /** |
325 | 325 | * @deprecated 4.5.0 |
326 | 326 | */ |
327 | 327 | public static function set_autoloaders() { |
328 | - self::doing_it_wrong_call( __METHOD__ ); |
|
328 | + self::doing_it_wrong_call(__METHOD__); |
|
329 | 329 | EED_Messages::set_autoloaders(); |
330 | 330 | } |
331 | 331 | |
332 | 332 | /** |
333 | 333 | * @deprecated 4.5.0 |
334 | 334 | */ |
335 | - public function payment_reminder( $transaction ) { |
|
336 | - self::doing_it_wrong_call( __METHOD__ ); |
|
337 | - EED_Messages::payment_reminder( $transaction ); |
|
335 | + public function payment_reminder($transaction) { |
|
336 | + self::doing_it_wrong_call(__METHOD__); |
|
337 | + EED_Messages::payment_reminder($transaction); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | /** |
341 | 341 | * @deprecated 4.5.0 |
342 | 342 | */ |
343 | - public function payment( $transaction, $payment ) { |
|
344 | - self::doing_it_wrong_call( __METHOD__ ); |
|
345 | - EED_Messages::payment( $transaction, $payment ); |
|
343 | + public function payment($transaction, $payment) { |
|
344 | + self::doing_it_wrong_call(__METHOD__); |
|
345 | + EED_Messages::payment($transaction, $payment); |
|
346 | 346 | } |
347 | 347 | |
348 | 348 | /** |
349 | 349 | * @deprecated 4.5.0 |
350 | 350 | */ |
351 | - public function cancelled_registration( $transaction ) { |
|
352 | - self::doing_it_wrong_call( __METHOD__ ); |
|
353 | - EED_Messages::cancelled_registration( $transaction ); |
|
351 | + public function cancelled_registration($transaction) { |
|
352 | + self::doing_it_wrong_call(__METHOD__); |
|
353 | + EED_Messages::cancelled_registration($transaction); |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
357 | 357 | * @deprecated 4.5.0 |
358 | 358 | */ |
359 | - public function maybe_registration( $transaction, $reg_msg, $from_admin ) { |
|
360 | - self::doing_it_wrong_call( __METHOD__ ); |
|
361 | - EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin ); |
|
359 | + public function maybe_registration($transaction, $reg_msg, $from_admin) { |
|
360 | + self::doing_it_wrong_call(__METHOD__); |
|
361 | + EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin); |
|
362 | 362 | } |
363 | 363 | |
364 | 364 | /** |
365 | 365 | * @deprecated 4.5.0 |
366 | 366 | */ |
367 | - public function process_resend( $success, $req_data ) { |
|
368 | - self::doing_it_wrong_call( __METHOD__ ); |
|
369 | - EED_Messages::process_resend( $req_data ); |
|
367 | + public function process_resend($success, $req_data) { |
|
368 | + self::doing_it_wrong_call(__METHOD__); |
|
369 | + EED_Messages::process_resend($req_data); |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | /** |
373 | 373 | * @deprecated 4.5.0 |
374 | 374 | */ |
375 | - public function process_admin_payment( $success, $payment ) { |
|
376 | - self::doing_it_wrong_call( __METHOD__ ); |
|
377 | - EED_Messages::process_admin_payment( $success, $payment ); |
|
375 | + public function process_admin_payment($success, $payment) { |
|
376 | + self::doing_it_wrong_call(__METHOD__); |
|
377 | + EED_Messages::process_admin_payment($success, $payment); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | /** |
381 | 381 | * @deprecated 4.5.0 |
382 | 382 | */ |
383 | - public function send_newsletter_message( $contacts, $grp_id ) { |
|
384 | - self::doing_it_wrong_call( __METHOD__ ); |
|
385 | - EED_Messages::send_newsletter_message( $contacts, $grp_id ); |
|
383 | + public function send_newsletter_message($contacts, $grp_id) { |
|
384 | + self::doing_it_wrong_call(__METHOD__); |
|
385 | + EED_Messages::send_newsletter_message($contacts, $grp_id); |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | |
@@ -403,13 +403,13 @@ discard block |
||
403 | 403 | * |
404 | 404 | * @return array additional cpts. |
405 | 405 | */ |
406 | -function ee_deprecated_get_cpts( $cpts ) { |
|
407 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) { |
|
408 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0' ); |
|
406 | +function ee_deprecated_get_cpts($cpts) { |
|
407 | + if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) { |
|
408 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0'); |
|
409 | 409 | } |
410 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts ); |
|
410 | + return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts); |
|
411 | 411 | } |
412 | -add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 ); |
|
412 | +add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10); |
|
413 | 413 | |
414 | 414 | |
415 | 415 | |
@@ -423,10 +423,10 @@ discard block |
||
423 | 423 | * |
424 | 424 | * @return array additional custom taxonomies. |
425 | 425 | */ |
426 | -function ee_deprecated_get_taxonomies( $cts ) { |
|
427 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) { |
|
428 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0' ); |
|
426 | +function ee_deprecated_get_taxonomies($cts) { |
|
427 | + if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) { |
|
428 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0'); |
|
429 | 429 | } |
430 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts ); |
|
430 | + return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts); |
|
431 | 431 | } |
432 | -add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 ); |
|
432 | +add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10); |
@@ -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. |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | /** |
89 | 89 | * error_handler |
90 | 90 | * @access public |
91 | - * @param $code |
|
91 | + * @param integer $code |
|
92 | 92 | * @param $message |
93 | 93 | * @param $file |
94 | 94 | * @param $line |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | /** |
190 | 190 | * _format_error |
191 | 191 | * @access private |
192 | - * @param $code |
|
192 | + * @param string $code |
|
193 | 193 | * @param $message |
194 | 194 | * @param $file |
195 | 195 | * @param $line |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | * |
937 | 937 | * @access public |
938 | 938 | * @param string $return_url |
939 | - * @return array |
|
939 | + * @return string |
|
940 | 940 | */ |
941 | 941 | public static function get_persistent_admin_notices( $return_url = '' ) { |
942 | 942 | $notices = ''; |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | * |
962 | 962 | * @access public |
963 | 963 | * @param bool $force_print |
964 | - * @return void |
|
964 | + * @return null|string |
|
965 | 965 | */ |
966 | 966 | private static function _print_scripts( $force_print = FALSE ) { |
967 | 967 | if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) { |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE ); |
3 | -if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) { |
|
4 | - set_error_handler( array( 'EE_Error', 'error_handler' )); |
|
5 | - register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' )); |
|
3 | +if (defined('WP_DEBUG') && WP_DEBUG === TRUE && defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS === TRUE) { |
|
4 | + set_error_handler(array('EE_Error', 'error_handler')); |
|
5 | + register_shutdown_function(array('EE_Error', 'fatal_error_handler')); |
|
6 | 6 | } |
7 | 7 | /** |
8 | 8 | * |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @access private |
65 | 65 | * @var boolean |
66 | 66 | */ |
67 | - private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE ); |
|
67 | + private static $_espresso_notices = array('success' => FALSE, 'errors' => FALSE, 'attention' => FALSE); |
|
68 | 68 | |
69 | 69 | |
70 | 70 | |
@@ -75,11 +75,11 @@ discard block |
||
75 | 75 | * @access public |
76 | 76 | * @echo string |
77 | 77 | */ |
78 | - function __construct( $message, $code = 0, Exception $previous = NULL ) { |
|
79 | - if ( version_compare( phpversion(), '5.3.0', '<' )) { |
|
80 | - parent::__construct( $message, $code ); |
|
78 | + function __construct($message, $code = 0, Exception $previous = NULL) { |
|
79 | + if (version_compare(phpversion(), '5.3.0', '<')) { |
|
80 | + parent::__construct($message, $code); |
|
81 | 81 | } else { |
82 | - parent::__construct( $message, $code, $previous ); |
|
82 | + parent::__construct($message, $code, $previous); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | * @param $line |
95 | 95 | * @return void |
96 | 96 | */ |
97 | - public static function error_handler( $code, $message, $file, $line ) { |
|
98 | - $type = EE_Error::error_type( $code ); |
|
97 | + public static function error_handler($code, $message, $file, $line) { |
|
98 | + $type = EE_Error::error_type($code); |
|
99 | 99 | $site = site_url(); |
100 | - switch ( $site ) { |
|
100 | + switch ($site) { |
|
101 | 101 | case 'http://ee4.eventespresso.com/' : |
102 | 102 | case 'http://ee4decaf.eventespresso.com/' : |
103 | 103 | case 'http://ee4hf.eventespresso.com/' : |
@@ -110,16 +110,16 @@ discard block |
||
110 | 110 | $to = '[email protected]'; |
111 | 111 | break; |
112 | 112 | default : |
113 | - $to = get_option( 'admin_email' ); |
|
113 | + $to = get_option('admin_email'); |
|
114 | 114 | } |
115 | - $subject = $type . ' ' . $message . ' in ' . EVENT_ESPRESSO_VERSION . ' on ' . site_url(); |
|
116 | - $msg = EE_Error::_format_error( $type, $message, $file, $line ); |
|
117 | - if ( function_exists( 'wp_mail' )) { |
|
118 | - add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' )); |
|
119 | - wp_mail( $to, $subject, $msg ); |
|
115 | + $subject = $type.' '.$message.' in '.EVENT_ESPRESSO_VERSION.' on '.site_url(); |
|
116 | + $msg = EE_Error::_format_error($type, $message, $file, $line); |
|
117 | + if (function_exists('wp_mail')) { |
|
118 | + add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type')); |
|
119 | + wp_mail($to, $subject, $msg); |
|
120 | 120 | } |
121 | 121 | echo '<div id="message" class="espresso-notices error"><p>'; |
122 | - echo $type . ': ' . $message . '<br />' . $file . ' line ' . $line; |
|
122 | + echo $type.': '.$message.'<br />'.$file.' line '.$line; |
|
123 | 123 | echo '<br /></p></div>'; |
124 | 124 | } |
125 | 125 | |
@@ -132,8 +132,8 @@ discard block |
||
132 | 132 | * @param $code |
133 | 133 | * @return string |
134 | 134 | */ |
135 | - public static function error_type( $code ) { |
|
136 | - switch( $code ) { |
|
135 | + public static function error_type($code) { |
|
136 | + switch ($code) { |
|
137 | 137 | case E_ERROR: // 1 // |
138 | 138 | return 'E_ERROR'; |
139 | 139 | case E_WARNING: // 2 // |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public static function fatal_error_handler() { |
181 | 181 | $last_error = error_get_last(); |
182 | - if ( $last_error['type'] === E_ERROR ) { |
|
183 | - EE_Error::error_handler( E_ERROR, $last_error['message'], $last_error['file'], $last_error['line'] ); |
|
182 | + if ($last_error['type'] === E_ERROR) { |
|
183 | + EE_Error::error_handler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | * @param $line |
196 | 196 | * @return string |
197 | 197 | */ |
198 | - private static function _format_error( $code, $message, $file, $line ) { |
|
198 | + private static function _format_error($code, $message, $file, $line) { |
|
199 | 199 | $html = "<table cellpadding='5'><thead bgcolor='#f8f8f8'><th>Item</th><th align='left'>Details</th></thead><tbody>"; |
200 | 200 | $html .= "<tr valign='top'><td><b>Code</b></td><td>$code</td></tr>"; |
201 | 201 | $html .= "<tr valign='top'><td><b>Error</b></td><td>$message</td></tr>"; |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | * @param $content_type |
214 | 214 | * @return string |
215 | 215 | */ |
216 | - public static function set_content_type( $content_type ) { |
|
216 | + public static function set_content_type($content_type) { |
|
217 | 217 | return 'text/html'; |
218 | 218 | } |
219 | 219 | |
@@ -227,24 +227,24 @@ discard block |
||
227 | 227 | */ |
228 | 228 | public function get_error() { |
229 | 229 | |
230 | - if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){ |
|
230 | + if (apply_filters('FHEE__EE_Error__get_error__show_normal_exceptions', FALSE)) { |
|
231 | 231 | throw $this; |
232 | 232 | } |
233 | 233 | // get separate user and developer messages if they exist |
234 | - $msg = explode( '||', $this->getMessage() ); |
|
234 | + $msg = explode('||', $this->getMessage()); |
|
235 | 235 | $user_msg = $msg[0]; |
236 | - $dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0]; |
|
236 | + $dev_msg = isset($msg[1]) ? $msg[1] : $msg[0]; |
|
237 | 237 | $msg = WP_DEBUG ? $dev_msg : $user_msg; |
238 | 238 | |
239 | 239 | // add details to _all_exceptions array |
240 | 240 | $x_time = time(); |
241 | - self::$_all_exceptions[ $x_time ]['name'] = get_class( $this ); |
|
242 | - self::$_all_exceptions[ $x_time ]['file'] = $this->getFile(); |
|
243 | - self::$_all_exceptions[ $x_time ]['line'] = $this->getLine(); |
|
244 | - self::$_all_exceptions[ $x_time ]['msg'] = $msg; |
|
245 | - self::$_all_exceptions[ $x_time ]['code'] = $this->getCode(); |
|
246 | - self::$_all_exceptions[ $x_time ]['trace'] = $this->getTrace(); |
|
247 | - self::$_all_exceptions[ $x_time ]['string'] = $this->getTraceAsString(); |
|
241 | + self::$_all_exceptions[$x_time]['name'] = get_class($this); |
|
242 | + self::$_all_exceptions[$x_time]['file'] = $this->getFile(); |
|
243 | + self::$_all_exceptions[$x_time]['line'] = $this->getLine(); |
|
244 | + self::$_all_exceptions[$x_time]['msg'] = $msg; |
|
245 | + self::$_all_exceptions[$x_time]['code'] = $this->getCode(); |
|
246 | + self::$_all_exceptions[$x_time]['trace'] = $this->getTrace(); |
|
247 | + self::$_all_exceptions[$x_time]['string'] = $this->getTraceAsString(); |
|
248 | 248 | self::$_error_count++; |
249 | 249 | |
250 | 250 | //add_action( 'shutdown', array( $this, 'display_errors' )); |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | * @access public |
260 | 260 | * @return boolean |
261 | 261 | */ |
262 | - public static function has_error(){ |
|
262 | + public static function has_error() { |
|
263 | 263 | return self::$_error_count ? TRUE : FALSE; |
264 | 264 | } |
265 | 265 | |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | * @access public |
271 | 271 | * @echo string |
272 | 272 | */ |
273 | - public function display_errors(){ |
|
273 | + public function display_errors() { |
|
274 | 274 | |
275 | 275 | $trace_details = ''; |
276 | 276 | |
@@ -331,18 +331,18 @@ discard block |
||
331 | 331 | </style> |
332 | 332 | <div id="ee-error-message" class="error">'; |
333 | 333 | |
334 | - if ( ! WP_DEBUG ) { |
|
334 | + if ( ! WP_DEBUG) { |
|
335 | 335 | $output .= ' |
336 | 336 | <p>'; |
337 | 337 | } |
338 | 338 | |
339 | 339 | // cycle thru errors |
340 | - foreach ( self::$_all_exceptions as $time => $ex ) { |
|
340 | + foreach (self::$_all_exceptions as $time => $ex) { |
|
341 | 341 | |
342 | 342 | // process trace info |
343 | - if ( empty( $ex['trace'] )) { |
|
343 | + if (empty($ex['trace'])) { |
|
344 | 344 | |
345 | - $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' ); |
|
345 | + $trace_details .= __('Sorry, but no trace information was available for this exception.', 'event_espresso'); |
|
346 | 346 | |
347 | 347 | } else { |
348 | 348 | |
@@ -357,50 +357,50 @@ discard block |
||
357 | 357 | <th scope="col" align="left">Method( arguments )</th> |
358 | 358 | </tr>'; |
359 | 359 | |
360 | - $last_on_stack = count( $ex['trace'] ) - 1; |
|
360 | + $last_on_stack = count($ex['trace']) - 1; |
|
361 | 361 | // reverse array so that stack is in proper chronological order |
362 | - $sorted_trace = array_reverse( $ex['trace'] ); |
|
362 | + $sorted_trace = array_reverse($ex['trace']); |
|
363 | 363 | |
364 | - foreach ( $sorted_trace as $nmbr => $trace ) { |
|
364 | + foreach ($sorted_trace as $nmbr => $trace) { |
|
365 | 365 | |
366 | - $file = isset( $trace['file'] ) ? $trace['file'] : '' ; |
|
367 | - $class = isset( $trace['class'] ) ? $trace['class'] : ''; |
|
368 | - $type = isset( $trace['type'] ) ? $trace['type'] : ''; |
|
369 | - $function = isset( $trace['function'] ) ? $trace['function'] : ''; |
|
370 | - $args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : ''; |
|
371 | - $line = isset( $trace['line'] ) ? $trace['line'] : ''; |
|
366 | + $file = isset($trace['file']) ? $trace['file'] : ''; |
|
367 | + $class = isset($trace['class']) ? $trace['class'] : ''; |
|
368 | + $type = isset($trace['type']) ? $trace['type'] : ''; |
|
369 | + $function = isset($trace['function']) ? $trace['function'] : ''; |
|
370 | + $args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : ''; |
|
371 | + $line = isset($trace['line']) ? $trace['line'] : ''; |
|
372 | 372 | $zebra = $nmbr % 2 ? ' odd' : ''; |
373 | 373 | |
374 | - if ( empty( $file ) && ! empty( $class )) { |
|
375 | - $a = new ReflectionClass( $class ); |
|
374 | + if (empty($file) && ! empty($class)) { |
|
375 | + $a = new ReflectionClass($class); |
|
376 | 376 | $file = $a->getFileName(); |
377 | - if ( empty( $line ) && ! empty( $function )) { |
|
378 | - $b = new ReflectionMethod( $class, $function ); |
|
377 | + if (empty($line) && ! empty($function)) { |
|
378 | + $b = new ReflectionMethod($class, $function); |
|
379 | 379 | $line = $b->getStartLine(); |
380 | 380 | } |
381 | 381 | } |
382 | 382 | |
383 | - if ( $nmbr == $last_on_stack ) { |
|
383 | + if ($nmbr == $last_on_stack) { |
|
384 | 384 | $file = $ex['file'] != '' ? $ex['file'] : $file; |
385 | 385 | $line = $ex['line'] != '' ? $ex['line'] : $line; |
386 | - $error_code = self::generate_error_code ( $file, $trace['function'], $line ); |
|
386 | + $error_code = self::generate_error_code($file, $trace['function'], $line); |
|
387 | 387 | } |
388 | 388 | |
389 | - $nmbr_dsply = ! empty( $nmbr ) ? $nmbr : ' '; |
|
390 | - $line_dsply = ! empty( $line ) ? $line : ' '; |
|
391 | - $file_dsply = ! empty( $file ) ? $file : ' '; |
|
392 | - $class_dsply = ! empty( $class ) ? $class : ' '; |
|
393 | - $type_dsply = ! empty( $type ) ? $type : ' '; |
|
394 | - $function_dsply = ! empty( $function ) ? $function : ' '; |
|
395 | - $args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : ''; |
|
389 | + $nmbr_dsply = ! empty($nmbr) ? $nmbr : ' '; |
|
390 | + $line_dsply = ! empty($line) ? $line : ' '; |
|
391 | + $file_dsply = ! empty($file) ? $file : ' '; |
|
392 | + $class_dsply = ! empty($class) ? $class : ' '; |
|
393 | + $type_dsply = ! empty($type) ? $type : ' '; |
|
394 | + $function_dsply = ! empty($function) ? $function : ' '; |
|
395 | + $args_dsply = ! empty($args) ? '( '.$args.' )' : ''; |
|
396 | 396 | |
397 | 397 | $trace_details .= ' |
398 | 398 | <tr> |
399 | - <td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td> |
|
400 | - <td align="right" class="' . $zebra . '">' . $line_dsply . '</td> |
|
401 | - <td align="left" class="' . $zebra . '">' . $file_dsply . '</td> |
|
402 | - <td align="left" class="' . $zebra . '">' . $class_dsply . '</td> |
|
403 | - <td align="left" class="' . $zebra . '">' . $type_dsply . $function_dsply . $args_dsply . '</td> |
|
399 | + <td align="right" class="' . $zebra.'">'.$nmbr_dsply.'</td> |
|
400 | + <td align="right" class="' . $zebra.'">'.$line_dsply.'</td> |
|
401 | + <td align="left" class="' . $zebra.'">'.$file_dsply.'</td> |
|
402 | + <td align="left" class="' . $zebra.'">'.$class_dsply.'</td> |
|
403 | + <td align="left" class="' . $zebra.'">'.$type_dsply.$function_dsply.$args_dsply.'</td> |
|
404 | 404 | </tr>'; |
405 | 405 | |
406 | 406 | |
@@ -415,9 +415,9 @@ discard block |
||
415 | 415 | $ex['code'] = $ex['code'] ? $ex['code'] : $error_code; |
416 | 416 | |
417 | 417 | // add generic non-identifying messages for non-privileged uesrs |
418 | - if ( ! WP_DEBUG ) { |
|
418 | + if ( ! WP_DEBUG) { |
|
419 | 419 | |
420 | - $output .= '<span class="ee-error-user-msg-spn">' . trim( $ex['msg'] ) . '</span> <sup>' . $ex['code'] . '</sup><br />'; |
|
420 | + $output .= '<span class="ee-error-user-msg-spn">'.trim($ex['msg']).'</span> <sup>'.$ex['code'].'</sup><br />'; |
|
421 | 421 | |
422 | 422 | } else { |
423 | 423 | |
@@ -425,24 +425,24 @@ discard block |
||
425 | 425 | $output .= ' |
426 | 426 | <div class="ee-error-dev-msg-dv"> |
427 | 427 | <p class="ee-error-dev-msg-pg"> |
428 | - <strong class="ee-error-dev-msg-str">An ' . $ex['name'] . ' exception was thrown!</strong> <span>code: ' . $ex['code'] . '</span><br /> |
|
429 | - <span class="big-text">"' . trim( $ex['msg'] ) . '"</span><br/> |
|
430 | - <a id="display-ee-error-trace-' . self::$_error_count . $time . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-' . self::$_error_count . $time . '"> |
|
431 | - ' . __( 'click to view backtrace and class/method details', 'event_espresso' ) . ' |
|
428 | + <strong class="ee-error-dev-msg-str">An ' . $ex['name'].' exception was thrown!</strong> <span>code: '.$ex['code'].'</span><br /> |
|
429 | + <span class="big-text">"' . trim($ex['msg']).'"</span><br/> |
|
430 | + <a id="display-ee-error-trace-' . self::$_error_count.$time.'" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-'.self::$_error_count.$time.'"> |
|
431 | + ' . __('click to view backtrace and class/method details', 'event_espresso').' |
|
432 | 432 | </a><br /> |
433 | 433 | <span class="small-text lt-grey-text">'.$ex['file'].' ( line no: '.$ex['line'].' )</span> |
434 | 434 | </p> |
435 | - <div id="ee-error-trace-' . self::$_error_count . $time . '-dv" class="ee-error-trace-dv" style="display: none;"> |
|
435 | + <div id="ee-error-trace-' . self::$_error_count.$time.'-dv" class="ee-error-trace-dv" style="display: none;"> |
|
436 | 436 | ' . $trace_details; |
437 | 437 | |
438 | - if ( ! empty( $class )) { |
|
438 | + if ( ! empty($class)) { |
|
439 | 439 | $output .= ' |
440 | 440 | <div style="padding:3px; margin:0 0 1em; border:1px solid #666; background:#fff; border-radius:3px;"> |
441 | 441 | <div style="padding:1em 2em; border:1px solid #666; background:#f9f9f9;"> |
442 | 442 | <h3>Class Details</h3>'; |
443 | - $a = new ReflectionClass( $class ); |
|
443 | + $a = new ReflectionClass($class); |
|
444 | 444 | $output .= ' |
445 | - <pre>' . $a . '</pre> |
|
445 | + <pre>' . $a.'</pre> |
|
446 | 446 | </div> |
447 | 447 | </div>'; |
448 | 448 | } |
@@ -454,14 +454,14 @@ discard block |
||
454 | 454 | |
455 | 455 | } |
456 | 456 | |
457 | - $this->write_to_error_log( $time, $ex ); |
|
457 | + $this->write_to_error_log($time, $ex); |
|
458 | 458 | |
459 | 459 | } |
460 | 460 | |
461 | 461 | // remove last linebreak |
462 | - $output = substr( $output, 0, ( count( $output ) - 7 )); |
|
462 | + $output = substr($output, 0, (count($output) - 7)); |
|
463 | 463 | |
464 | - if ( ! WP_DEBUG ) { |
|
464 | + if ( ! WP_DEBUG) { |
|
465 | 465 | $output .= ' |
466 | 466 | </p>'; |
467 | 467 | } |
@@ -469,10 +469,10 @@ discard block |
||
469 | 469 | $output .= ' |
470 | 470 | </div>'; |
471 | 471 | |
472 | - $output .= self::_print_scripts( TRUE ); |
|
472 | + $output .= self::_print_scripts(TRUE); |
|
473 | 473 | |
474 | - if ( defined( 'DOING_AJAX' )) { |
|
475 | - echo json_encode( array( 'error' => $output )); |
|
474 | + if (defined('DOING_AJAX')) { |
|
475 | + echo json_encode(array('error' => $output)); |
|
476 | 476 | exit(); |
477 | 477 | } |
478 | 478 | |
@@ -492,29 +492,29 @@ discard block |
||
492 | 492 | * @ param array $arguments |
493 | 493 | * @ return string |
494 | 494 | */ |
495 | - private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) { |
|
495 | + private function _convert_args_to_string($arguments = array(), $array = FALSE) { |
|
496 | 496 | |
497 | 497 | $arg_string = ''; |
498 | - if ( ! empty( $arguments )) { |
|
498 | + if ( ! empty($arguments)) { |
|
499 | 499 | |
500 | 500 | $args = array(); |
501 | 501 | |
502 | - foreach ( $arguments as $arg ) { |
|
502 | + foreach ($arguments as $arg) { |
|
503 | 503 | |
504 | - if ( ! empty( $arg )) { |
|
504 | + if ( ! empty($arg)) { |
|
505 | 505 | |
506 | - if ( is_string( $arg )) { |
|
507 | - $args[] = " '" . $arg . "'"; |
|
508 | - } elseif ( is_array( $arg )) { |
|
509 | - $args[] = 'ARRAY(' . $this->_convert_args_to_string( $arg, TRUE ); |
|
510 | - } elseif ( is_null( $arg )) { |
|
506 | + if (is_string($arg)) { |
|
507 | + $args[] = " '".$arg."'"; |
|
508 | + } elseif (is_array($arg)) { |
|
509 | + $args[] = 'ARRAY('.$this->_convert_args_to_string($arg, TRUE); |
|
510 | + } elseif (is_null($arg)) { |
|
511 | 511 | $args[] = ' NULL'; |
512 | - } elseif ( is_bool( $arg )) { |
|
513 | - $args[] = ( $arg ) ? ' TRUE' : ' FALSE'; |
|
514 | - } elseif ( is_object( $arg )) { |
|
515 | - $args[] = ' OBJECT ' . get_class( $arg ); |
|
516 | - } elseif ( is_resource( $arg )) { |
|
517 | - $args[] = get_resource_type( $arg ); |
|
512 | + } elseif (is_bool($arg)) { |
|
513 | + $args[] = ($arg) ? ' TRUE' : ' FALSE'; |
|
514 | + } elseif (is_object($arg)) { |
|
515 | + $args[] = ' OBJECT '.get_class($arg); |
|
516 | + } elseif (is_resource($arg)) { |
|
517 | + $args[] = get_resource_type($arg); |
|
518 | 518 | } else { |
519 | 519 | $args[] = $arg; |
520 | 520 | } |
@@ -522,9 +522,9 @@ discard block |
||
522 | 522 | } |
523 | 523 | |
524 | 524 | } |
525 | - $arg_string = implode( ', ', $args ); |
|
525 | + $arg_string = implode(', ', $args); |
|
526 | 526 | } |
527 | - if ( $array ) { |
|
527 | + if ($array) { |
|
528 | 528 | $arg_string .= ' )'; |
529 | 529 | } |
530 | 530 | return $arg_string; |
@@ -544,8 +544,8 @@ discard block |
||
544 | 544 | * @param string $line the line number where the error occurred - just use __LINE__ |
545 | 545 | * @return void |
546 | 546 | */ |
547 | - public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
|
548 | - self::_add_notice ( 'errors', $msg, $file, $func, $line ); |
|
547 | + public static function add_error($msg = NULL, $file = NULL, $func = NULL, $line = NULL) { |
|
548 | + self::_add_notice('errors', $msg, $file, $func, $line); |
|
549 | 549 | } |
550 | 550 | |
551 | 551 | |
@@ -562,8 +562,8 @@ discard block |
||
562 | 562 | * @param string $line the line number where the error occurred - just use __LINE__ |
563 | 563 | * @return void |
564 | 564 | */ |
565 | - public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
|
566 | - self::_add_notice ( 'success', $msg, $file, $func, $line ); |
|
565 | + public static function add_success($msg = NULL, $file = NULL, $func = NULL, $line = NULL) { |
|
566 | + self::_add_notice('success', $msg, $file, $func, $line); |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | |
@@ -580,8 +580,8 @@ discard block |
||
580 | 580 | * @param string $line the line number where the error occurred - just use __LINE__ |
581 | 581 | * @return void |
582 | 582 | */ |
583 | - public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
|
584 | - self::_add_notice ( 'attention', $msg, $file, $func, $line ); |
|
583 | + public static function add_attention($msg = NULL, $file = NULL, $func = NULL, $line = NULL) { |
|
584 | + self::_add_notice('attention', $msg, $file, $func, $line); |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | |
@@ -599,12 +599,12 @@ discard block |
||
599 | 599 | * @param string $line the line number where the error occurred - just use __LINE__ |
600 | 600 | * @return void |
601 | 601 | */ |
602 | - private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
|
603 | - if ( empty( $msg )) { |
|
602 | + private static function _add_notice($type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL) { |
|
603 | + if (empty($msg)) { |
|
604 | 604 | EE_Error::doing_it_wrong( |
605 | - 'EE_Error::add_' . $type . '()', |
|
605 | + 'EE_Error::add_'.$type.'()', |
|
606 | 606 | sprintf( |
607 | - __( 'Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso' ), |
|
607 | + __('Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso'), |
|
608 | 608 | $type, |
609 | 609 | $file, |
610 | 610 | $line |
@@ -612,26 +612,26 @@ discard block |
||
612 | 612 | EVENT_ESPRESSO_VERSION |
613 | 613 | ); |
614 | 614 | } |
615 | - if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) { |
|
615 | + if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) { |
|
616 | 616 | EE_Error::doing_it_wrong( |
617 | 617 | 'EE_Error::add_error()', |
618 | - __('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ), |
|
618 | + __('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'), |
|
619 | 619 | EVENT_ESPRESSO_VERSION |
620 | 620 | ); |
621 | 621 | } |
622 | 622 | // get separate user and developer messages if they exist |
623 | - $msg = explode( '||', $msg ); |
|
623 | + $msg = explode('||', $msg); |
|
624 | 624 | $user_msg = $msg[0]; |
625 | - $dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0]; |
|
625 | + $dev_msg = isset($msg[1]) ? $msg[1] : $msg[0]; |
|
626 | 626 | $msg = WP_DEBUG ? $dev_msg : $user_msg; |
627 | 627 | // add notice if message exists |
628 | - if ( ! empty( $msg )) { |
|
628 | + if ( ! empty($msg)) { |
|
629 | 629 | // get error code only on error |
630 | - $error_code = $type == 'errors' ? EE_Error::generate_error_code ( $file, $func, $line ) : ''; |
|
631 | - $error_code = ! empty( $error_code ) ? '<br/><span class="tiny-text">' . $error_code . '</span>' : ''; |
|
630 | + $error_code = $type == 'errors' ? EE_Error::generate_error_code($file, $func, $line) : ''; |
|
631 | + $error_code = ! empty($error_code) ? '<br/><span class="tiny-text">'.$error_code.'</span>' : ''; |
|
632 | 632 | // add notice |
633 | - self::$_espresso_notices[ $type ][] = $msg . $error_code; |
|
634 | - add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 ); |
|
633 | + self::$_espresso_notices[$type][] = $msg.$error_code; |
|
634 | + add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1); |
|
635 | 635 | } |
636 | 636 | |
637 | 637 | } |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | * @access private |
686 | 686 | * @return void |
687 | 687 | */ |
688 | - public static function reset_notices(){ |
|
688 | + public static function reset_notices() { |
|
689 | 689 | self::$_espresso_notices['success'] = FALSE; |
690 | 690 | self::$_espresso_notices['attention'] = FALSE; |
691 | 691 | self::$_espresso_notices['errors'] = FALSE; |
@@ -698,14 +698,14 @@ discard block |
||
698 | 698 | * @access public |
699 | 699 | * @return int |
700 | 700 | */ |
701 | - public static function has_notices(){ |
|
701 | + public static function has_notices() { |
|
702 | 702 | $has_notices = 0; |
703 | 703 | // check for success messages |
704 | - $has_notices = self::$_espresso_notices['success'] && ! empty( self::$_espresso_notices['success'] ) ? 3 : $has_notices; |
|
704 | + $has_notices = self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success']) ? 3 : $has_notices; |
|
705 | 705 | // check for attention messages |
706 | - $has_notices = self::$_espresso_notices['attention'] && ! empty( self::$_espresso_notices['attention'] ) ? 2 : $has_notices; |
|
706 | + $has_notices = self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention']) ? 2 : $has_notices; |
|
707 | 707 | // check for error messages |
708 | - $has_notices = self::$_espresso_notices['errors'] && ! empty( self::$_espresso_notices['errors'] ) ? 1 : $has_notices; |
|
708 | + $has_notices = self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors']) ? 1 : $has_notices; |
|
709 | 709 | return $has_notices; |
710 | 710 | } |
711 | 711 | |
@@ -720,8 +720,8 @@ discard block |
||
720 | 720 | * @param boolean $remove_empty whether or not to unset empty messages |
721 | 721 | * @return array |
722 | 722 | */ |
723 | - public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) { |
|
724 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
723 | + public static function get_notices($format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE) { |
|
724 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
725 | 725 | |
726 | 726 | $success_messages = ''; |
727 | 727 | $attention_messages = ''; |
@@ -731,44 +731,44 @@ discard block |
||
731 | 731 | // EEH_Debug_Tools::printr( self::$_espresso_notices, 'espresso_notices <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
732 | 732 | |
733 | 733 | // either save notices to the db |
734 | - if ( $save_to_transient ) { |
|
735 | - update_option( 'ee_notices', self::$_espresso_notices ); |
|
734 | + if ($save_to_transient) { |
|
735 | + update_option('ee_notices', self::$_espresso_notices); |
|
736 | 736 | return; |
737 | 737 | } |
738 | 738 | // grab any notices that have been previously saved |
739 | - if ( $notices = get_option( 'ee_notices', FALSE )) { |
|
740 | - foreach ( $notices as $type => $notice ) { |
|
741 | - if ( is_array( $notice ) && ! empty( $notice )) { |
|
739 | + if ($notices = get_option('ee_notices', FALSE)) { |
|
740 | + foreach ($notices as $type => $notice) { |
|
741 | + if (is_array($notice) && ! empty($notice)) { |
|
742 | 742 | // make sure that existsing notice type is an array |
743 | - self::$_espresso_notices[ $type ] = is_array( self::$_espresso_notices[ $type ] ) && ! empty( self::$_espresso_notices[ $type ] ) ? self::$_espresso_notices[ $type ] : array(); |
|
743 | + self::$_espresso_notices[$type] = is_array(self::$_espresso_notices[$type]) && ! empty(self::$_espresso_notices[$type]) ? self::$_espresso_notices[$type] : array(); |
|
744 | 744 | // merge stored notices with any newly created ones |
745 | - self::$_espresso_notices[ $type ] = array_merge( self::$_espresso_notices[ $type ], $notice ); |
|
745 | + self::$_espresso_notices[$type] = array_merge(self::$_espresso_notices[$type], $notice); |
|
746 | 746 | $print_scripts = TRUE; |
747 | 747 | } |
748 | 748 | } |
749 | 749 | // now clear any stored notices |
750 | - update_option( 'ee_notices', FALSE ); |
|
750 | + update_option('ee_notices', FALSE); |
|
751 | 751 | } |
752 | 752 | |
753 | 753 | // check for success messages |
754 | - if ( self::$_espresso_notices['success'] && ! empty( self::$_espresso_notices['success'] )) { |
|
754 | + if (self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success'])) { |
|
755 | 755 | // combine messages |
756 | - $success_messages .= implode( self::$_espresso_notices['success'], '<br />' ); |
|
756 | + $success_messages .= implode(self::$_espresso_notices['success'], '<br />'); |
|
757 | 757 | $print_scripts = TRUE; |
758 | 758 | } |
759 | 759 | |
760 | 760 | // check for attention messages |
761 | - if ( self::$_espresso_notices['attention'] && ! empty( self::$_espresso_notices['attention'] ) ) { |
|
761 | + if (self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention'])) { |
|
762 | 762 | // combine messages |
763 | - $attention_messages .= implode( self::$_espresso_notices['attention'], '<br />' ); |
|
763 | + $attention_messages .= implode(self::$_espresso_notices['attention'], '<br />'); |
|
764 | 764 | $print_scripts = TRUE; |
765 | 765 | } |
766 | 766 | |
767 | 767 | // check for error messages |
768 | - if ( self::$_espresso_notices['errors'] && ! empty( self::$_espresso_notices['errors'] ) ) { |
|
769 | - $error_messages .= count( self::$_espresso_notices['errors'] ) > 1 ? __( 'The following errors have occurred:<br />', 'event_espresso' ) : __( 'An error has occurred:<br />', 'event_espresso' ); |
|
768 | + if (self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors'])) { |
|
769 | + $error_messages .= count(self::$_espresso_notices['errors']) > 1 ? __('The following errors have occurred:<br />', 'event_espresso') : __('An error has occurred:<br />', 'event_espresso'); |
|
770 | 770 | // combine messages |
771 | - $error_messages .= implode( self::$_espresso_notices['errors'], '<br />' ); |
|
771 | + $error_messages .= implode(self::$_espresso_notices['errors'], '<br />'); |
|
772 | 772 | $print_scripts = TRUE; |
773 | 773 | } |
774 | 774 | |
@@ -782,21 +782,21 @@ discard block |
||
782 | 782 | $css_id = is_admin() ? 'message' : 'espresso-notices-success'; |
783 | 783 | $css_class = is_admin() ? 'updated fade' : 'success fade-away'; |
784 | 784 | //showMessage( $success_messages ); |
785 | - $notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $success_messages . '</p>' . $close . '</div>'; |
|
785 | + $notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$success_messages.'</p>'.$close.'</div>'; |
|
786 | 786 | } |
787 | 787 | |
788 | 788 | if ($attention_messages != '') { |
789 | 789 | $css_id = is_admin() ? 'message' : 'espresso-notices-attention'; |
790 | 790 | $css_class = is_admin() ? 'updated ee-notices-attention' : 'attention fade-away'; |
791 | 791 | //showMessage( $error_messages, TRUE ); |
792 | - $notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $attention_messages . '</p>' . $close . '</div>'; |
|
792 | + $notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$attention_messages.'</p>'.$close.'</div>'; |
|
793 | 793 | } |
794 | 794 | |
795 | 795 | if ($error_messages != '') { |
796 | 796 | $css_id = is_admin() ? 'message' : 'espresso-notices-error'; |
797 | 797 | $css_class = is_admin() ? 'error' : 'error fade-away'; |
798 | 798 | //showMessage( $error_messages, TRUE ); |
799 | - $notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $error_messages . '</p>' . $close . '</div>'; |
|
799 | + $notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$error_messages.'</p>'.$close.'</div>'; |
|
800 | 800 | } |
801 | 801 | |
802 | 802 | $notices .= '</div>'; |
@@ -809,7 +809,7 @@ discard block |
||
809 | 809 | 'errors' => $error_messages |
810 | 810 | ); |
811 | 811 | |
812 | - if ( $remove_empty ) { |
|
812 | + if ($remove_empty) { |
|
813 | 813 | // remove empty notices |
814 | 814 | foreach ($notices as $type => $notice) { |
815 | 815 | if (empty($notice)) { |
@@ -819,7 +819,7 @@ discard block |
||
819 | 819 | } |
820 | 820 | } |
821 | 821 | |
822 | - if ( $print_scripts ) { |
|
822 | + if ($print_scripts) { |
|
823 | 823 | self::_print_scripts(); |
824 | 824 | } |
825 | 825 | |
@@ -839,17 +839,17 @@ discard block |
||
839 | 839 | * @param bool $force_update allows one to enforce the reappearance of a persistent message. |
840 | 840 | * @return void |
841 | 841 | */ |
842 | - public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) { |
|
843 | - if ( ! empty( $pan_name ) && ! empty( $pan_message )) { |
|
844 | - $persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() ); |
|
842 | + public static function add_persistent_admin_notice($pan_name = '', $pan_message, $force_update = FALSE) { |
|
843 | + if ( ! empty($pan_name) && ! empty($pan_message)) { |
|
844 | + $persistent_admin_notices = get_option('ee_pers_admin_notices', array()); |
|
845 | 845 | //maybe initialize persistent_admin_notices |
846 | - if ( empty( $persistent_admin_notices )) { |
|
847 | - add_option( 'ee_pers_admin_notices', array(), '', 'no' ); |
|
846 | + if (empty($persistent_admin_notices)) { |
|
847 | + add_option('ee_pers_admin_notices', array(), '', 'no'); |
|
848 | 848 | } |
849 | - $pan_name = sanitize_key( $pan_name ); |
|
850 | - if ( ! array_key_exists( $pan_name, $persistent_admin_notices ) || $force_update ) { |
|
851 | - $persistent_admin_notices[ $pan_name ] = $pan_message; |
|
852 | - update_option( 'ee_pers_admin_notices', $persistent_admin_notices ); |
|
849 | + $pan_name = sanitize_key($pan_name); |
|
850 | + if ( ! array_key_exists($pan_name, $persistent_admin_notices) || $force_update) { |
|
851 | + $persistent_admin_notices[$pan_name] = $pan_message; |
|
852 | + update_option('ee_pers_admin_notices', $persistent_admin_notices); |
|
853 | 853 | } |
854 | 854 | } |
855 | 855 | } |
@@ -865,34 +865,34 @@ discard block |
||
865 | 865 | * @param bool $return_immediately |
866 | 866 | * @return void |
867 | 867 | */ |
868 | - public static function dismiss_persistent_admin_notice( $pan_name = '', $purge = FALSE, $return_immediately = FALSE ) { |
|
869 | - $pan_name = EE_Registry::instance()->REQ->is_set( 'ee_nag_notice' ) ? EE_Registry::instance()->REQ->get( 'ee_nag_notice' ) : $pan_name; |
|
870 | - if ( ! empty( $pan_name )) { |
|
871 | - $persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() ); |
|
868 | + public static function dismiss_persistent_admin_notice($pan_name = '', $purge = FALSE, $return_immediately = FALSE) { |
|
869 | + $pan_name = EE_Registry::instance()->REQ->is_set('ee_nag_notice') ? EE_Registry::instance()->REQ->get('ee_nag_notice') : $pan_name; |
|
870 | + if ( ! empty($pan_name)) { |
|
871 | + $persistent_admin_notices = get_option('ee_pers_admin_notices', array()); |
|
872 | 872 | // check if notice we wish to dismiss is actually in the $persistent_admin_notices array |
873 | - if ( is_array( $persistent_admin_notices ) && isset( $persistent_admin_notices[ $pan_name ] )) { |
|
873 | + if (is_array($persistent_admin_notices) && isset($persistent_admin_notices[$pan_name])) { |
|
874 | 874 | // completely delete nag notice, or just NULL message so that it can NOT be added again ? |
875 | - if ( $purge ) { |
|
876 | - unset( $persistent_admin_notices[ $pan_name ] ); |
|
875 | + if ($purge) { |
|
876 | + unset($persistent_admin_notices[$pan_name]); |
|
877 | 877 | } else { |
878 | - $persistent_admin_notices[ $pan_name ] = NULL; |
|
878 | + $persistent_admin_notices[$pan_name] = NULL; |
|
879 | 879 | } |
880 | - if ( update_option( 'ee_pers_admin_notices', $persistent_admin_notices ) === FALSE ) { |
|
881 | - EE_Error::add_error( sprintf( __( 'The persistent admin notice for "%s" could not be deleted.', 'event_espresso' ), $pan_name ), __FILE__, __FUNCTION__, __LINE__ ); |
|
880 | + if (update_option('ee_pers_admin_notices', $persistent_admin_notices) === FALSE) { |
|
881 | + EE_Error::add_error(sprintf(__('The persistent admin notice for "%s" could not be deleted.', 'event_espresso'), $pan_name), __FILE__, __FUNCTION__, __LINE__); |
|
882 | 882 | } |
883 | 883 | } |
884 | 884 | } |
885 | - if ( $return_immediately ) { |
|
885 | + if ($return_immediately) { |
|
886 | 886 | return; |
887 | - } else if ( EE_Registry::instance()->REQ->ajax ) { |
|
887 | + } else if (EE_Registry::instance()->REQ->ajax) { |
|
888 | 888 | // grab any notices and concatenate into string |
889 | - echo json_encode( array( 'errors' => implode( '<br />', EE_Error::get_notices( FALSE )))); |
|
889 | + echo json_encode(array('errors' => implode('<br />', EE_Error::get_notices(FALSE)))); |
|
890 | 890 | exit(); |
891 | 891 | } else { |
892 | 892 | // save errors to a transient to be displayed on next request (after redirect) |
893 | - EE_Error::get_notices( FALSE, TRUE ); |
|
894 | - $return_url = EE_Registry::instance()->REQ->is_set( 'return_url' ) ? EE_Registry::instance()->REQ->get( 'return_url' ) : ''; |
|
895 | - wp_safe_redirect( urldecode( $return_url )); |
|
893 | + EE_Error::get_notices(FALSE, TRUE); |
|
894 | + $return_url = EE_Registry::instance()->REQ->is_set('return_url') ? EE_Registry::instance()->REQ->get('return_url') : ''; |
|
895 | + wp_safe_redirect(urldecode($return_url)); |
|
896 | 896 | } |
897 | 897 | } |
898 | 898 | |
@@ -907,20 +907,20 @@ discard block |
||
907 | 907 | * @param string $return_url URL to go back to aftger nag notice is dismissed |
908 | 908 | * @return string |
909 | 909 | */ |
910 | - public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) { |
|
911 | - if ( ! empty( $pan_name ) && ! empty( $pan_message )) { |
|
910 | + public static function display_persistent_admin_notices($pan_name = '', $pan_message = '', $return_url = '') { |
|
911 | + if ( ! empty($pan_name) && ! empty($pan_message)) { |
|
912 | 912 | $args = array( |
913 | 913 | 'nag_notice' => $pan_name, |
914 | - 'return_url' => urlencode( $return_url ), |
|
914 | + 'return_url' => urlencode($return_url), |
|
915 | 915 | 'ajax_url' => WP_AJAX_URL, |
916 | - 'unknown_error' => __( 'An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso' ) |
|
916 | + 'unknown_error' => __('An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso') |
|
917 | 917 | ); |
918 | - wp_localize_script( 'espresso_core', 'ee_dismiss', $args ); |
|
918 | + wp_localize_script('espresso_core', 'ee_dismiss', $args); |
|
919 | 919 | return ' |
920 | - <div id="' . $pan_name . '" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;"> |
|
921 | - <p>' . $pan_message . '</p> |
|
922 | - <a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name . '"> |
|
923 | - <span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__( 'Dismiss', 'event_espresso' ) .' |
|
920 | + <div id="' . $pan_name.'" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;"> |
|
921 | + <p>' . $pan_message.'</p> |
|
922 | + <a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name.'"> |
|
923 | + <span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__('Dismiss', 'event_espresso').' |
|
924 | 924 | </a> |
925 | 925 | <div style="clear:both;"></div> |
926 | 926 | </div>'; |
@@ -936,17 +936,17 @@ discard block |
||
936 | 936 | * @param string $return_url |
937 | 937 | * @return array |
938 | 938 | */ |
939 | - public static function get_persistent_admin_notices( $return_url = '' ) { |
|
939 | + public static function get_persistent_admin_notices($return_url = '') { |
|
940 | 940 | $notices = ''; |
941 | 941 | // check for persistent admin notices |
942 | - if ( $persistent_admin_notices = get_option( 'ee_pers_admin_notices', FALSE )) { |
|
942 | + if ($persistent_admin_notices = get_option('ee_pers_admin_notices', FALSE)) { |
|
943 | 943 | // load scripts |
944 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
945 | - wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
946 | - wp_enqueue_script( 'ee_error_js' ); |
|
944 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
945 | + wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE); |
|
946 | + wp_enqueue_script('ee_error_js'); |
|
947 | 947 | // and display notices |
948 | - foreach( $persistent_admin_notices as $pan_name => $pan_message ) { |
|
949 | - $notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url ); |
|
948 | + foreach ($persistent_admin_notices as $pan_name => $pan_message) { |
|
949 | + $notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url); |
|
950 | 950 | } |
951 | 951 | } |
952 | 952 | return $notices; |
@@ -961,26 +961,26 @@ discard block |
||
961 | 961 | * @param bool $force_print |
962 | 962 | * @return void |
963 | 963 | */ |
964 | - private static function _print_scripts( $force_print = FALSE ) { |
|
965 | - if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) { |
|
966 | - if ( wp_script_is( 'ee_error_js', 'enqueued' )) { |
|
964 | + private static function _print_scripts($force_print = FALSE) { |
|
965 | + if ((did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts')) && ! $force_print) { |
|
966 | + if (wp_script_is('ee_error_js', 'enqueued')) { |
|
967 | 967 | return; |
968 | - } else if ( wp_script_is( 'ee_error_js', 'registered' )) { |
|
969 | - add_filter( 'FHEE_load_css', '__return_true' ); |
|
970 | - add_filter( 'FHEE_load_js', '__return_true' ); |
|
971 | - wp_enqueue_script( 'ee_error_js' ); |
|
972 | - wp_localize_script( 'ee_error_js','ee_settings', array( 'wp_debug'=>WP_DEBUG )); |
|
968 | + } else if (wp_script_is('ee_error_js', 'registered')) { |
|
969 | + add_filter('FHEE_load_css', '__return_true'); |
|
970 | + add_filter('FHEE_load_js', '__return_true'); |
|
971 | + wp_enqueue_script('ee_error_js'); |
|
972 | + wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug'=>WP_DEBUG)); |
|
973 | 973 | } |
974 | 974 | } else { |
975 | 975 | return ' |
976 | 976 | <script> |
977 | 977 | /* <![CDATA[ */ |
978 | -var ee_settings = {"wp_debug":"' . WP_DEBUG . '"}; |
|
978 | +var ee_settings = {"wp_debug":"' . WP_DEBUG.'"}; |
|
979 | 979 | /* ]]> */ |
980 | 980 | </script> |
981 | -<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script> |
|
982 | -<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script> |
|
983 | -<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script> |
|
981 | +<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script> |
|
982 | +<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script> |
|
983 | +<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script> |
|
984 | 984 | '; |
985 | 985 | |
986 | 986 | } |
@@ -1014,11 +1014,11 @@ discard block |
||
1014 | 1014 | * @ param string $line |
1015 | 1015 | * @ return string |
1016 | 1016 | */ |
1017 | - public static function generate_error_code ( $file = '', $func = '', $line = '' ) { |
|
1018 | - $file = explode( '.', basename( $file )); |
|
1019 | - $error_code = ! empty( $file[0] ) ? $file[0] : ''; |
|
1020 | - $error_code .= ! empty( $func ) ? ' - ' . $func : ''; |
|
1021 | - $error_code .= ! empty( $line ) ? ' - ' . $line : ''; |
|
1017 | + public static function generate_error_code($file = '', $func = '', $line = '') { |
|
1018 | + $file = explode('.', basename($file)); |
|
1019 | + $error_code = ! empty($file[0]) ? $file[0] : ''; |
|
1020 | + $error_code .= ! empty($func) ? ' - '.$func : ''; |
|
1021 | + $error_code .= ! empty($line) ? ' - '.$line : ''; |
|
1022 | 1022 | return $error_code; |
1023 | 1023 | } |
1024 | 1024 | |
@@ -1034,38 +1034,38 @@ discard block |
||
1034 | 1034 | * @ param object $ex |
1035 | 1035 | * @ return void |
1036 | 1036 | */ |
1037 | - public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) { |
|
1037 | + public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) { |
|
1038 | 1038 | |
1039 | - if ( ! $ex ) { |
|
1039 | + if ( ! $ex) { |
|
1040 | 1040 | return; |
1041 | 1041 | } |
1042 | 1042 | |
1043 | - if ( ! $time ) { |
|
1043 | + if ( ! $time) { |
|
1044 | 1044 | $time = time(); |
1045 | 1045 | } |
1046 | 1046 | |
1047 | - $exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL; |
|
1048 | - $exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . '] Exception Details' . PHP_EOL; |
|
1049 | - $exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL; |
|
1050 | - $exception_log .= 'Code: '. $ex['code'] . PHP_EOL; |
|
1051 | - $exception_log .= 'File: '. $ex['file'] . PHP_EOL; |
|
1052 | - $exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL; |
|
1053 | - $exception_log .= 'Stack trace: ' . PHP_EOL; |
|
1054 | - $exception_log .= $ex['string'] . PHP_EOL; |
|
1055 | - $exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL; |
|
1056 | - |
|
1057 | - EE_Registry::instance()->load_helper( 'File' ); |
|
1047 | + $exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL; |
|
1048 | + $exception_log .= '['.date('Y-m-d H:i:s', $time).'] Exception Details'.PHP_EOL; |
|
1049 | + $exception_log .= 'Message: '.$ex['msg'].PHP_EOL; |
|
1050 | + $exception_log .= 'Code: '.$ex['code'].PHP_EOL; |
|
1051 | + $exception_log .= 'File: '.$ex['file'].PHP_EOL; |
|
1052 | + $exception_log .= 'Line No: '.$ex['line'].PHP_EOL; |
|
1053 | + $exception_log .= 'Stack trace: '.PHP_EOL; |
|
1054 | + $exception_log .= $ex['string'].PHP_EOL; |
|
1055 | + $exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL; |
|
1056 | + |
|
1057 | + EE_Registry::instance()->load_helper('File'); |
|
1058 | 1058 | try { |
1059 | - EEH_File::ensure_folder_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' ); |
|
1060 | - EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' ); |
|
1061 | - EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ); |
|
1062 | - if ( ! $clear ) { |
|
1059 | + EEH_File::ensure_folder_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'); |
|
1060 | + EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs'); |
|
1061 | + EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file); |
|
1062 | + if ( ! $clear) { |
|
1063 | 1063 | //get existing log file and append new log info |
1064 | - $exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log; |
|
1064 | + $exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log; |
|
1065 | 1065 | } |
1066 | - EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log ); |
|
1067 | - } catch( EE_Error $e ){ |
|
1068 | - EE_Error::add_error( sprintf( __( 'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() )); |
|
1066 | + EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log); |
|
1067 | + } catch (EE_Error $e) { |
|
1068 | + EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage())); |
|
1069 | 1069 | return; |
1070 | 1070 | } |
1071 | 1071 | |
@@ -1088,10 +1088,10 @@ discard block |
||
1088 | 1088 | * @param string $version The version of Event Espresso where the error was added |
1089 | 1089 | * @return trigger_error() |
1090 | 1090 | */ |
1091 | - public static function doing_it_wrong( $function, $message, $version ) { |
|
1092 | - if ( defined('WP_DEBUG') && WP_DEBUG ) { |
|
1091 | + public static function doing_it_wrong($function, $message, $version) { |
|
1092 | + if (defined('WP_DEBUG') && WP_DEBUG) { |
|
1093 | 1093 | EE_Registry::instance()->load_helper('Debug_Tools'); |
1094 | - EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version ); |
|
1094 | + EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version); |
|
1095 | 1095 | } |
1096 | 1096 | } |
1097 | 1097 | |
@@ -1111,13 +1111,13 @@ discard block |
||
1111 | 1111 | */ |
1112 | 1112 | function espresso_error_enqueue_scripts() { |
1113 | 1113 | // js for error handling |
1114 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE ); |
|
1115 | - wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE ); |
|
1114 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE); |
|
1115 | + wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE); |
|
1116 | 1116 | } |
1117 | -if ( is_admin() ) { |
|
1118 | - add_action( 'admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 ); |
|
1117 | +if (is_admin()) { |
|
1118 | + add_action('admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2); |
|
1119 | 1119 | } else { |
1120 | - add_action( 'wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 ); |
|
1120 | + add_action('wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2); |
|
1121 | 1121 | } |
1122 | 1122 | |
1123 | 1123 |
@@ -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 | * |
@@ -18,52 +18,52 @@ discard block |
||
18 | 18 | |
19 | 19 | |
20 | 20 | /** |
21 | - * name of the file to log exceptions to |
|
22 | - * @access private |
|
23 | - * @var string |
|
24 | - */ |
|
21 | + * name of the file to log exceptions to |
|
22 | + * @access private |
|
23 | + * @var string |
|
24 | + */ |
|
25 | 25 | private static $_exception_log_file = 'espresso_error_log.txt'; |
26 | 26 | |
27 | 27 | /** |
28 | - * the exception |
|
29 | - * @access private |
|
30 | - * @var object |
|
31 | - */ |
|
28 | + * the exception |
|
29 | + * @access private |
|
30 | + * @var object |
|
31 | + */ |
|
32 | 32 | private $_exception; |
33 | 33 | |
34 | 34 | /** |
35 | - * stores details for all exception |
|
36 | - * @access private |
|
37 | - * @var array |
|
38 | - */ |
|
35 | + * stores details for all exception |
|
36 | + * @access private |
|
37 | + * @var array |
|
38 | + */ |
|
39 | 39 | private static $_all_exceptions = array(); |
40 | 40 | |
41 | 41 | /** |
42 | - * tracks number of errors |
|
43 | - * @access private |
|
44 | - * @var int |
|
45 | - */ |
|
42 | + * tracks number of errors |
|
43 | + * @access private |
|
44 | + * @var int |
|
45 | + */ |
|
46 | 46 | private static $_error_count = 0; |
47 | 47 | |
48 | 48 | /** |
49 | - * has JS been loaded ? |
|
50 | - * @access private |
|
51 | - * @var boolean |
|
52 | - */ |
|
49 | + * has JS been loaded ? |
|
50 | + * @access private |
|
51 | + * @var boolean |
|
52 | + */ |
|
53 | 53 | private static $_js_loaded = FALSE; |
54 | 54 | |
55 | 55 | /** |
56 | - * has shutdown action been added ? |
|
57 | - * @access private |
|
58 | - * @var boolean |
|
59 | - */ |
|
56 | + * has shutdown action been added ? |
|
57 | + * @access private |
|
58 | + * @var boolean |
|
59 | + */ |
|
60 | 60 | private static $_action_added = FALSE; |
61 | 61 | |
62 | 62 | /** |
63 | - * has shutdown action been added ? |
|
64 | - * @access private |
|
65 | - * @var boolean |
|
66 | - */ |
|
63 | + * has shutdown action been added ? |
|
64 | + * @access private |
|
65 | + * @var boolean |
|
66 | + */ |
|
67 | 67 | private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE ); |
68 | 68 | |
69 | 69 | |
@@ -71,10 +71,10 @@ discard block |
||
71 | 71 | |
72 | 72 | |
73 | 73 | /** |
74 | - * @override default exception handling |
|
75 | - * @access public |
|
76 | - * @echo string |
|
77 | - */ |
|
74 | + * @override default exception handling |
|
75 | + * @access public |
|
76 | + * @echo string |
|
77 | + */ |
|
78 | 78 | function __construct( $message, $code = 0, Exception $previous = NULL ) { |
79 | 79 | if ( version_compare( phpversion(), '5.3.0', '<' )) { |
80 | 80 | parent::__construct( $message, $code ); |
@@ -173,10 +173,10 @@ discard block |
||
173 | 173 | |
174 | 174 | |
175 | 175 | /** |
176 | - * fatal_error_handler |
|
177 | - * @access public |
|
178 | - * @return void |
|
179 | - */ |
|
176 | + * fatal_error_handler |
|
177 | + * @access public |
|
178 | + * @return void |
|
179 | + */ |
|
180 | 180 | public static function fatal_error_handler() { |
181 | 181 | $last_error = error_get_last(); |
182 | 182 | if ( $last_error['type'] === E_ERROR ) { |
@@ -221,11 +221,11 @@ discard block |
||
221 | 221 | |
222 | 222 | |
223 | 223 | /** |
224 | - * _add_actions |
|
225 | - * @access public |
|
226 | - * @return void |
|
227 | - */ |
|
228 | - public function get_error() { |
|
224 | + * _add_actions |
|
225 | + * @access public |
|
226 | + * @return void |
|
227 | + */ |
|
228 | + public function get_error() { |
|
229 | 229 | |
230 | 230 | if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){ |
231 | 231 | throw $this; |
@@ -255,22 +255,22 @@ discard block |
||
255 | 255 | |
256 | 256 | |
257 | 257 | /** |
258 | - * has_error |
|
259 | - * @access public |
|
260 | - * @return boolean |
|
261 | - */ |
|
262 | - public static function has_error(){ |
|
258 | + * has_error |
|
259 | + * @access public |
|
260 | + * @return boolean |
|
261 | + */ |
|
262 | + public static function has_error(){ |
|
263 | 263 | return self::$_error_count ? TRUE : FALSE; |
264 | 264 | } |
265 | 265 | |
266 | 266 | |
267 | 267 | |
268 | 268 | /** |
269 | - * display_errors |
|
270 | - * @access public |
|
271 | - * @echo string |
|
272 | - */ |
|
273 | - public function display_errors(){ |
|
269 | + * display_errors |
|
270 | + * @access public |
|
271 | + * @echo string |
|
272 | + */ |
|
273 | + public function display_errors(){ |
|
274 | 274 | |
275 | 275 | $trace_details = ''; |
276 | 276 | |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | // process trace info |
343 | 343 | if ( empty( $ex['trace'] )) { |
344 | 344 | |
345 | - $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' ); |
|
345 | + $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' ); |
|
346 | 346 | |
347 | 347 | } else { |
348 | 348 | |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | $function_dsply = ! empty( $function ) ? $function : ' '; |
395 | 395 | $args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : ''; |
396 | 396 | |
397 | - $trace_details .= ' |
|
397 | + $trace_details .= ' |
|
398 | 398 | <tr> |
399 | 399 | <td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td> |
400 | 400 | <td align="right" class="' . $zebra . '">' . $line_dsply . '</td> |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | |
407 | 407 | } |
408 | 408 | |
409 | - $trace_details .= ' |
|
409 | + $trace_details .= ' |
|
410 | 410 | </table> |
411 | 411 | </div>'; |
412 | 412 | |
@@ -486,12 +486,12 @@ discard block |
||
486 | 486 | |
487 | 487 | |
488 | 488 | /** |
489 | - * generate string from exception trace args |
|
490 | - * |
|
491 | - * @access private |
|
492 | - * @ param array $arguments |
|
493 | - * @ return string |
|
494 | - */ |
|
489 | + * generate string from exception trace args |
|
490 | + * |
|
491 | + * @access private |
|
492 | + * @ param array $arguments |
|
493 | + * @ return string |
|
494 | + */ |
|
495 | 495 | private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) { |
496 | 496 | |
497 | 497 | $arg_string = ''; |
@@ -535,15 +535,15 @@ discard block |
||
535 | 535 | |
536 | 536 | |
537 | 537 | /** |
538 | - * add error message |
|
539 | - * |
|
540 | - * @access public |
|
541 | - * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
542 | - * @param string $file the file that the error occurred in - just use __FILE__ |
|
543 | - * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
544 | - * @param string $line the line number where the error occurred - just use __LINE__ |
|
545 | - * @return void |
|
546 | - */ |
|
538 | + * add error message |
|
539 | + * |
|
540 | + * @access public |
|
541 | + * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
542 | + * @param string $file the file that the error occurred in - just use __FILE__ |
|
543 | + * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
544 | + * @param string $line the line number where the error occurred - just use __LINE__ |
|
545 | + * @return void |
|
546 | + */ |
|
547 | 547 | public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
548 | 548 | self::_add_notice ( 'errors', $msg, $file, $func, $line ); |
549 | 549 | self::$_error_count++; |
@@ -554,15 +554,15 @@ discard block |
||
554 | 554 | |
555 | 555 | |
556 | 556 | /** |
557 | - * add success message |
|
558 | - * |
|
559 | - * @access public |
|
560 | - * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
561 | - * @param string $file the file that the error occurred in - just use __FILE__ |
|
562 | - * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
563 | - * @param string $line the line number where the error occurred - just use __LINE__ |
|
564 | - * @return void |
|
565 | - */ |
|
557 | + * add success message |
|
558 | + * |
|
559 | + * @access public |
|
560 | + * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
561 | + * @param string $file the file that the error occurred in - just use __FILE__ |
|
562 | + * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
563 | + * @param string $line the line number where the error occurred - just use __LINE__ |
|
564 | + * @return void |
|
565 | + */ |
|
566 | 566 | public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
567 | 567 | self::_add_notice ( 'success', $msg, $file, $func, $line ); |
568 | 568 | } |
@@ -572,15 +572,15 @@ discard block |
||
572 | 572 | |
573 | 573 | |
574 | 574 | /** |
575 | - * add attention message |
|
576 | - * |
|
577 | - * @access public |
|
578 | - * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
579 | - * @param string $file the file that the error occurred in - just use __FILE__ |
|
580 | - * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
581 | - * @param string $line the line number where the error occurred - just use __LINE__ |
|
582 | - * @return void |
|
583 | - */ |
|
575 | + * add attention message |
|
576 | + * |
|
577 | + * @access public |
|
578 | + * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
579 | + * @param string $file the file that the error occurred in - just use __FILE__ |
|
580 | + * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
581 | + * @param string $line the line number where the error occurred - just use __LINE__ |
|
582 | + * @return void |
|
583 | + */ |
|
584 | 584 | public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
585 | 585 | self::_add_notice ( 'attention', $msg, $file, $func, $line ); |
586 | 586 | } |
@@ -590,16 +590,16 @@ discard block |
||
590 | 590 | |
591 | 591 | |
592 | 592 | /** |
593 | - * add success message |
|
594 | - * |
|
595 | - * @access public |
|
596 | - * @param string $type whether the message is for a success or error notification |
|
597 | - * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
598 | - * @param string $file the file that the error occurred in - just use __FILE__ |
|
599 | - * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
600 | - * @param string $line the line number where the error occurred - just use __LINE__ |
|
601 | - * @return void |
|
602 | - */ |
|
593 | + * add success message |
|
594 | + * |
|
595 | + * @access public |
|
596 | + * @param string $type whether the message is for a success or error notification |
|
597 | + * @param string $msg the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev |
|
598 | + * @param string $file the file that the error occurred in - just use __FILE__ |
|
599 | + * @param string $func the function/method that the error occurred in - just use __FUNCTION__ |
|
600 | + * @param string $line the line number where the error occurred - just use __LINE__ |
|
601 | + * @return void |
|
602 | + */ |
|
603 | 603 | private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) { |
604 | 604 | if ( empty( $msg )) { |
605 | 605 | EE_Error::doing_it_wrong( |
@@ -643,11 +643,11 @@ discard block |
||
643 | 643 | |
644 | 644 | |
645 | 645 | /** |
646 | - * in some case it may be necessary to overwrite the existing success messages |
|
647 | - * |
|
648 | - * @access public |
|
649 | - * @return void |
|
650 | - */ |
|
646 | + * in some case it may be necessary to overwrite the existing success messages |
|
647 | + * |
|
648 | + * @access public |
|
649 | + * @return void |
|
650 | + */ |
|
651 | 651 | public static function overwrite_success() { |
652 | 652 | self::$_espresso_notices['success'] = FALSE; |
653 | 653 | } |
@@ -657,11 +657,11 @@ discard block |
||
657 | 657 | |
658 | 658 | |
659 | 659 | /** |
660 | - * in some case it may be necessary to overwrite the existing attention messages |
|
661 | - * |
|
662 | - * @access public |
|
663 | - * @return void |
|
664 | - */ |
|
660 | + * in some case it may be necessary to overwrite the existing attention messages |
|
661 | + * |
|
662 | + * @access public |
|
663 | + * @return void |
|
664 | + */ |
|
665 | 665 | public static function overwrite_attention() { |
666 | 666 | self::$_espresso_notices['attention'] = FALSE; |
667 | 667 | } |
@@ -671,11 +671,11 @@ discard block |
||
671 | 671 | |
672 | 672 | |
673 | 673 | /** |
674 | - * in some case it may be necessary to overwrite the existing error messages |
|
675 | - * |
|
676 | - * @access public |
|
677 | - * @return void |
|
678 | - */ |
|
674 | + * in some case it may be necessary to overwrite the existing error messages |
|
675 | + * |
|
676 | + * @access public |
|
677 | + * @return void |
|
678 | + */ |
|
679 | 679 | public static function overwrite_errors() { |
680 | 680 | self::$_espresso_notices['errors'] = FALSE; |
681 | 681 | } |
@@ -683,24 +683,24 @@ discard block |
||
683 | 683 | |
684 | 684 | |
685 | 685 | /** |
686 | - * reset_notices |
|
687 | - * @access private |
|
688 | - * @return void |
|
689 | - */ |
|
686 | + * reset_notices |
|
687 | + * @access private |
|
688 | + * @return void |
|
689 | + */ |
|
690 | 690 | public static function reset_notices(){ |
691 | - self::$_espresso_notices['success'] = FALSE; |
|
692 | - self::$_espresso_notices['attention'] = FALSE; |
|
693 | - self::$_espresso_notices['errors'] = FALSE; |
|
694 | - } |
|
691 | + self::$_espresso_notices['success'] = FALSE; |
|
692 | + self::$_espresso_notices['attention'] = FALSE; |
|
693 | + self::$_espresso_notices['errors'] = FALSE; |
|
694 | + } |
|
695 | 695 | |
696 | 696 | |
697 | 697 | |
698 | 698 | /** |
699 | - * has_errors |
|
700 | - * @access public |
|
701 | - * @return int |
|
702 | - */ |
|
703 | - public static function has_notices(){ |
|
699 | + * has_errors |
|
700 | + * @access public |
|
701 | + * @return int |
|
702 | + */ |
|
703 | + public static function has_notices(){ |
|
704 | 704 | $has_notices = 0; |
705 | 705 | // check for success messages |
706 | 706 | $has_notices = self::$_espresso_notices['success'] && ! empty( self::$_espresso_notices['success'] ) ? 3 : $has_notices; |
@@ -714,14 +714,14 @@ discard block |
||
714 | 714 | |
715 | 715 | |
716 | 716 | /** |
717 | - * compile all error or success messages into one string |
|
718 | - * |
|
719 | - * @access public |
|
720 | - * @param boolean $format_output whether or not to format the messages for display in the WP admin |
|
721 | - * @param boolean $save_to_transient whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting |
|
722 | - * @param boolean $remove_empty whether or not to unset empty messages |
|
723 | - * @return array |
|
724 | - */ |
|
717 | + * compile all error or success messages into one string |
|
718 | + * |
|
719 | + * @access public |
|
720 | + * @param boolean $format_output whether or not to format the messages for display in the WP admin |
|
721 | + * @param boolean $save_to_transient whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting |
|
722 | + * @param boolean $remove_empty whether or not to unset empty messages |
|
723 | + * @return array |
|
724 | + */ |
|
725 | 725 | public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) { |
726 | 726 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
727 | 727 | |
@@ -833,14 +833,14 @@ discard block |
||
833 | 833 | |
834 | 834 | |
835 | 835 | /** |
836 | - * add_persistent_admin_notice |
|
837 | - * |
|
838 | - * @access public |
|
839 | - * @param string $pan_name the name, or key of the Persistent Admin Notice to be stored |
|
840 | - * @param string $pan_message the message to be stored persistently until dismissed |
|
841 | - * @param bool $force_update allows one to enforce the reappearance of a persistent message. |
|
842 | - * @return void |
|
843 | - */ |
|
836 | + * add_persistent_admin_notice |
|
837 | + * |
|
838 | + * @access public |
|
839 | + * @param string $pan_name the name, or key of the Persistent Admin Notice to be stored |
|
840 | + * @param string $pan_message the message to be stored persistently until dismissed |
|
841 | + * @param bool $force_update allows one to enforce the reappearance of a persistent message. |
|
842 | + * @return void |
|
843 | + */ |
|
844 | 844 | public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) { |
845 | 845 | if ( ! empty( $pan_name ) && ! empty( $pan_message )) { |
846 | 846 | $persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() ); |
@@ -904,9 +904,9 @@ discard block |
||
904 | 904 | * display_persistent_admin_notices |
905 | 905 | * |
906 | 906 | * @access public |
907 | - * @param string $pan_name the name, or key of the Persistent Admin Notice to be stored |
|
908 | - * @param string $pan_name the message to be stored persistently until dismissed |
|
909 | - * @param string $return_url URL to go back to aftger nag notice is dismissed |
|
907 | + * @param string $pan_name the name, or key of the Persistent Admin Notice to be stored |
|
908 | + * @param string $pan_name the message to be stored persistently until dismissed |
|
909 | + * @param string $return_url URL to go back to aftger nag notice is dismissed |
|
910 | 910 | * @return string |
911 | 911 | */ |
912 | 912 | public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) { |
@@ -995,11 +995,11 @@ discard block |
||
995 | 995 | |
996 | 996 | |
997 | 997 | /** |
998 | - * enqueue_error_scripts |
|
999 | - * |
|
1000 | - * @access public |
|
1001 | - * @return void |
|
1002 | - */ |
|
998 | + * enqueue_error_scripts |
|
999 | + * |
|
1000 | + * @access public |
|
1001 | + * @return void |
|
1002 | + */ |
|
1003 | 1003 | public static function enqueue_error_scripts() { |
1004 | 1004 | self::_print_scripts(); |
1005 | 1005 | } |
@@ -1007,15 +1007,15 @@ discard block |
||
1007 | 1007 | |
1008 | 1008 | |
1009 | 1009 | /** |
1010 | - * create error code from filepath, function name, |
|
1011 | - * and line number where exception or error was thrown |
|
1012 | - * |
|
1013 | - * @access public |
|
1014 | - * @ param string $file |
|
1015 | - * @ param string $func |
|
1016 | - * @ param string $line |
|
1017 | - * @ return string |
|
1018 | - */ |
|
1010 | + * create error code from filepath, function name, |
|
1011 | + * and line number where exception or error was thrown |
|
1012 | + * |
|
1013 | + * @access public |
|
1014 | + * @ param string $file |
|
1015 | + * @ param string $func |
|
1016 | + * @ param string $line |
|
1017 | + * @ return string |
|
1018 | + */ |
|
1019 | 1019 | public static function generate_error_code ( $file = '', $func = '', $line = '' ) { |
1020 | 1020 | $file = explode( '.', basename( $file )); |
1021 | 1021 | $error_code = ! empty( $file[0] ) ? $file[0] : ''; |
@@ -1029,13 +1029,13 @@ discard block |
||
1029 | 1029 | |
1030 | 1030 | |
1031 | 1031 | /** |
1032 | - * write exception details to log file |
|
1033 | - * |
|
1034 | - * @access public |
|
1035 | - * @ param timestamp $time |
|
1036 | - * @ param object $ex |
|
1037 | - * @ return void |
|
1038 | - */ |
|
1032 | + * write exception details to log file |
|
1033 | + * |
|
1034 | + * @access public |
|
1035 | + * @ param timestamp $time |
|
1036 | + * @ param object $ex |
|
1037 | + * @ return void |
|
1038 | + */ |
|
1039 | 1039 | public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) { |
1040 | 1040 | |
1041 | 1041 | if ( ! $ex ) { |
@@ -184,7 +184,7 @@ |
||
184 | 184 | * returns TRUE if M-Mode is engaged and the current request is not for the admin |
185 | 185 | * |
186 | 186 | * @access public |
187 | - * @return string |
|
187 | + * @return boolean |
|
188 | 188 | */ |
189 | 189 | public static function disable_frontend_for_maintenance() { |
190 | 190 | return ! is_admin() && EE_Maintenance_Mode::instance()->level() ? TRUE : FALSE; |
@@ -48,10 +48,10 @@ |
||
48 | 48 | */ |
49 | 49 | const option_name_maintenance_mode = 'ee_maintenance_mode'; |
50 | 50 | /** |
51 | - * EE_Maintenance_Mode Object |
|
52 | - * @var EE_Maintenance_Mode $_instance |
|
53 | - * @access private |
|
54 | - */ |
|
51 | + * EE_Maintenance_Mode Object |
|
52 | + * @var EE_Maintenance_Mode $_instance |
|
53 | + * @access private |
|
54 | + */ |
|
55 | 55 | private static $_instance = NULL; |
56 | 56 | |
57 | 57 | /** |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | current_user_can('administrator') && //when the user is an admin |
142 | 142 | $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1 |
143 | 143 | $maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance; |
144 | - }else{ |
|
144 | + } else{ |
|
145 | 145 | $maintenance_mode_level = $real_maintenance_mode_level; |
146 | 146 | } |
147 | 147 | return $maintenance_mode_level; |
@@ -156,12 +156,12 @@ discard block |
||
156 | 156 | if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){ |
157 | 157 | update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance); |
158 | 158 | return true; |
159 | - }elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
159 | + } elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
160 | 160 | //we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run |
161 | 161 | //then we shouldn't be in mm2. (Maybe an addon got deactivated?) |
162 | 162 | update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance ); |
163 | 163 | return false; |
164 | - }else{ |
|
164 | + } else{ |
|
165 | 165 | return false; |
166 | 166 | } |
167 | 167 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | -do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' ); |
|
2 | +do_action('AHEE_log', __FILE__, ' FILE LOADED', ''); |
|
3 | 3 | /** |
4 | 4 | * |
5 | 5 | * Event Espresso |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public static function instance() { |
76 | 76 | // check if class object is instantiated |
77 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Maintenance_Mode )) { |
|
77 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Maintenance_Mode)) { |
|
78 | 78 | self::$_instance = new self(); |
79 | 79 | } |
80 | 80 | return self::$_instance; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * Resets maintenance mode (mostly just re-checks whether or not we should be in maintenance mode) |
85 | 85 | * @return EE_Maintenance_Mode |
86 | 86 | */ |
87 | - public static function reset(){ |
|
87 | + public static function reset() { |
|
88 | 88 | self::instance()->set_maintenance_mode_if_db_old(); |
89 | 89 | return self::instance(); |
90 | 90 | } |
@@ -98,13 +98,13 @@ discard block |
||
98 | 98 | *@return EE_Maintenance_Mode |
99 | 99 | */ |
100 | 100 | private function __construct() { |
101 | - do_action( 'AHEE_log', __CLASS__, __FUNCTION__ ); |
|
101 | + do_action('AHEE_log', __CLASS__, __FUNCTION__); |
|
102 | 102 | // if M-Mode level 2 is engaged, we still need basic assets loaded |
103 | - add_action( 'wp_enqueue_scripts', array( $this, 'load_assets_required_for_m_mode' )); |
|
103 | + add_action('wp_enqueue_scripts', array($this, 'load_assets_required_for_m_mode')); |
|
104 | 104 | // shut 'er down down for maintenance ? |
105 | - add_filter( 'the_content', array( $this, 'the_content' ), 999 ); |
|
105 | + add_filter('the_content', array($this, 'the_content'), 999); |
|
106 | 106 | // add powered by EE msg |
107 | - add_action( 'shutdown', array( $this, 'display_maintenance_mode_notice' ), 10 ); |
|
107 | + add_action('shutdown', array($this, 'display_maintenance_mode_notice'), 10); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | * retrieves the maintenance mode option value from the db |
115 | 115 | * @return int |
116 | 116 | */ |
117 | - public function real_level(){ |
|
118 | - return get_option( self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance ); |
|
117 | + public function real_level() { |
|
118 | + return get_option(self::option_name_maintenance_mode, EE_Maintenance_Mode::level_0_not_in_maintenance); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | * thinks their tables are present and up-to-date). |
124 | 124 | * @return boolean |
125 | 125 | */ |
126 | - public function models_can_query(){ |
|
126 | + public function models_can_query() { |
|
127 | 127 | return $this->real_level() != EE_Maintenance_Mode::level_2_complete_maintenance; |
128 | 128 | } |
129 | 129 | |
@@ -136,14 +136,14 @@ discard block |
||
136 | 136 | * EE_Maintenance_Mode::level_2_complete_maintenance => frontend and backend maintenance mode |
137 | 137 | * @return int |
138 | 138 | */ |
139 | - public function level(){ |
|
139 | + public function level() { |
|
140 | 140 | $real_maintenance_mode_level = $this->real_level(); |
141 | 141 | //if this is an admin request, we'll be honest... except if it's ajax, because that might be from the frontend |
142 | - if( ( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests |
|
142 | + if (( ! is_admin() || (defined('DOING_AJAX') && DOING_AJAX)) && //only on frontend or ajax requests |
|
143 | 143 | current_user_can('administrator') && //when the user is an admin |
144 | - $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance){//and we're in level 1 |
|
144 | + $real_maintenance_mode_level == EE_Maintenance_Mode::level_1_frontend_only_maintenance) {//and we're in level 1 |
|
145 | 145 | $maintenance_mode_level = EE_Maintenance_Mode::level_0_not_in_maintenance; |
146 | - }else{ |
|
146 | + } else { |
|
147 | 147 | $maintenance_mode_level = $real_maintenance_mode_level; |
148 | 148 | } |
149 | 149 | return $maintenance_mode_level; |
@@ -153,17 +153,17 @@ discard block |
||
153 | 153 | * Determines if we need to put EE in maintenance mode because the database needs updating |
154 | 154 | * @return boolean true if DB is old and maintenance mode was triggered; false otherwise |
155 | 155 | */ |
156 | - public function set_maintenance_mode_if_db_old(){ |
|
157 | - EE_Registry::instance()->load_core( 'Data_Migration_Manager' ); |
|
158 | - if( EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){ |
|
156 | + public function set_maintenance_mode_if_db_old() { |
|
157 | + EE_Registry::instance()->load_core('Data_Migration_Manager'); |
|
158 | + if (EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) { |
|
159 | 159 | update_option(self::option_name_maintenance_mode, self::level_2_complete_maintenance); |
160 | 160 | return true; |
161 | - }elseif( $this->level() == self::level_2_complete_maintenance ){ |
|
161 | + }elseif ($this->level() == self::level_2_complete_maintenance) { |
|
162 | 162 | //we also want to handle the opposite: if the site is mm2, but there aren't any migrations to run |
163 | 163 | //then we shouldn't be in mm2. (Maybe an addon got deactivated?) |
164 | - update_option( self::option_name_maintenance_mode, self::level_0_not_in_maintenance ); |
|
164 | + update_option(self::option_name_maintenance_mode, self::level_0_not_in_maintenance); |
|
165 | 165 | return false; |
166 | - }else{ |
|
166 | + } else { |
|
167 | 167 | return false; |
168 | 168 | } |
169 | 169 | } |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | * @param int $level |
174 | 174 | * @return void |
175 | 175 | */ |
176 | - public function set_maintenance_level($level){ |
|
177 | - do_action( 'AHEE__EE_Maintenance_Mode__set_maintenance_level', $level ); |
|
176 | + public function set_maintenance_level($level) { |
|
177 | + do_action('AHEE__EE_Maintenance_Mode__set_maintenance_level', $level); |
|
178 | 178 | update_option(self::option_name_maintenance_mode, intval($level)); |
179 | 179 | } |
180 | 180 | |
@@ -201,11 +201,11 @@ discard block |
||
201 | 201 | * @return string |
202 | 202 | */ |
203 | 203 | public function load_assets_required_for_m_mode() { |
204 | - if ( $this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is( 'espresso_core', 'enqueued' )) { |
|
205 | - wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION ); |
|
204 | + if ($this->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance && ! wp_script_is('espresso_core', 'enqueued')) { |
|
205 | + wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION); |
|
206 | 206 | wp_enqueue_style('espresso_default'); |
207 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
208 | - wp_enqueue_script( 'espresso_core' ); |
|
207 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
208 | + wp_enqueue_script('espresso_core'); |
|
209 | 209 | } |
210 | 210 | } |
211 | 211 | |
@@ -220,9 +220,9 @@ discard block |
||
220 | 220 | * @param string $template_path |
221 | 221 | * @return string |
222 | 222 | */ |
223 | - public static function template_include( $template_path ) { |
|
224 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
225 | - $template_located = EEH_Template::locate_template( EE_TEMPLATES . 'maintenance_mode.template.php', FALSE, FALSE ); |
|
223 | + public static function template_include($template_path) { |
|
224 | + EE_Registry::instance()->load_helper('Template'); |
|
225 | + $template_located = EEH_Template::locate_template(EE_TEMPLATES.'maintenance_mode.template.php', FALSE, FALSE); |
|
226 | 226 | return $template_located ? $template_located : $template_path; |
227 | 227 | } |
228 | 228 | |
@@ -237,12 +237,12 @@ discard block |
||
237 | 237 | * @param string $the_content |
238 | 238 | * @return string |
239 | 239 | */ |
240 | - public function the_content( $the_content ) { |
|
240 | + public function the_content($the_content) { |
|
241 | 241 | // check if M-mode is engaged and for EE shortcode |
242 | - if ( $this->level() && strpos( $the_content, '[ESPRESSO_' )) { |
|
242 | + if ($this->level() && strpos($the_content, '[ESPRESSO_')) { |
|
243 | 243 | // this can eventually be moved to a template, or edited via admin. But for now... |
244 | 244 | $the_content = sprintf( |
245 | - __( '%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso' ), |
|
245 | + __('%sMaintenance Mode%sEvent Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.%s', 'event_espresso'), |
|
246 | 246 | '<h2>', |
247 | 247 | '</h2><p>', |
248 | 248 | '</p>' |
@@ -264,13 +264,13 @@ discard block |
||
264 | 264 | */ |
265 | 265 | public function display_maintenance_mode_notice() { |
266 | 266 | // check if M-mode is engaged and for EE shortcode |
267 | - if ( $this->real_level() && current_user_can( 'administrator' ) && ! is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )) { |
|
267 | + if ($this->real_level() && current_user_can('administrator') && ! is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)) { |
|
268 | 268 | $admin_bar_adjustment = is_admin_bar_showing() ? ' style="top:32px;"' : ''; |
269 | 269 | printf( |
270 | - __( '%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso' ), |
|
271 | - '<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"' . $admin_bar_adjustment . '><a class="close-espresso-notice" title="', |
|
270 | + __('%sclose%sEvent Registration is currently disabled because Event Espresso has been placed into Maintenance Mode. To change Maintenance Mode settings, click here %sEE Maintenance Mode Admin Page%s', 'event_espresso'), |
|
271 | + '<div id="ee-m-mode-admin-notice-dv" class="ee-really-important-notice-dv"'.$admin_bar_adjustment.'><a class="close-espresso-notice" title="', |
|
272 | 272 | '">×</a><p>', |
273 | - ' » <a href="' . add_query_arg( array( 'page' => 'espresso_maintenance_settings' ), admin_url( 'admin.php' )) . '">', |
|
273 | + ' » <a href="'.add_query_arg(array('page' => 'espresso_maintenance_settings'), admin_url('admin.php')).'">', |
|
274 | 274 | '</a></p></div>' |
275 | 275 | ); |
276 | 276 | } |
@@ -288,9 +288,9 @@ discard block |
||
288 | 288 | * @ return void |
289 | 289 | */ |
290 | 290 | final function __destruct() {} |
291 | - final function __call($a,$b) {} |
|
291 | + final function __call($a, $b) {} |
|
292 | 292 | final function __get($a) {} |
293 | - final function __set($a,$b) {} |
|
293 | + final function __set($a, $b) {} |
|
294 | 294 | final function __isset($a) {} |
295 | 295 | final function __unset($a) {} |
296 | 296 | final function __sleep() { |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | final function __invoke() {} |
302 | 302 | final function __set_state() {} |
303 | 303 | final function __clone() {} |
304 | - final static function __callStatic($a,$b) {} |
|
304 | + final static function __callStatic($a, $b) {} |
|
305 | 305 | |
306 | 306 | } |
307 | 307 | // End of file EE_Maintenance_Mode.core.php |
@@ -214,6 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | /** |
216 | 216 | * @param mixed string | EED_Module $module |
217 | + * @param boolean|string $module |
|
217 | 218 | */ |
218 | 219 | public function add_module( $module ) { |
219 | 220 | if ( $module instanceof EED_Module ) { |
@@ -245,7 +246,7 @@ discard block |
||
245 | 246 | * @param string $class_name - simple class name ie: session |
246 | 247 | * @param mixed $arguments |
247 | 248 | * @param bool $load_only |
248 | - * @return mixed |
|
249 | + * @return boolean |
|
249 | 250 | */ |
250 | 251 | public function load_core ( $class_name, $arguments = array(), $load_only = FALSE ) { |
251 | 252 | $core_paths = apply_filters( |
@@ -269,7 +270,7 @@ discard block |
||
269 | 270 | * @access public |
270 | 271 | * @param string $class_name - class name for the DMS ie: EE_DMS_Core_4_2_0 |
271 | 272 | * @param mixed $arguments |
272 | - * @return EE_Data_Migration_Script_Base |
|
273 | + * @return boolean |
|
273 | 274 | */ |
274 | 275 | public function load_dms ( $class_name, $arguments = array() ) { |
275 | 276 | // retrieve instantiated class |
@@ -286,7 +287,7 @@ discard block |
||
286 | 287 | * @param bool $from_db - some classes are instantiated from the db and thus call a different method to instantiate |
287 | 288 | * @param bool $cache if you don't want the class to be stored in the internal cache (non-persistent) then set this to FALSE (ie. when instantiating model objects from client in a loop) |
288 | 289 | * @param bool $load_only whether or not to just load the file and NOT instantiate, or load AND instantiate (default) |
289 | - * @return EE_Base_Class |
|
290 | + * @return boolean |
|
290 | 291 | */ |
291 | 292 | public function load_class ( $class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) { |
292 | 293 | $paths = apply_filters('FHEE__EE_Registry__load_class__paths',array( |
@@ -307,7 +308,7 @@ discard block |
||
307 | 308 | * @param string $class_name - simple class name ie: price |
308 | 309 | * @param mixed $arguments |
309 | 310 | * @param bool $load_only |
310 | - * @return EEH_Base |
|
311 | + * @return boolean |
|
311 | 312 | */ |
312 | 313 | public function load_helper ( $class_name, $arguments = array(), $load_only = TRUE ) { |
313 | 314 | $helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS ) ); |
@@ -324,7 +325,7 @@ discard block |
||
324 | 325 | * @param string $class_name - simple class name ie: session |
325 | 326 | * @param mixed $arguments |
326 | 327 | * @param bool $load_only |
327 | - * @return mixed |
|
328 | + * @return boolean |
|
328 | 329 | */ |
329 | 330 | public function load_lib ( $class_name, $arguments = array(), $load_only = FALSE ) { |
330 | 331 | $paths = array( |
@@ -346,7 +347,7 @@ discard block |
||
346 | 347 | * @param string $class_name - simple class name ie: price |
347 | 348 | * @param mixed $arguments |
348 | 349 | * @param bool $load_only |
349 | - * @return EEM_Base |
|
350 | + * @return boolean |
|
350 | 351 | */ |
351 | 352 | public function load_model ( $class_name, $arguments = array(), $load_only = FALSE ) { |
352 | 353 | $paths = apply_filters('FHEE__EE_Registry__load_model__paths',array( |
@@ -365,7 +366,7 @@ discard block |
||
365 | 366 | * @param string $class_name - simple class name ie: price |
366 | 367 | * @param mixed $arguments |
367 | 368 | * @param bool $load_only |
368 | - * @return mixed |
|
369 | + * @return boolean |
|
369 | 370 | */ |
370 | 371 | public function load_model_class ( $class_name, $arguments = array(), $load_only = TRUE ) { |
371 | 372 | $paths = array( |
@@ -401,7 +402,7 @@ discard block |
||
401 | 402 | * @param string $type - file type - core? class? helper? model? |
402 | 403 | * @param mixed $arguments |
403 | 404 | * @param bool $load_only |
404 | - * @return mixed |
|
405 | + * @return boolean |
|
405 | 406 | */ |
406 | 407 | public function load_file ( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE ) { |
407 | 408 | // retrieve instantiated class |
@@ -418,7 +419,7 @@ discard block |
||
418 | 419 | * @param string $type - file type - core? class? helper? model? |
419 | 420 | * @param mixed $arguments |
420 | 421 | * @param bool $load_only |
421 | - * @return EE_Addon |
|
422 | + * @return boolean |
|
422 | 423 | */ |
423 | 424 | public function load_addon ( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE ) { |
424 | 425 | // retrieve instantiated class |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | */ |
170 | 170 | public static function instance() { |
171 | 171 | // check if class object is instantiated |
172 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Registry )) { |
|
172 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Registry)) { |
|
173 | 173 | self::$_instance = new self(); |
174 | 174 | } |
175 | 175 | return self::$_instance; |
@@ -184,14 +184,14 @@ discard block |
||
184 | 184 | * @return \EE_Registry |
185 | 185 | */ |
186 | 186 | private function __construct() { |
187 | - $this->load_core( 'Base' ); |
|
187 | + $this->load_core('Base'); |
|
188 | 188 | // class library |
189 | 189 | $this->LIB = new StdClass(); |
190 | 190 | $this->addons = new StdClass(); |
191 | 191 | $this->modules = new StdClass(); |
192 | 192 | $this->shortcodes = new StdClass(); |
193 | 193 | $this->widgets = new StdClass(); |
194 | - add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'init' )); |
|
194 | + add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'init')); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function init() { |
206 | 206 | // Get current page protocol |
207 | - $protocol = isset( $_SERVER['HTTPS'] ) ? 'https://' : 'http://'; |
|
207 | + $protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://'; |
|
208 | 208 | // Output admin-ajax.php URL with same protocol as current page |
209 | - self::$i18n_js_strings['ajax_url'] = admin_url( 'admin-ajax.php', $protocol ); |
|
210 | - self::$i18n_js_strings['wp_debug'] = defined( 'WP_DEBUG' ) ? WP_DEBUG : FALSE; |
|
209 | + self::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php', $protocol); |
|
210 | + self::$i18n_js_strings['wp_debug'] = defined('WP_DEBUG') ? WP_DEBUG : FALSE; |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | |
@@ -215,15 +215,15 @@ discard block |
||
215 | 215 | /** |
216 | 216 | * @param mixed string | EED_Module $module |
217 | 217 | */ |
218 | - public function add_module( $module ) { |
|
219 | - if ( $module instanceof EED_Module ) { |
|
220 | - $module_class = get_class( $module ); |
|
218 | + public function add_module($module) { |
|
219 | + if ($module instanceof EED_Module) { |
|
220 | + $module_class = get_class($module); |
|
221 | 221 | $this->modules->{$module_class} = $module; |
222 | 222 | } else { |
223 | - if ( ! class_exists( 'EE_Module_Request_Router' )) { |
|
224 | - $this->load_core( 'Module_Request_Router' ); |
|
223 | + if ( ! class_exists('EE_Module_Request_Router')) { |
|
224 | + $this->load_core('Module_Request_Router'); |
|
225 | 225 | } |
226 | - $this->modules->{$module} = EE_Module_Request_Router::module_factory( $module ); |
|
226 | + $this->modules->{$module} = EE_Module_Request_Router::module_factory($module); |
|
227 | 227 | } |
228 | 228 | } |
229 | 229 | |
@@ -233,8 +233,8 @@ discard block |
||
233 | 233 | * @param string $module_name |
234 | 234 | * @return mixed EED_Module | NULL |
235 | 235 | */ |
236 | - public function get_module( $module_name = '' ) { |
|
237 | - return isset( $this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL; |
|
236 | + public function get_module($module_name = '') { |
|
237 | + return isset($this->modules->{$module_name} ) ? $this->modules->{$module_name} : NULL; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | |
@@ -247,18 +247,18 @@ discard block |
||
247 | 247 | * @param bool $load_only |
248 | 248 | * @return mixed |
249 | 249 | */ |
250 | - public function load_core ( $class_name, $arguments = array(), $load_only = FALSE ) { |
|
250 | + public function load_core($class_name, $arguments = array(), $load_only = FALSE) { |
|
251 | 251 | $core_paths = apply_filters( |
252 | 252 | 'FHEE__EE_Registry__load_core__core_paths', |
253 | 253 | array( |
254 | 254 | EE_CORE, |
255 | 255 | EE_ADMIN, |
256 | 256 | EE_CPTS, |
257 | - EE_CORE . 'data_migration_scripts' . DS |
|
257 | + EE_CORE.'data_migration_scripts'.DS |
|
258 | 258 | ) |
259 | 259 | ); |
260 | 260 | // retrieve instantiated class |
261 | - return $this->_load( $core_paths, 'EE_' , $class_name, 'core', $arguments, FALSE, TRUE, $load_only ); |
|
261 | + return $this->_load($core_paths, 'EE_', $class_name, 'core', $arguments, FALSE, TRUE, $load_only); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | |
@@ -271,9 +271,9 @@ discard block |
||
271 | 271 | * @param mixed $arguments |
272 | 272 | * @return EE_Data_Migration_Script_Base |
273 | 273 | */ |
274 | - public function load_dms ( $class_name, $arguments = array() ) { |
|
274 | + public function load_dms($class_name, $arguments = array()) { |
|
275 | 275 | // retrieve instantiated class |
276 | - return $this->_load( EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_' , $class_name, 'dms', $arguments, FALSE, FALSE, FALSE ); |
|
276 | + return $this->_load(EE_Data_Migration_Manager::instance()->get_data_migration_script_folders(), 'EE_DMS_', $class_name, 'dms', $arguments, FALSE, FALSE, FALSE); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | |
@@ -288,14 +288,14 @@ discard block |
||
288 | 288 | * @param bool $load_only whether or not to just load the file and NOT instantiate, or load AND instantiate (default) |
289 | 289 | * @return EE_Base_Class |
290 | 290 | */ |
291 | - public function load_class ( $class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) { |
|
292 | - $paths = apply_filters('FHEE__EE_Registry__load_class__paths',array( |
|
291 | + public function load_class($class_name, $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) { |
|
292 | + $paths = apply_filters('FHEE__EE_Registry__load_class__paths', array( |
|
293 | 293 | EE_CORE, |
294 | 294 | EE_CLASSES, |
295 | 295 | EE_BUSINESS |
296 | 296 | )); |
297 | 297 | // retrieve instantiated class |
298 | - return $this->_load( $paths, 'EE_' , $class_name, 'class', $arguments, $from_db, $cache, $load_only ); |
|
298 | + return $this->_load($paths, 'EE_', $class_name, 'class', $arguments, $from_db, $cache, $load_only); |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | |
@@ -309,10 +309,10 @@ discard block |
||
309 | 309 | * @param bool $load_only |
310 | 310 | * @return EEH_Base |
311 | 311 | */ |
312 | - public function load_helper ( $class_name, $arguments = array(), $load_only = TRUE ) { |
|
313 | - $helper_paths = apply_filters( 'FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS ) ); |
|
312 | + public function load_helper($class_name, $arguments = array(), $load_only = TRUE) { |
|
313 | + $helper_paths = apply_filters('FHEE__EE_Registry__load_helper__helper_paths', array(EE_HELPERS)); |
|
314 | 314 | // retrieve instantiated class |
315 | - return $this->_load( $helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only ); |
|
315 | + return $this->_load($helper_paths, 'EEH_', $class_name, 'helper', $arguments, FALSE, TRUE, $load_only); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | |
@@ -326,16 +326,16 @@ discard block |
||
326 | 326 | * @param bool $load_only |
327 | 327 | * @return mixed |
328 | 328 | */ |
329 | - public function load_lib ( $class_name, $arguments = array(), $load_only = FALSE ) { |
|
329 | + public function load_lib($class_name, $arguments = array(), $load_only = FALSE) { |
|
330 | 330 | $paths = array( |
331 | 331 | EE_LIBRARIES, |
332 | - EE_LIBRARIES . 'messages' . DS, |
|
333 | - EE_LIBRARIES . 'shortcodes' . DS, |
|
334 | - EE_LIBRARIES . 'qtips' . DS, |
|
335 | - EE_LIBRARIES . 'payment_methods' . DS, |
|
332 | + EE_LIBRARIES.'messages'.DS, |
|
333 | + EE_LIBRARIES.'shortcodes'.DS, |
|
334 | + EE_LIBRARIES.'qtips'.DS, |
|
335 | + EE_LIBRARIES.'payment_methods'.DS, |
|
336 | 336 | ); |
337 | 337 | // retrieve instantiated class |
338 | - return $this->_load( $paths, 'EE_' , $class_name, 'lib', $arguments, FALSE, TRUE, $load_only ); |
|
338 | + return $this->_load($paths, 'EE_', $class_name, 'lib', $arguments, FALSE, TRUE, $load_only); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | |
@@ -348,13 +348,13 @@ discard block |
||
348 | 348 | * @param bool $load_only |
349 | 349 | * @return EEM_Base |
350 | 350 | */ |
351 | - public function load_model ( $class_name, $arguments = array(), $load_only = FALSE ) { |
|
352 | - $paths = apply_filters('FHEE__EE_Registry__load_model__paths',array( |
|
351 | + public function load_model($class_name, $arguments = array(), $load_only = FALSE) { |
|
352 | + $paths = apply_filters('FHEE__EE_Registry__load_model__paths', array( |
|
353 | 353 | EE_MODELS, |
354 | 354 | EE_CORE |
355 | 355 | )); |
356 | 356 | // retrieve instantiated class |
357 | - return $this->_load( $paths, 'EEM_' , $class_name, 'model', $arguments, FALSE, TRUE, $load_only ); |
|
357 | + return $this->_load($paths, 'EEM_', $class_name, 'model', $arguments, FALSE, TRUE, $load_only); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | |
@@ -367,15 +367,15 @@ discard block |
||
367 | 367 | * @param bool $load_only |
368 | 368 | * @return mixed |
369 | 369 | */ |
370 | - public function load_model_class ( $class_name, $arguments = array(), $load_only = TRUE ) { |
|
370 | + public function load_model_class($class_name, $arguments = array(), $load_only = TRUE) { |
|
371 | 371 | $paths = array( |
372 | - EE_MODELS . 'fields' . DS, |
|
373 | - EE_MODELS . 'helpers' . DS, |
|
374 | - EE_MODELS . 'relations' . DS, |
|
375 | - EE_MODELS . 'strategies' . DS |
|
372 | + EE_MODELS.'fields'.DS, |
|
373 | + EE_MODELS.'helpers'.DS, |
|
374 | + EE_MODELS.'relations'.DS, |
|
375 | + EE_MODELS.'strategies'.DS |
|
376 | 376 | ); |
377 | 377 | // retrieve instantiated class |
378 | - return $this->_load( $paths, 'EE_' , $class_name, '', $arguments, FALSE, TRUE, $load_only ); |
|
378 | + return $this->_load($paths, 'EE_', $class_name, '', $arguments, FALSE, TRUE, $load_only); |
|
379 | 379 | } |
380 | 380 | |
381 | 381 | |
@@ -387,8 +387,8 @@ discard block |
||
387 | 387 | * @param string $model_name like Event, Attendee, Question_Group_Question, etc. |
388 | 388 | * @return boolean |
389 | 389 | */ |
390 | - public function is_model_name( $model_name ){ |
|
391 | - return isset( $this->models[ $model_name ] ) ? TRUE : FALSE; |
|
390 | + public function is_model_name($model_name) { |
|
391 | + return isset($this->models[$model_name]) ? TRUE : FALSE; |
|
392 | 392 | } |
393 | 393 | |
394 | 394 | |
@@ -403,9 +403,9 @@ discard block |
||
403 | 403 | * @param bool $load_only |
404 | 404 | * @return mixed |
405 | 405 | */ |
406 | - public function load_file ( $path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE ) { |
|
406 | + public function load_file($path_to_file, $file_name, $type = '', $arguments = array(), $load_only = TRUE) { |
|
407 | 407 | // retrieve instantiated class |
408 | - return $this->_load( $path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only ); |
|
408 | + return $this->_load($path_to_file, '', $file_name, $type, $arguments, FALSE, TRUE, $load_only); |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | |
@@ -420,9 +420,9 @@ discard block |
||
420 | 420 | * @param bool $load_only |
421 | 421 | * @return EE_Addon |
422 | 422 | */ |
423 | - public function load_addon ( $path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE ) { |
|
423 | + public function load_addon($path_to_file, $class_name, $type = 'class', $arguments = array(), $load_only = FALSE) { |
|
424 | 424 | // retrieve instantiated class |
425 | - return $this->_load( $path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only ); |
|
425 | + return $this->_load($path_to_file, 'addon', $class_name, $type, $arguments, FALSE, TRUE, $load_only); |
|
426 | 426 | } |
427 | 427 | |
428 | 428 | |
@@ -440,15 +440,15 @@ discard block |
||
440 | 440 | * @internal param string $file_path - file path including file name |
441 | 441 | * @return bool | object |
442 | 442 | */ |
443 | - private function _load ( $file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE ) { |
|
443 | + private function _load($file_paths = array(), $class_prefix = 'EE_', $class_name = FALSE, $type = 'class', $arguments = array(), $from_db = FALSE, $cache = TRUE, $load_only = FALSE) { |
|
444 | 444 | // strip php file extension |
445 | - $class_name = str_replace( '.php', '', trim( $class_name )); |
|
445 | + $class_name = str_replace('.php', '', trim($class_name)); |
|
446 | 446 | // does the class have a prefix ? |
447 | - if ( ! empty( $class_prefix ) && $class_prefix != 'addon' ) { |
|
447 | + if ( ! empty($class_prefix) && $class_prefix != 'addon') { |
|
448 | 448 | // make sure $class_prefix is uppercase |
449 | - $class_prefix = strtoupper( trim( $class_prefix )); |
|
449 | + $class_prefix = strtoupper(trim($class_prefix)); |
|
450 | 450 | // add class prefix ONCE!!! |
451 | - $class_name = $class_prefix . str_replace( $class_prefix, '', $class_name ); |
|
451 | + $class_name = $class_prefix.str_replace($class_prefix, '', $class_name); |
|
452 | 452 | } |
453 | 453 | |
454 | 454 | $class_abbreviations = array( |
@@ -461,56 +461,56 @@ discard block |
||
461 | 461 | ); |
462 | 462 | |
463 | 463 | // check if class has already been loaded, and return it if it has been |
464 | - if ( isset( $class_abbreviations[ $class_name ] ) && ! is_null( $this->$class_abbreviations[ $class_name ] )) { |
|
465 | - return $this->$class_abbreviations[ $class_name ]; |
|
466 | - } else if ( isset ( $this->{$class_name} )) { |
|
464 | + if (isset($class_abbreviations[$class_name]) && ! is_null($this->$class_abbreviations[$class_name])) { |
|
465 | + return $this->$class_abbreviations[$class_name]; |
|
466 | + } else if (isset ($this->{$class_name} )) { |
|
467 | 467 | return $this->{$class_name}; |
468 | - } else if ( isset ( $this->LIB->$class_name )) { |
|
468 | + } else if (isset ($this->LIB->$class_name)) { |
|
469 | 469 | return $this->LIB->$class_name; |
470 | - } else if ( $class_prefix == 'addon' && isset ( $this->addons->$class_name )) { |
|
470 | + } else if ($class_prefix == 'addon' && isset ($this->addons->$class_name)) { |
|
471 | 471 | return $this->addons->$class_name; |
472 | 472 | } |
473 | 473 | |
474 | 474 | // assume all paths lead nowhere |
475 | 475 | $path = FALSE; |
476 | 476 | // make sure $file_paths is an array |
477 | - $file_paths = is_array( $file_paths ) ? $file_paths : array( $file_paths ); |
|
477 | + $file_paths = is_array($file_paths) ? $file_paths : array($file_paths); |
|
478 | 478 | // cycle thru paths |
479 | - foreach ( $file_paths as $key => $file_path ) { |
|
479 | + foreach ($file_paths as $key => $file_path) { |
|
480 | 480 | // convert all separators to proper DS, if no filepath, then use EE_CLASSES |
481 | - $file_path = $file_path ? str_replace( array( '/', '\\' ), DS, $file_path ) : EE_CLASSES; |
|
481 | + $file_path = $file_path ? str_replace(array('/', '\\'), DS, $file_path) : EE_CLASSES; |
|
482 | 482 | // prep file type |
483 | - $type = ! empty( $type ) ? trim( $type, '.' ) . '.' : ''; |
|
483 | + $type = ! empty($type) ? trim($type, '.').'.' : ''; |
|
484 | 484 | // build full file path |
485 | - $file_paths[ $key ] = rtrim( $file_path, DS ) . DS . $class_name . '.' . $type . 'php'; |
|
485 | + $file_paths[$key] = rtrim($file_path, DS).DS.$class_name.'.'.$type.'php'; |
|
486 | 486 | //does the file exist and can be read ? |
487 | - if ( is_readable( $file_paths[ $key ] )) { |
|
488 | - $path = $file_paths[ $key ]; |
|
487 | + if (is_readable($file_paths[$key])) { |
|
488 | + $path = $file_paths[$key]; |
|
489 | 489 | break; |
490 | 490 | } |
491 | 491 | } |
492 | 492 | // don't give up! you gotta... |
493 | 493 | try { |
494 | 494 | //does the file exist and can it be read ? |
495 | - if ( ! $path ) { |
|
495 | + if ( ! $path) { |
|
496 | 496 | // so sorry, can't find the file |
497 | - throw new EE_Error ( |
|
498 | - sprintf ( |
|
499 | - __('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s','event_espresso'), |
|
500 | - trim( $type, '.' ), |
|
497 | + throw new EE_Error( |
|
498 | + sprintf( |
|
499 | + __('The %1$s file %2$s could not be located or is not readable due to file permissions. Please ensure that the following filepath(s) are correct: %3$s', 'event_espresso'), |
|
500 | + trim($type, '.'), |
|
501 | 501 | $class_name, |
502 | - '<br />' . implode( ',<br />', $file_paths ) |
|
502 | + '<br />'.implode(',<br />', $file_paths) |
|
503 | 503 | ) |
504 | 504 | ); |
505 | 505 | } |
506 | 506 | // get the file |
507 | - require_once( $path ); |
|
507 | + require_once($path); |
|
508 | 508 | // if the class isn't already declared somewhere |
509 | - if ( class_exists( $class_name, FALSE ) === FALSE ) { |
|
509 | + if (class_exists($class_name, FALSE) === FALSE) { |
|
510 | 510 | // so sorry, not a class |
511 | 511 | throw new EE_Error( |
512 | 512 | sprintf( |
513 | - __('The %s file %s does not appear to contain the %s Class.','event_espresso'), |
|
513 | + __('The %s file %s does not appear to contain the %s Class.', 'event_espresso'), |
|
514 | 514 | $type, |
515 | 515 | $path, |
516 | 516 | $class_name |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | ); |
519 | 519 | } |
520 | 520 | |
521 | - } catch ( EE_Error $e ) { |
|
521 | + } catch (EE_Error $e) { |
|
522 | 522 | $e->get_error(); |
523 | 523 | } |
524 | 524 | |
@@ -526,38 +526,38 @@ discard block |
||
526 | 526 | // don't give up! you gotta... |
527 | 527 | try { |
528 | 528 | // create reflection |
529 | - $reflector = new ReflectionClass( $class_name ); |
|
529 | + $reflector = new ReflectionClass($class_name); |
|
530 | 530 | // instantiate the class and add to the LIB array for tracking |
531 | 531 | // EE_Base_Classes are instantiated via new_instance by default (models call them via new_instance_from_db) |
532 | - if ( $reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only ) { |
|
532 | + if ($reflector->getConstructor() === NULL || $reflector->isAbstract() || $load_only) { |
|
533 | 533 | // $instantiation_mode = 0; |
534 | 534 | // no constructor = static methods only... nothing to instantiate, loading file was enough |
535 | 535 | return TRUE; |
536 | - } else if ( $from_db && method_exists( $class_name, 'new_instance_from_db' ) ) { |
|
536 | + } else if ($from_db && method_exists($class_name, 'new_instance_from_db')) { |
|
537 | 537 | // $instantiation_mode = 1; |
538 | - $class_obj = call_user_func_array( array( $class_name, 'new_instance_from_db' ), $arguments ); |
|
539 | - } else if ( method_exists( $class_name, 'new_instance' ) ) { |
|
538 | + $class_obj = call_user_func_array(array($class_name, 'new_instance_from_db'), $arguments); |
|
539 | + } else if (method_exists($class_name, 'new_instance')) { |
|
540 | 540 | // $instantiation_mode = 2; |
541 | - $class_obj = call_user_func_array( array( $class_name, 'new_instance' ), $arguments ); |
|
542 | - } else if ( method_exists( $class_name, 'instance' )) { |
|
541 | + $class_obj = call_user_func_array(array($class_name, 'new_instance'), $arguments); |
|
542 | + } else if (method_exists($class_name, 'instance')) { |
|
543 | 543 | // $instantiation_mode = 3; |
544 | - $class_obj = call_user_func_array( array( $class_name, 'instance' ), $arguments ); |
|
545 | - } else if ( $reflector->isInstantiable() ) { |
|
544 | + $class_obj = call_user_func_array(array($class_name, 'instance'), $arguments); |
|
545 | + } else if ($reflector->isInstantiable()) { |
|
546 | 546 | // $instantiation_mode = 4; |
547 | - $class_obj = $reflector->newInstance( $arguments ); |
|
548 | - } else if ( ! $load_only ) { |
|
547 | + $class_obj = $reflector->newInstance($arguments); |
|
548 | + } else if ( ! $load_only) { |
|
549 | 549 | // heh ? something's not right ! |
550 | 550 | // $instantiation_mode = 5; |
551 | 551 | throw new EE_Error( |
552 | 552 | sprintf( |
553 | - __('The %s file %s could not be instantiated.','event_espresso'), |
|
553 | + __('The %s file %s could not be instantiated.', 'event_espresso'), |
|
554 | 554 | $type, |
555 | 555 | $class_name |
556 | 556 | ) |
557 | 557 | ); |
558 | 558 | } |
559 | 559 | |
560 | - } catch ( EE_Error $e ) { |
|
560 | + } catch (EE_Error $e) { |
|
561 | 561 | $e->get_error(); |
562 | 562 | } |
563 | 563 | |
@@ -569,15 +569,15 @@ discard block |
||
569 | 569 | // EEH_Debug_Tools::printr( $class_obj, '$class_obj <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
570 | 570 | |
571 | 571 | |
572 | - if ( isset( $class_obj )) { |
|
572 | + if (isset($class_obj)) { |
|
573 | 573 | // return newly instantiated class |
574 | - if ( isset( $class_abbreviations[ $class_name ] )) { |
|
575 | - $this->$class_abbreviations[ $class_name ] = $class_obj; |
|
576 | - } else if ( EEH_Class_Tools::has_property( $this, $class_name )) { |
|
574 | + if (isset($class_abbreviations[$class_name])) { |
|
575 | + $this->$class_abbreviations[$class_name] = $class_obj; |
|
576 | + } else if (EEH_Class_Tools::has_property($this, $class_name)) { |
|
577 | 577 | $this->{$class_name} = $class_obj; |
578 | - } else if ( $class_prefix == 'addon' && $cache ) { |
|
578 | + } else if ($class_prefix == 'addon' && $cache) { |
|
579 | 579 | $this->addons->$class_name = $class_obj; |
580 | - } else if ( !$from_db && $cache ) { |
|
580 | + } else if ( ! $from_db && $cache) { |
|
581 | 581 | $this->LIB->$class_name = $class_obj; |
582 | 582 | } |
583 | 583 | return $class_obj; |
@@ -602,7 +602,7 @@ discard block |
||
602 | 602 | * @param $a |
603 | 603 | * @param $b |
604 | 604 | */ |
605 | - final function __call($a,$b) {} |
|
605 | + final function __call($a, $b) {} |
|
606 | 606 | |
607 | 607 | |
608 | 608 | |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | * @param $a |
618 | 618 | * @param $b |
619 | 619 | */ |
620 | - final function __set($a,$b) {} |
|
620 | + final function __set($a, $b) {} |
|
621 | 621 | |
622 | 622 | |
623 | 623 | |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | * @param $a |
658 | 658 | * @param $b |
659 | 659 | */ |
660 | - final static function __callStatic($a,$b) {} |
|
660 | + final static function __callStatic($a, $b) {} |
|
661 | 661 | |
662 | 662 | /** |
663 | 663 | * Gets the addon by its name/slug (not classname. For that, just |
@@ -665,9 +665,9 @@ discard block |
||
665 | 665 | * @param string $name |
666 | 666 | * @return EE_Addon |
667 | 667 | */ |
668 | - public function get_addon_by_name( $name ){ |
|
669 | - foreach($this->addons as $addon){ |
|
670 | - if( $addon->name() == $name){ |
|
668 | + public function get_addon_by_name($name) { |
|
669 | + foreach ($this->addons as $addon) { |
|
670 | + if ($addon->name() == $name) { |
|
671 | 671 | return $addon; |
672 | 672 | } |
673 | 673 | } |
@@ -678,10 +678,10 @@ discard block |
||
678 | 678 | * |
679 | 679 | * @return EE_Addon[] where the KEYS are the addon's name() |
680 | 680 | */ |
681 | - public function get_addons_by_name(){ |
|
681 | + public function get_addons_by_name() { |
|
682 | 682 | $addons = array(); |
683 | - foreach($this->addons as $addon){ |
|
684 | - $addons[ $addon->name() ] = $addon; |
|
683 | + foreach ($this->addons as $addon) { |
|
684 | + $addons[$addon->name()] = $addon; |
|
685 | 685 | } |
686 | 686 | return $addons; |
687 | 687 | } |
@@ -692,14 +692,14 @@ discard block |
||
692 | 692 | * @param string $model_name |
693 | 693 | * @return EEM_Base |
694 | 694 | */ |
695 | - public function reset_model( $model_name ){ |
|
696 | - $model = $this->load_model( $model_name ); |
|
697 | - $model_class_name = get_class( $model ); |
|
695 | + public function reset_model($model_name) { |
|
696 | + $model = $this->load_model($model_name); |
|
697 | + $model_class_name = get_class($model); |
|
698 | 698 | //get that model reset it and make sure we nuke the old reference to it |
699 | - if ( is_callable( array( $model_class_name, 'reset' ))) { |
|
699 | + if (is_callable(array($model_class_name, 'reset'))) { |
|
700 | 700 | $this->LIB->$model_class_name = $model::reset(); |
701 | - }else{ |
|
702 | - throw new EE_Error( sprintf( __( 'Model %s does not have a method "reset"', 'event_espresso' ), $model_name ) ); |
|
701 | + } else { |
|
702 | + throw new EE_Error(sprintf(__('Model %s does not have a method "reset"', 'event_espresso'), $model_name)); |
|
703 | 703 | } |
704 | 704 | return $this->LIB->$model_class_name; |
705 | 705 | } |
@@ -715,15 +715,15 @@ discard block |
||
715 | 715 | * currently reinstantiate the singletons at the moment) |
716 | 716 | * @return EE_Registry |
717 | 717 | */ |
718 | - public static function reset( $hard = FALSE, $reinstantiate = TRUE ){ |
|
718 | + public static function reset($hard = FALSE, $reinstantiate = TRUE) { |
|
719 | 719 | $instance = self::instance(); |
720 | 720 | $instance->load_helper('Activation'); |
721 | 721 | EEH_Activation::reset(); |
722 | - $instance->CFG = EE_Config::reset( $hard, $reinstantiate ); |
|
722 | + $instance->CFG = EE_Config::reset($hard, $reinstantiate); |
|
723 | 723 | $instance->LIB->EE_Data_Migration_Manager = EE_Data_Migration_Manager::reset(); |
724 | 724 | $instance->LIB = new stdClass(); |
725 | - foreach( array_keys( $instance->non_abstract_db_models ) as $model_name ){ |
|
726 | - $instance->reset_model( $model_name ); |
|
725 | + foreach (array_keys($instance->non_abstract_db_models) as $model_name) { |
|
726 | + $instance->reset_model($model_name); |
|
727 | 727 | } |
728 | 728 | return $instance; |
729 | 729 | } |
@@ -90,7 +90,7 @@ |
||
90 | 90 | //so in case teh IPN is arriving later, let's try to process an IPN! |
91 | 91 | if($_SERVER['REQUEST_METHOD'] == 'POST'){ |
92 | 92 | return $this->handle_ipn($_POST, $transaction ); |
93 | - }else{ |
|
93 | + } else{ |
|
94 | 94 | return parent::finalize_payment_for( $transaction ); |
95 | 95 | } |
96 | 96 | } |
@@ -11,25 +11,25 @@ discard block |
||
11 | 11 | final class EE_Registry { |
12 | 12 | |
13 | 13 | /** |
14 | - * EE_Registry Object |
|
15 | - * @var EE_Registry $_instance |
|
16 | - * @access private |
|
17 | - */ |
|
14 | + * EE_Registry Object |
|
15 | + * @var EE_Registry $_instance |
|
16 | + * @access private |
|
17 | + */ |
|
18 | 18 | private static $_instance = NULL; |
19 | 19 | |
20 | 20 | |
21 | 21 | /** |
22 | - * EE_Cart Object |
|
23 | - * @access public |
|
24 | - * @var EE_Cart $CART |
|
25 | - */ |
|
22 | + * EE_Cart Object |
|
23 | + * @access public |
|
24 | + * @var EE_Cart $CART |
|
25 | + */ |
|
26 | 26 | public $CART = NULL; |
27 | 27 | |
28 | 28 | /** |
29 | - * EE_Config Object |
|
30 | - * @access public |
|
31 | - * @var EE_Config $CFG |
|
32 | - */ |
|
29 | + * EE_Config Object |
|
30 | + * @access public |
|
31 | + * @var EE_Config $CFG |
|
32 | + */ |
|
33 | 33 | public $CFG = NULL; |
34 | 34 | |
35 | 35 | |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | |
45 | 45 | |
46 | 46 | /** |
47 | - * StdClass object for storing library classes in |
|
48 | - * @public LIB |
|
49 | - */ |
|
47 | + * StdClass object for storing library classes in |
|
48 | + * @public LIB |
|
49 | + */ |
|
50 | 50 | public $LIB = NULL; |
51 | 51 | |
52 | 52 | /** |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | public $REQ = NULL; |
58 | 58 | |
59 | 59 | /** |
60 | - * EE_Session Object |
|
61 | - * @access public |
|
62 | - * @var EE_Session $SSN |
|
63 | - */ |
|
60 | + * EE_Session Object |
|
61 | + * @access public |
|
62 | + * @var EE_Session $SSN |
|
63 | + */ |
|
64 | 64 | public $SSN = NULL; |
65 | 65 | |
66 | 66 | |
@@ -127,21 +127,21 @@ discard block |
||
127 | 127 | |
128 | 128 | |
129 | 129 | /** |
130 | - * $i18n_js_strings - internationalization for JS strings |
|
131 | - * usage: EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' ); |
|
132 | - * in js file: var translatedString = eei18n.string_key; |
|
133 | - * |
|
134 | - * @access public |
|
135 | - * @var array |
|
136 | - */ |
|
130 | + * $i18n_js_strings - internationalization for JS strings |
|
131 | + * usage: EE_Registry::i18n_js_strings['string_key'] = __( 'string to translate.', 'event_espresso' ); |
|
132 | + * in js file: var translatedString = eei18n.string_key; |
|
133 | + * |
|
134 | + * @access public |
|
135 | + * @var array |
|
136 | + */ |
|
137 | 137 | public static $i18n_js_strings = array(); |
138 | 138 | |
139 | 139 | /** |
140 | - * $main_file - path to espresso.php |
|
141 | - * |
|
142 | - * @access public |
|
143 | - * @var array |
|
144 | - */ |
|
140 | + * $main_file - path to espresso.php |
|
141 | + * |
|
142 | + * @access public |
|
143 | + * @var array |
|
144 | + */ |
|
145 | 145 | public $main_file; |
146 | 146 | |
147 | 147 |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | * is_espresso_page |
272 | 272 | * |
273 | 273 | * @access public |
274 | - * @param null $value |
|
274 | + * @param boolean $value |
|
275 | 275 | * @return mixed |
276 | 276 | */ |
277 | 277 | public function set_espresso_page( $value = null ) { |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | * setter |
308 | 308 | * |
309 | 309 | * @access public |
310 | - * @param $key |
|
310 | + * @param string $key |
|
311 | 311 | * @param $value |
312 | 312 | * @param bool $override_ee |
313 | 313 | * @return void |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | * remove param |
353 | 353 | * |
354 | 354 | * @access public |
355 | - * @param $key |
|
355 | + * @param string $key |
|
356 | 356 | * @return void |
357 | 357 | */ |
358 | 358 | public function un_set( $key ) { |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | * add_output |
393 | 393 | * |
394 | 394 | * @access public |
395 | - * @param $string |
|
395 | + * @param string $string |
|
396 | 396 | * @return void |
397 | 397 | */ |
398 | 398 | public function add_output( $string ) { |
@@ -65,18 +65,18 @@ discard block |
||
65 | 65 | * @param WP_Query $wp |
66 | 66 | * @return \EE_Request_Handler |
67 | 67 | */ |
68 | - public function __construct( $wp = null ) { |
|
68 | + public function __construct($wp = null) { |
|
69 | 69 | //if somebody forgot to provide us with WP, that's ok because its global |
70 | - if( ! $wp){ |
|
70 | + if ( ! $wp) { |
|
71 | 71 | global $wp; |
72 | 72 | } |
73 | 73 | // grab request vars |
74 | 74 | $this->_params = $_REQUEST; |
75 | 75 | // AJAX ??? |
76 | - $this->ajax = defined( 'DOING_AJAX' ) ? true : false; |
|
77 | - $this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false; |
|
78 | - $this->set_request_vars( $wp ); |
|
79 | - do_action( 'AHEE__EE_Request_Handler__construct__complete' ); |
|
76 | + $this->ajax = defined('DOING_AJAX') ? true : false; |
|
77 | + $this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false; |
|
78 | + $this->set_request_vars($wp); |
|
79 | + do_action('AHEE__EE_Request_Handler__construct__complete'); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | * @param WP_Query $wp |
89 | 89 | * @return void |
90 | 90 | */ |
91 | - public function set_request_vars( $wp = null ) { |
|
92 | - if ( ! is_admin() ) { |
|
91 | + public function set_request_vars($wp = null) { |
|
92 | + if ( ! is_admin()) { |
|
93 | 93 | // set request post_id |
94 | - $this->set( 'post_id', $this->get_post_id_from_request( $wp )); |
|
94 | + $this->set('post_id', $this->get_post_id_from_request($wp)); |
|
95 | 95 | // set request post name |
96 | - $this->set( 'post_name', $this->get_post_name_from_request( $wp )); |
|
96 | + $this->set('post_name', $this->get_post_name_from_request($wp)); |
|
97 | 97 | // set request post_type |
98 | - $this->set( 'post_type', $this->get_post_type_from_request( $wp )); |
|
98 | + $this->set('post_type', $this->get_post_type_from_request($wp)); |
|
99 | 99 | // true or false ? is this page being used by EE ? |
100 | 100 | $this->set_espresso_page(); |
101 | 101 | } |
@@ -110,20 +110,20 @@ discard block |
||
110 | 110 | * @param WP_Query $wp |
111 | 111 | * @return int |
112 | 112 | */ |
113 | - public function get_post_id_from_request( $wp = null ) { |
|
114 | - if( ! $wp){ |
|
113 | + public function get_post_id_from_request($wp = null) { |
|
114 | + if ( ! $wp) { |
|
115 | 115 | global $wp; |
116 | 116 | } |
117 | 117 | $post_id = null; |
118 | - if ( isset( $wp->query_vars['p'] )) { |
|
118 | + if (isset($wp->query_vars['p'])) { |
|
119 | 119 | $post_id = $wp->query_vars['p']; |
120 | 120 | } |
121 | - if ( ! $post_id && isset( $wp->query_vars['page_id'] )) { |
|
121 | + if ( ! $post_id && isset($wp->query_vars['page_id'])) { |
|
122 | 122 | $post_id = $wp->query_vars['page_id']; |
123 | 123 | } |
124 | - if ( ! $post_id && isset( $wp->request )) { |
|
125 | - if ( is_numeric( basename( $wp->request ))) { |
|
126 | - $post_id = basename( $wp->request ); |
|
124 | + if ( ! $post_id && isset($wp->request)) { |
|
125 | + if (is_numeric(basename($wp->request))) { |
|
126 | + $post_id = basename($wp->request); |
|
127 | 127 | } |
128 | 128 | } |
129 | 129 | return $post_id; |
@@ -138,35 +138,35 @@ discard block |
||
138 | 138 | * @param WP_Query $wp |
139 | 139 | * @return string |
140 | 140 | */ |
141 | - public function get_post_name_from_request( $wp = null ) { |
|
142 | - if( ! $wp){ |
|
141 | + public function get_post_name_from_request($wp = null) { |
|
142 | + if ( ! $wp) { |
|
143 | 143 | global $wp; |
144 | 144 | } |
145 | 145 | $post_name = null; |
146 | - if ( isset( $wp->query_vars['name'] ) && ! empty( $wp->query_vars['name'] )) { |
|
146 | + if (isset($wp->query_vars['name']) && ! empty($wp->query_vars['name'])) { |
|
147 | 147 | $post_name = $wp->query_vars['name']; |
148 | 148 | } |
149 | - if ( ! $post_name && isset( $wp->query_vars['pagename'] ) && ! empty( $wp->query_vars['pagename'] )) { |
|
149 | + if ( ! $post_name && isset($wp->query_vars['pagename']) && ! empty($wp->query_vars['pagename'])) { |
|
150 | 150 | $post_name = $wp->query_vars['pagename']; |
151 | 151 | } |
152 | - if ( ! $post_name && isset( $wp->request ) && ! empty( $wp->request )) { |
|
153 | - $possible_post_name = basename( $wp->request ); |
|
154 | - if ( ! is_numeric( $possible_post_name )) { |
|
152 | + if ( ! $post_name && isset($wp->request) && ! empty($wp->request)) { |
|
153 | + $possible_post_name = basename($wp->request); |
|
154 | + if ( ! is_numeric($possible_post_name)) { |
|
155 | 155 | /** @type WPDB $wpdb */ |
156 | 156 | global $wpdb; |
157 | - $SQL = 'SELECT ID from ' . $wpdb->posts . ' WHERE post_status="publish" AND post_name=%d'; |
|
158 | - $possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $possible_post_name )); |
|
159 | - if ( $possible_post_name ) { |
|
157 | + $SQL = 'SELECT ID from '.$wpdb->posts.' WHERE post_status="publish" AND post_name=%d'; |
|
158 | + $possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name)); |
|
159 | + if ($possible_post_name) { |
|
160 | 160 | $post_name = $possible_post_name; |
161 | 161 | } |
162 | 162 | } |
163 | 163 | } |
164 | - if ( ! $post_name && $this->get( 'post_id' )) { |
|
164 | + if ( ! $post_name && $this->get('post_id')) { |
|
165 | 165 | /** @type WPDB $wpdb */ |
166 | 166 | global $wpdb; |
167 | - $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_status="publish" AND ID=%d'; |
|
168 | - $possible_post_name = $wpdb->get_var( $wpdb->prepare( $SQL, $this->get( 'post_id' ))); |
|
169 | - if( $possible_post_name ) { |
|
167 | + $SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_status="publish" AND ID=%d'; |
|
168 | + $possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->get('post_id'))); |
|
169 | + if ($possible_post_name) { |
|
170 | 170 | $post_name = $possible_post_name; |
171 | 171 | } |
172 | 172 | } |
@@ -182,11 +182,11 @@ discard block |
||
182 | 182 | * @param WP_Query $wp |
183 | 183 | * @return mixed |
184 | 184 | */ |
185 | - public function get_post_type_from_request( $wp = null ) { |
|
186 | - if( ! $wp){ |
|
185 | + public function get_post_type_from_request($wp = null) { |
|
186 | + if ( ! $wp) { |
|
187 | 187 | global $wp; |
188 | 188 | } |
189 | - return isset( $wp->query_vars['post_type'] ) ? $wp->query_vars['post_type'] : null; |
|
189 | + return isset($wp->query_vars['post_type']) ? $wp->query_vars['post_type'] : null; |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | |
@@ -199,41 +199,41 @@ discard block |
||
199 | 199 | public function test_for_espresso_page() { |
200 | 200 | global $wp; |
201 | 201 | /** @type EE_CPT_Strategy $EE_CPT_Strategy */ |
202 | - $EE_CPT_Strategy = EE_Registry::instance()->load_core( 'CPT_Strategy' ); |
|
202 | + $EE_CPT_Strategy = EE_Registry::instance()->load_core('CPT_Strategy'); |
|
203 | 203 | $espresso_CPT_taxonomies = $EE_CPT_Strategy->get_CPT_taxonomies(); |
204 | - if ( is_array( $espresso_CPT_taxonomies ) ) { |
|
205 | - foreach ( $espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details ) { |
|
206 | - if ( isset( $wp->query_vars, $wp->query_vars[ $espresso_CPT_taxonomy ] ) ) { |
|
204 | + if (is_array($espresso_CPT_taxonomies)) { |
|
205 | + foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy =>$details) { |
|
206 | + if (isset($wp->query_vars, $wp->query_vars[$espresso_CPT_taxonomy])) { |
|
207 | 207 | return true; |
208 | 208 | } |
209 | 209 | } |
210 | 210 | } |
211 | 211 | // load espresso CPT endpoints |
212 | 212 | $espresso_CPT_endpoints = $EE_CPT_Strategy->get_CPT_endpoints(); |
213 | - $post_type_CPT_endpoints = array_flip( $espresso_CPT_endpoints ); |
|
214 | - $post_types = (array)$this->get( 'post_type' ); |
|
215 | - foreach ( $post_types as $post_type ) { |
|
213 | + $post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints); |
|
214 | + $post_types = (array) $this->get('post_type'); |
|
215 | + foreach ($post_types as $post_type) { |
|
216 | 216 | // was a post name passed ? |
217 | - if ( isset( $post_type_CPT_endpoints[ $post_type ] ) ) { |
|
217 | + if (isset($post_type_CPT_endpoints[$post_type])) { |
|
218 | 218 | // kk we know this is an espresso page, but is it a specific post ? |
219 | - if ( ! $this->get( 'post_name' ) ) { |
|
219 | + if ( ! $this->get('post_name')) { |
|
220 | 220 | // there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events |
221 | - $post_name = isset( $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] ) ? $post_type_CPT_endpoints[ $this->get( 'post_type' ) ] : null; |
|
221 | + $post_name = isset($post_type_CPT_endpoints[$this->get('post_type')]) ? $post_type_CPT_endpoints[$this->get('post_type')] : null; |
|
222 | 222 | // if the post type matches on of our then set the endpoint |
223 | - if ( $post_name ) { |
|
224 | - $this->set( 'post_name', $post_name ); |
|
223 | + if ($post_name) { |
|
224 | + $this->set('post_name', $post_name); |
|
225 | 225 | } |
226 | 226 | } |
227 | 227 | return true; |
228 | 228 | } |
229 | 229 | } |
230 | - if ( $this->get( 'post_name' )) { |
|
230 | + if ($this->get('post_name')) { |
|
231 | 231 | // load all pages using espresso shortcodes |
232 | - $post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array(); |
|
232 | + $post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array(); |
|
233 | 233 | // make sure core pages are included |
234 | - $espresso_pages = array_merge( $espresso_CPT_endpoints, $post_shortcodes ); |
|
234 | + $espresso_pages = array_merge($espresso_CPT_endpoints, $post_shortcodes); |
|
235 | 235 | // was a post name passed ? |
236 | - if ( isset( $espresso_pages[ $this->get( 'post_name' ) ] )) { |
|
236 | + if (isset($espresso_pages[$this->get('post_name')])) { |
|
237 | 237 | return true; |
238 | 238 | } |
239 | 239 | } |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * @param null $value |
250 | 250 | * @return mixed |
251 | 251 | */ |
252 | - public function set_espresso_page( $value = null ) { |
|
252 | + public function set_espresso_page($value = null) { |
|
253 | 253 | $value = $value ? $value : $this->test_for_espresso_page(); |
254 | 254 | $this->_params['is_espresso_page'] = $value; |
255 | 255 | } |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | * @return mixed |
264 | 264 | */ |
265 | 265 | public function is_espresso_page() { |
266 | - return isset( $this->_params['is_espresso_page'] ) ? $this->_params['is_espresso_page'] : false; |
|
266 | + return isset($this->_params['is_espresso_page']) ? $this->_params['is_espresso_page'] : false; |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | |
@@ -287,10 +287,10 @@ discard block |
||
287 | 287 | * @param bool $override_ee |
288 | 288 | * @return void |
289 | 289 | */ |
290 | - public function set( $key, $value, $override_ee = false ) { |
|
290 | + public function set($key, $value, $override_ee = false) { |
|
291 | 291 | // don't allow "ee" to be overwritten unless explicitly instructed to do so |
292 | - if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) { |
|
293 | - $this->_params[ $key ] = $value; |
|
292 | + if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) { |
|
293 | + $this->_params[$key] = $value; |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | |
@@ -304,8 +304,8 @@ discard block |
||
304 | 304 | * @param null $default |
305 | 305 | * @return mixed |
306 | 306 | */ |
307 | - public function get( $key, $default = null ) { |
|
308 | - return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default; |
|
307 | + public function get($key, $default = null) { |
|
308 | + return isset($this->_params[$key]) ? $this->_params[$key] : $default; |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | |
@@ -317,8 +317,8 @@ discard block |
||
317 | 317 | * @param $key |
318 | 318 | * @return boolean |
319 | 319 | */ |
320 | - public function is_set( $key ) { |
|
321 | - return isset( $this->_params[ $key ] ) ? true : false; |
|
320 | + public function is_set($key) { |
|
321 | + return isset($this->_params[$key]) ? true : false; |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | * @param $key |
331 | 331 | * @return void |
332 | 332 | */ |
333 | - public function un_set( $key ) { |
|
334 | - unset( $this->_params[ $key ] ); |
|
333 | + public function un_set($key) { |
|
334 | + unset($this->_params[$key]); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | |
@@ -344,8 +344,8 @@ discard block |
||
344 | 344 | * @param $value |
345 | 345 | * @return void |
346 | 346 | */ |
347 | - public function set_notice( $key, $value ) { |
|
348 | - $this->_notice[ $key ] = $value; |
|
347 | + public function set_notice($key, $value) { |
|
348 | + $this->_notice[$key] = $value; |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | |
@@ -357,8 +357,8 @@ discard block |
||
357 | 357 | * @param $key |
358 | 358 | * @return mixed |
359 | 359 | */ |
360 | - public function get_notice( $key ) { |
|
361 | - return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : null; |
|
360 | + public function get_notice($key) { |
|
361 | + return isset($this->_notice[$key]) ? $this->_notice[$key] : null; |
|
362 | 362 | } |
363 | 363 | |
364 | 364 | |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | * @param $string |
371 | 371 | * @return void |
372 | 372 | */ |
373 | - public function add_output( $string ) { |
|
373 | + public function add_output($string) { |
|
374 | 374 | $this->_output .= $string; |
375 | 375 | } |
376 | 376 | |
@@ -392,8 +392,8 @@ discard block |
||
392 | 392 | * @param $item |
393 | 393 | * @param $key |
394 | 394 | */ |
395 | - function sanitize_text_field_for_array_walk( &$item, &$key ) { |
|
396 | - $item = strpos( $item, 'email' ) !== false ? sanitize_email( $item ) : sanitize_text_field( $item ); |
|
395 | + function sanitize_text_field_for_array_walk(&$item, &$key) { |
|
396 | + $item = strpos($item, 'email') !== false ? sanitize_email($item) : sanitize_text_field($item); |
|
397 | 397 | } |
398 | 398 | |
399 | 399 | |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | * @param $b |
404 | 404 | * @return bool |
405 | 405 | */ |
406 | - public function __set($a,$b) { return false; } |
|
406 | + public function __set($a, $b) { return false; } |
|
407 | 407 | |
408 | 408 | |
409 | 409 |
@@ -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 | * |
@@ -630,6 +630,7 @@ discard block |
||
630 | 630 | * @access public |
631 | 631 | * @static |
632 | 632 | * @param string $table_name, without prefixed $wpdb->prefix |
633 | + * @param string $table_name |
|
633 | 634 | * @return array of database column names |
634 | 635 | */ |
635 | 636 | public static function get_fields_on_table( $table_name = NULL ) { |
@@ -699,7 +700,7 @@ discard block |
||
699 | 700 | * @access public |
700 | 701 | * @static |
701 | 702 | * @throws EE_Error |
702 | - * @return boolean success (whether database is setup properly or not) |
|
703 | + * @return false|null success (whether database is setup properly or not) |
|
703 | 704 | */ |
704 | 705 | public static function create_database_tables() { |
705 | 706 | EE_Registry::instance()->load_core( 'Data_Migration_Manager' ); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * be called on plugin activation and reactivation |
48 | 48 | * @return boolean success, whether the database and folders are setup properly |
49 | 49 | */ |
50 | - public static function initialize_db_and_folders(){ |
|
50 | + public static function initialize_db_and_folders() { |
|
51 | 51 | $good_filesystem = EEH_Activation::create_upload_directories(); |
52 | 52 | $good_db = EEH_Activation::create_database_tables(); |
53 | 53 | return $good_filesystem && $good_db; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * upon activation of a new plugin, reactivation, and at the end |
60 | 60 | * of running migration scripts |
61 | 61 | */ |
62 | - public static function initialize_db_content(){ |
|
62 | + public static function initialize_db_content() { |
|
63 | 63 | EEH_Activation::initialize_system_questions(); |
64 | 64 | EEH_Activation::insert_default_status_codes(); |
65 | 65 | EEH_Activation::generate_default_message_templates(); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | EEH_Activation::validate_messages_system(); |
70 | 70 | EEH_Activation::insert_default_payment_methods(); |
71 | 71 | //also, check for CAF default db content |
72 | - do_action( 'AHEE__EEH_Activation__initialize_db_content' ); |
|
72 | + do_action('AHEE__EEH_Activation__initialize_db_content'); |
|
73 | 73 | //also: EEM_Gateways::load_all_gateways() outputs a lot of success messages |
74 | 74 | //which users really won't care about on initial activation |
75 | 75 | EE_Error::overwrite_success(); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | public static function CPT_initialization() { |
89 | 89 | // register Custom Post Types |
90 | - EE_Registry::instance()->load_core( 'Register_CPTs' ); |
|
90 | + EE_Registry::instance()->load_core('Register_CPTs'); |
|
91 | 91 | flush_rewrite_rules(); |
92 | 92 | } |
93 | 93 | |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | */ |
104 | 104 | public static function deactivate_event_espresso() { |
105 | 105 | // check permissions |
106 | - if ( current_user_can( 'activate_plugins' )) { |
|
107 | - deactivate_plugins( EE_PLUGIN_BASENAME, TRUE ); |
|
106 | + if (current_user_can('activate_plugins')) { |
|
107 | + deactivate_plugins(EE_PLUGIN_BASENAME, TRUE); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
@@ -126,79 +126,79 @@ discard block |
||
126 | 126 | $critical_pages = array( |
127 | 127 | array( |
128 | 128 | 'id' =>'reg_page_id', |
129 | - 'name' => __( 'Registration Checkout', 'event_espresso' ), |
|
129 | + 'name' => __('Registration Checkout', 'event_espresso'), |
|
130 | 130 | 'post' => NULL, |
131 | 131 | 'code' => 'ESPRESSO_CHECKOUT' |
132 | 132 | ), |
133 | 133 | array( |
134 | 134 | 'id' => 'txn_page_id', |
135 | - 'name' => __( 'Transactions', 'event_espresso' ), |
|
135 | + 'name' => __('Transactions', 'event_espresso'), |
|
136 | 136 | 'post' => NULL, |
137 | 137 | 'code' => 'ESPRESSO_TXN_PAGE' |
138 | 138 | ), |
139 | 139 | array( |
140 | 140 | 'id' => 'thank_you_page_id', |
141 | - 'name' => __( 'Thank You', 'event_espresso' ), |
|
141 | + 'name' => __('Thank You', 'event_espresso'), |
|
142 | 142 | 'post' => NULL, |
143 | 143 | 'code' => 'ESPRESSO_THANK_YOU' |
144 | 144 | ), |
145 | 145 | array( |
146 | 146 | 'id' => 'cancel_page_id', |
147 | - 'name' => __( 'Registration Cancelled', 'event_espresso' ), |
|
147 | + 'name' => __('Registration Cancelled', 'event_espresso'), |
|
148 | 148 | 'post' => NULL, |
149 | 149 | 'code' => 'ESPRESSO_CANCELLED' |
150 | 150 | ), |
151 | 151 | ); |
152 | 152 | |
153 | - foreach ( $critical_pages as $critical_page ) { |
|
153 | + foreach ($critical_pages as $critical_page) { |
|
154 | 154 | // is critical page ID set in config ? |
155 | - if ( EE_Registry::instance()->CFG->core->$critical_page['id'] !== FALSE ) { |
|
155 | + if (EE_Registry::instance()->CFG->core->$critical_page['id'] !== FALSE) { |
|
156 | 156 | // attempt to find post by ID |
157 | - $critical_page['post'] = get_post( EE_Registry::instance()->CFG->core->$critical_page['id'] ); |
|
157 | + $critical_page['post'] = get_post(EE_Registry::instance()->CFG->core->$critical_page['id']); |
|
158 | 158 | } |
159 | 159 | // no dice? |
160 | - if ( $critical_page['post'] == NULL ) { |
|
160 | + if ($critical_page['post'] == NULL) { |
|
161 | 161 | // attempt to find post by title |
162 | - $critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] ); |
|
162 | + $critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']); |
|
163 | 163 | // still nothing? |
164 | - if ( $critical_page['post'] == NULL ) { |
|
165 | - $critical_page = EEH_Activation::create_critical_page( $critical_page ); |
|
164 | + if ($critical_page['post'] == NULL) { |
|
165 | + $critical_page = EEH_Activation::create_critical_page($critical_page); |
|
166 | 166 | // REALLY? Still nothing ??!?!? |
167 | - if ( $critical_page['post'] == NULL ) { |
|
168 | - $msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' ); |
|
169 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
167 | + if ($critical_page['post'] == NULL) { |
|
168 | + $msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso'); |
|
169 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
170 | 170 | break; |
171 | 171 | } |
172 | 172 | } |
173 | 173 | } |
174 | 174 | // track post_shortcodes |
175 | - if ( $critical_page['post'] ) { |
|
176 | - EEH_Activation::_track_critical_page_post_shortcodes( $critical_page ); |
|
175 | + if ($critical_page['post']) { |
|
176 | + EEH_Activation::_track_critical_page_post_shortcodes($critical_page); |
|
177 | 177 | } |
178 | 178 | // check that Post ID matches critical page ID in config |
179 | - if ( isset( $critical_page['post']->ID ) && $critical_page['post']->ID != EE_Registry::instance()->CFG->core->$critical_page['id'] ) { |
|
179 | + if (isset($critical_page['post']->ID) && $critical_page['post']->ID != EE_Registry::instance()->CFG->core->$critical_page['id']) { |
|
180 | 180 | //update Config with post ID |
181 | 181 | EE_Registry::instance()->CFG->core->$critical_page['id'] = $critical_page['post']->ID; |
182 | - if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) { |
|
183 | - $msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' ); |
|
184 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
182 | + if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) { |
|
183 | + $msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso'); |
|
184 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
185 | 185 | } |
186 | 186 | } |
187 | 187 | |
188 | - $critical_page_problem = ! isset( $critical_page['post']->post_status ) || $critical_page['post']->post_status != 'publish' || strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE ? TRUE : $critical_page_problem; |
|
188 | + $critical_page_problem = ! isset($critical_page['post']->post_status) || $critical_page['post']->post_status != 'publish' || strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE ? TRUE : $critical_page_problem; |
|
189 | 189 | |
190 | 190 | } |
191 | 191 | |
192 | - if ( $critical_page_problem ) { |
|
192 | + if ($critical_page_problem) { |
|
193 | 193 | $msg = sprintf( |
194 | - __('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ), |
|
195 | - '<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>' |
|
194 | + __('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'), |
|
195 | + '<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>' |
|
196 | 196 | ); |
197 | - EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg ); |
|
197 | + EE_Error::add_persistent_admin_notice('critical_page_problem', $msg); |
|
198 | 198 | } |
199 | 199 | |
200 | - if ( EE_Error::has_notices() ) { |
|
201 | - EE_Error::get_notices( FALSE, TRUE, TRUE ); |
|
200 | + if (EE_Error::has_notices()) { |
|
201 | + EE_Error::get_notices(FALSE, TRUE, TRUE); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | } |
@@ -211,13 +211,13 @@ discard block |
||
211 | 211 | * parameter to the shortcode |
212 | 212 | * @return WP_Post or NULl |
213 | 213 | */ |
214 | - public static function get_page_by_ee_shortcode($ee_shortcode){ |
|
214 | + public static function get_page_by_ee_shortcode($ee_shortcode) { |
|
215 | 215 | global $wpdb; |
216 | 216 | $shortcode_and_opening_bracket = '['.$ee_shortcode; |
217 | 217 | $post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1"); |
218 | - if($post_id){ |
|
218 | + if ($post_id) { |
|
219 | 219 | return get_post($post_id); |
220 | - }else{ |
|
220 | + } else { |
|
221 | 221 | return NULL; |
222 | 222 | } |
223 | 223 | |
@@ -234,32 +234,32 @@ discard block |
||
234 | 234 | * @param array $critical_page |
235 | 235 | * @return array |
236 | 236 | */ |
237 | - public static function create_critical_page( $critical_page ) { |
|
237 | + public static function create_critical_page($critical_page) { |
|
238 | 238 | |
239 | 239 | $post_args = array( |
240 | 240 | 'post_title' => $critical_page['name'], |
241 | 241 | 'post_status' => 'publish', |
242 | 242 | 'post_type' => 'page', |
243 | 243 | 'comment_status' => 'closed', |
244 | - 'post_content' => '[' . $critical_page['code'] . ']' |
|
244 | + 'post_content' => '['.$critical_page['code'].']' |
|
245 | 245 | ); |
246 | 246 | |
247 | - $post_id = wp_insert_post( $post_args ); |
|
248 | - if ( ! $post_id ) { |
|
247 | + $post_id = wp_insert_post($post_args); |
|
248 | + if ( ! $post_id) { |
|
249 | 249 | $msg = sprintf( |
250 | - __( 'The Event Espresso critical page entitled "%s" could not be created.', 'event_espresso' ), |
|
250 | + __('The Event Espresso critical page entitled "%s" could not be created.', 'event_espresso'), |
|
251 | 251 | $critical_page['name'] |
252 | 252 | ); |
253 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
253 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
254 | 254 | return $critical_page; |
255 | 255 | } |
256 | 256 | // get newly created post's details |
257 | - if ( ! $critical_page['post'] = get_post( $post_id )) { |
|
257 | + if ( ! $critical_page['post'] = get_post($post_id)) { |
|
258 | 258 | $msg = sprintf( |
259 | - __( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ), |
|
259 | + __('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'), |
|
260 | 260 | $critical_page['name'] |
261 | 261 | ); |
262 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
262 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
263 | 263 | } |
264 | 264 | |
265 | 265 | return $critical_page; |
@@ -278,34 +278,34 @@ discard block |
||
278 | 278 | * @param array $critical_page |
279 | 279 | * @return void |
280 | 280 | */ |
281 | - private static function _track_critical_page_post_shortcodes( $critical_page = array() ) { |
|
281 | + private static function _track_critical_page_post_shortcodes($critical_page = array()) { |
|
282 | 282 | // check the goods |
283 | - if ( ! $critical_page['post'] instanceof WP_Post ) { |
|
283 | + if ( ! $critical_page['post'] instanceof WP_Post) { |
|
284 | 284 | $msg = sprintf( |
285 | - __( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ), |
|
285 | + __('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'), |
|
286 | 286 | $critical_page['name'] |
287 | 287 | ); |
288 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
288 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
289 | 289 | return; |
290 | 290 | } |
291 | 291 | // map shortcode to post |
292 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID; |
|
292 | + EE_Registry::instance()->CFG->core->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID; |
|
293 | 293 | // and make sure it's NOT added to the WP "Posts Page" |
294 | 294 | // name of the WP Posts Page |
295 | 295 | $posts_page = EE_Registry::instance()->CFG->get_page_for_posts(); |
296 | - if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $posts_page ] )) { |
|
297 | - unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $posts_page ][ $critical_page['code'] ] ); |
|
296 | + if (isset(EE_Registry::instance()->CFG->core->post_shortcodes[$posts_page])) { |
|
297 | + unset(EE_Registry::instance()->CFG->core->post_shortcodes[$posts_page][$critical_page['code']]); |
|
298 | 298 | } |
299 | - if ( $posts_page != 'posts' && isset( EE_Registry::instance()->CFG->core->post_shortcodes['posts'] )) { |
|
300 | - unset( EE_Registry::instance()->CFG->core->post_shortcodes['posts'][ $critical_page['code'] ] ); |
|
299 | + if ($posts_page != 'posts' && isset(EE_Registry::instance()->CFG->core->post_shortcodes['posts'])) { |
|
300 | + unset(EE_Registry::instance()->CFG->core->post_shortcodes['posts'][$critical_page['code']]); |
|
301 | 301 | } |
302 | 302 | // update post_shortcode CFG |
303 | - if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) { |
|
303 | + if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) { |
|
304 | 304 | $msg = sprintf( |
305 | - __( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ), |
|
305 | + __('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'), |
|
306 | 306 | $critical_page['name'] |
307 | 307 | ); |
308 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
308 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
309 | 309 | } |
310 | 310 | } |
311 | 311 | |
@@ -323,24 +323,24 @@ discard block |
||
323 | 323 | public static function get_default_creator_id() { |
324 | 324 | global $wpdb; |
325 | 325 | |
326 | - if ( ! empty( self::$_default_creator_id ) ) { |
|
326 | + if ( ! empty(self::$_default_creator_id)) { |
|
327 | 327 | return self::$_default_creator_id; |
328 | 328 | }/**/ |
329 | 329 | |
330 | - $role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' ); |
|
330 | + $role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator'); |
|
331 | 331 | |
332 | 332 | //let's allow pre_filtering for early exits by altenative methods for getting id. We check for truthy result and if so then exit early. |
333 | - $pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check ); |
|
334 | - if ( $pre_filtered_id !== false ) { |
|
333 | + $pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check); |
|
334 | + if ($pre_filtered_id !== false) { |
|
335 | 335 | return (int) $pre_filtered_id; |
336 | 336 | } |
337 | 337 | |
338 | - $capabilities_key = $wpdb->prefix . 'capabilities'; |
|
339 | - $query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' ); |
|
340 | - $user_id = $wpdb->get_var( $query ); |
|
341 | - $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id ); |
|
342 | - if ( $user_id && intval( $user_id ) ) { |
|
343 | - self::$_default_creator_id = intval( $user_id ); |
|
338 | + $capabilities_key = $wpdb->prefix.'capabilities'; |
|
339 | + $query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%'); |
|
340 | + $user_id = $wpdb->get_var($query); |
|
341 | + $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id); |
|
342 | + if ($user_id && intval($user_id)) { |
|
343 | + self::$_default_creator_id = intval($user_id); |
|
344 | 344 | return self::$_default_creator_id; |
345 | 345 | } else { |
346 | 346 | return NULL; |
@@ -367,26 +367,26 @@ discard block |
||
367 | 367 | * @return void |
368 | 368 | * @throws EE_Error if there are database errors |
369 | 369 | */ |
370 | - public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ',$drop_table_if_pre_existed = false ) { |
|
370 | + public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_table_if_pre_existed = false) { |
|
371 | 371 | // echo "create table $table_name ". ($drop_table_if_pre_existed? 'but first nuke preexisting one' : 'or update it if it exists') . "<br>";//die; |
372 | - if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){ |
|
372 | + if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) { |
|
373 | 373 | return; |
374 | 374 | } |
375 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
376 | - if ( ! function_exists( 'dbDelta' )) { |
|
377 | - require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); |
|
375 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
376 | + if ( ! function_exists('dbDelta')) { |
|
377 | + require_once(ABSPATH.'wp-admin/includes/upgrade.php'); |
|
378 | 378 | } |
379 | 379 | global $wpdb; |
380 | - $wp_table_name = $wpdb->prefix . $table_name; |
|
380 | + $wp_table_name = $wpdb->prefix.$table_name; |
|
381 | 381 | // if(in_array(EE_System::instance()->detect_req_type(),array(EE_System::req_type_new_activation, EE_System::req_t) ) |
382 | - if($drop_table_if_pre_existed && EEH_Activation::table_exists( $wp_table_name ) ){ |
|
383 | - if( defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){ |
|
382 | + if ($drop_table_if_pre_existed && EEH_Activation::table_exists($wp_table_name)) { |
|
383 | + if (defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) { |
|
384 | 384 | $wpdb->query("DROP TABLE IF EXISTS $wp_table_name "); |
385 | - }else{ |
|
385 | + } else { |
|
386 | 386 | //so we should be more cautious rather than just dropping tables so easily |
387 | 387 | EE_Error::add_persistent_admin_notice( |
388 | - 'bad_table_' . $wp_table_name . '_detected', |
|
389 | - sprintf( __( 'Database table %1$s existed when it shouldn\'t, and probably contained erroneous data. You probably restored to a backup that didn\'t remove old tables didn\'t you? We recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ), |
|
388 | + 'bad_table_'.$wp_table_name.'_detected', |
|
389 | + sprintf(__('Database table %1$s existed when it shouldn\'t, and probably contained erroneous data. You probably restored to a backup that didn\'t remove old tables didn\'t you? We recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'), |
|
390 | 390 | $wp_table_name, |
391 | 391 | "<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>", |
392 | 392 | '<b>wp-config.php</b>', |
@@ -397,16 +397,16 @@ discard block |
||
397 | 397 | $SQL = "CREATE TABLE $wp_table_name ( $sql ) $engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;"; |
398 | 398 | //get $wpdb to echo errors, but buffer them. This way at least WE know an error |
399 | 399 | //happened. And then we can choose to tell the end user |
400 | - $old_show_errors_policy = $wpdb->show_errors( TRUE ); |
|
401 | - $old_error_supression_policy = $wpdb->suppress_errors( FALSE ); |
|
400 | + $old_show_errors_policy = $wpdb->show_errors(TRUE); |
|
401 | + $old_error_supression_policy = $wpdb->suppress_errors(FALSE); |
|
402 | 402 | ob_start(); |
403 | - dbDelta( $SQL ); |
|
403 | + dbDelta($SQL); |
|
404 | 404 | $output = ob_get_contents(); |
405 | 405 | ob_end_clean(); |
406 | - $wpdb->show_errors( $old_show_errors_policy ); |
|
407 | - $wpdb->suppress_errors( $old_error_supression_policy ); |
|
408 | - if( ! empty( $output ) ){ |
|
409 | - throw new EE_Error( $output ); |
|
406 | + $wpdb->show_errors($old_show_errors_policy); |
|
407 | + $wpdb->suppress_errors($old_error_supression_policy); |
|
408 | + if ( ! empty($output)) { |
|
409 | + throw new EE_Error($output); |
|
410 | 410 | } |
411 | 411 | } |
412 | 412 | |
@@ -423,15 +423,15 @@ discard block |
||
423 | 423 | * @param string $column_info if your SQL were 'ALTER TABLE table_name ADD price VARCHAR(10)', this would be 'VARCHAR(10)' |
424 | 424 | * @return bool|int |
425 | 425 | */ |
426 | - public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){ |
|
427 | - if( apply_filters( 'FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE ) ){ |
|
426 | + public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') { |
|
427 | + if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE)) { |
|
428 | 428 | return FALSE; |
429 | 429 | } |
430 | 430 | global $wpdb; |
431 | - $full_table_name=$wpdb->prefix.$table_name; |
|
431 | + $full_table_name = $wpdb->prefix.$table_name; |
|
432 | 432 | $fields = self::get_fields_on_table($table_name); |
433 | - if (!in_array($column_name, $fields)){ |
|
434 | - $alter_query="ALTER TABLE $full_table_name ADD $column_name $column_info"; |
|
433 | + if ( ! in_array($column_name, $fields)) { |
|
434 | + $alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info"; |
|
435 | 435 | //echo "alter query:$alter_query"; |
436 | 436 | return $wpdb->query($alter_query); |
437 | 437 | } |
@@ -450,15 +450,15 @@ discard block |
||
450 | 450 | * @param string $table_name, without prefixed $wpdb->prefix |
451 | 451 | * @return array of database column names |
452 | 452 | */ |
453 | - public static function get_fields_on_table( $table_name = NULL ) { |
|
453 | + public static function get_fields_on_table($table_name = NULL) { |
|
454 | 454 | global $wpdb; |
455 | - $table_name=$wpdb->prefix.$table_name; |
|
456 | - if ( ! empty( $table_name )) { |
|
455 | + $table_name = $wpdb->prefix.$table_name; |
|
456 | + if ( ! empty($table_name)) { |
|
457 | 457 | $columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name "); |
458 | 458 | if ($columns !== FALSE) { |
459 | 459 | $field_array = array(); |
460 | - foreach($columns as $column ){ |
|
461 | - $field_array[] = $column->Field;; |
|
460 | + foreach ($columns as $column) { |
|
461 | + $field_array[] = $column->Field; ; |
|
462 | 462 | } |
463 | 463 | return $field_array; |
464 | 464 | } |
@@ -476,10 +476,10 @@ discard block |
||
476 | 476 | * @param string $table_name |
477 | 477 | * @return bool | int |
478 | 478 | */ |
479 | - public static function delete_unused_db_table( $table_name ) { |
|
479 | + public static function delete_unused_db_table($table_name) { |
|
480 | 480 | global $wpdb; |
481 | - $table_name = strpos( $table_name, $wpdb->prefix ) === FALSE ? $wpdb->prefix . $table_name : $table_name; |
|
482 | - return $wpdb->query( 'DROP TABLE IF EXISTS '. $table_name ); |
|
481 | + $table_name = strpos($table_name, $wpdb->prefix) === FALSE ? $wpdb->prefix.$table_name : $table_name; |
|
482 | + return $wpdb->query('DROP TABLE IF EXISTS '.$table_name); |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | |
@@ -493,18 +493,18 @@ discard block |
||
493 | 493 | * @param string $index_name |
494 | 494 | * @return bool | int |
495 | 495 | */ |
496 | - public static function drop_index( $table_name, $index_name ) { |
|
497 | - if( apply_filters( 'FHEE__EEH_Activation__drop_index__short_circuit', FALSE ) ){ |
|
496 | + public static function drop_index($table_name, $index_name) { |
|
497 | + if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', FALSE)) { |
|
498 | 498 | return FALSE; |
499 | 499 | } |
500 | 500 | global $wpdb; |
501 | - $table_name_with_prefix = $wpdb->prefix . $table_name ; |
|
501 | + $table_name_with_prefix = $wpdb->prefix.$table_name; |
|
502 | 502 | $index_exists_query = "SHOW INDEX FROM $table_name_with_prefix WHERE Key_name = '$index_name'"; |
503 | 503 | if ( |
504 | - $wpdb->get_var( "SHOW TABLES LIKE '$table_name_with_prefix'" ) == $wpdb->prefix . $table_name |
|
505 | - && $wpdb->get_var( $index_exists_query ) == $table_name_with_prefix //using get_var with the $index_exists_query returns the table's name |
|
504 | + $wpdb->get_var("SHOW TABLES LIKE '$table_name_with_prefix'") == $wpdb->prefix.$table_name |
|
505 | + && $wpdb->get_var($index_exists_query) == $table_name_with_prefix //using get_var with the $index_exists_query returns the table's name |
|
506 | 506 | ) { |
507 | - return $wpdb->query( "ALTER TABLE $table_name_with_prefix DROP INDEX $index_name" ); |
|
507 | + return $wpdb->query("ALTER TABLE $table_name_with_prefix DROP INDEX $index_name"); |
|
508 | 508 | } |
509 | 509 | return TRUE; |
510 | 510 | } |
@@ -520,27 +520,27 @@ discard block |
||
520 | 520 | * @return boolean success (whether database is setup properly or not) |
521 | 521 | */ |
522 | 522 | public static function create_database_tables() { |
523 | - EE_Registry::instance()->load_core( 'Data_Migration_Manager' ); |
|
523 | + EE_Registry::instance()->load_core('Data_Migration_Manager'); |
|
524 | 524 | //find the migration script that sets the database to be compatible with the code |
525 | 525 | $dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms(); |
526 | - if( $dms_name ){ |
|
527 | - $current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name ); |
|
528 | - $current_data_migration_script->set_migrating( FALSE ); |
|
526 | + if ($dms_name) { |
|
527 | + $current_data_migration_script = EE_Registry::instance()->load_dms($dms_name); |
|
528 | + $current_data_migration_script->set_migrating(FALSE); |
|
529 | 529 | $current_data_migration_script->schema_changes_before_migration(); |
530 | 530 | $current_data_migration_script->schema_changes_after_migration(); |
531 | - if( $current_data_migration_script->get_errors() ){ |
|
532 | - if( WP_DEBUG ){ |
|
533 | - foreach( $current_data_migration_script->get_errors() as $error ){ |
|
534 | - EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ ); |
|
531 | + if ($current_data_migration_script->get_errors()) { |
|
532 | + if (WP_DEBUG) { |
|
533 | + foreach ($current_data_migration_script->get_errors() as $error) { |
|
534 | + EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__); |
|
535 | 535 | } |
536 | - }else{ |
|
537 | - EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) ); |
|
536 | + } else { |
|
537 | + EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso')); |
|
538 | 538 | } |
539 | 539 | return FALSE; |
540 | 540 | } |
541 | 541 | EE_Data_Migration_Manager::instance()->update_current_database_state_to(); |
542 | - }else{ |
|
543 | - EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__); |
|
542 | + } else { |
|
543 | + EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
544 | 544 | return FALSE; |
545 | 545 | } |
546 | 546 | } |
@@ -559,26 +559,26 @@ discard block |
||
559 | 559 | public static function initialize_system_questions() { |
560 | 560 | // QUESTION GROUPS |
561 | 561 | global $wpdb; |
562 | - $SQL = 'SELECT QSG_system FROM ' . $wpdb->prefix . 'esp_question_group WHERE QSG_system != 0'; |
|
562 | + $SQL = 'SELECT QSG_system FROM '.$wpdb->prefix.'esp_question_group WHERE QSG_system != 0'; |
|
563 | 563 | // what we have |
564 | - $question_groups = $wpdb->get_col( $SQL ); |
|
564 | + $question_groups = $wpdb->get_col($SQL); |
|
565 | 565 | // check the response |
566 | - $question_groups = is_array( $question_groups ) ? $question_groups : array(); |
|
566 | + $question_groups = is_array($question_groups) ? $question_groups : array(); |
|
567 | 567 | // what we should have |
568 | - $QSG_systems = array( 1, 2 ); |
|
568 | + $QSG_systems = array(1, 2); |
|
569 | 569 | // loop thru what we should have and compare to what we have |
570 | - foreach ( $QSG_systems as $QSG_system ) { |
|
570 | + foreach ($QSG_systems as $QSG_system) { |
|
571 | 571 | // reset values array |
572 | 572 | $QSG_values = array(); |
573 | 573 | // if we don't have what we should have (but use $QST_system as as string because that's what we got from the db) |
574 | - if ( ! in_array( "$QSG_system", $question_groups )) { |
|
574 | + if ( ! in_array("$QSG_system", $question_groups)) { |
|
575 | 575 | // add it |
576 | - switch ( $QSG_system ) { |
|
576 | + switch ($QSG_system) { |
|
577 | 577 | |
578 | 578 | case 1: |
579 | 579 | $QSG_values = array( |
580 | - 'QSG_name' => __( 'Personal Information', 'event_espresso' ), |
|
581 | - 'QSG_identifier' => 'personal-information-' . time(), |
|
580 | + 'QSG_name' => __('Personal Information', 'event_espresso'), |
|
581 | + 'QSG_identifier' => 'personal-information-'.time(), |
|
582 | 582 | 'QSG_desc' => '', |
583 | 583 | 'QSG_order' => 1, |
584 | 584 | 'QSG_show_group_name' => 1, |
@@ -590,8 +590,8 @@ discard block |
||
590 | 590 | |
591 | 591 | case 2: |
592 | 592 | $QSG_values = array( |
593 | - 'QSG_name' => __( 'Address Information','event_espresso' ), |
|
594 | - 'QSG_identifier' => 'address-information-' . time(), |
|
593 | + 'QSG_name' => __('Address Information', 'event_espresso'), |
|
594 | + 'QSG_identifier' => 'address-information-'.time(), |
|
595 | 595 | 'QSG_desc' => '', |
596 | 596 | 'QSG_order' => 2, |
597 | 597 | 'QSG_show_group_name' => 1, |
@@ -603,14 +603,14 @@ discard block |
||
603 | 603 | |
604 | 604 | } |
605 | 605 | // make sure we have some values before inserting them |
606 | - if ( ! empty( $QSG_values )) { |
|
606 | + if ( ! empty($QSG_values)) { |
|
607 | 607 | // insert system question |
608 | 608 | $wpdb->insert( |
609 | - $wpdb->prefix . 'esp_question_group', |
|
609 | + $wpdb->prefix.'esp_question_group', |
|
610 | 610 | $QSG_values, |
611 | - array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' ) |
|
611 | + array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d') |
|
612 | 612 | ); |
613 | - $QSG_IDs[ $QSG_system ] = $wpdb->insert_id; |
|
613 | + $QSG_IDs[$QSG_system] = $wpdb->insert_id; |
|
614 | 614 | } |
615 | 615 | } |
616 | 616 | } |
@@ -619,9 +619,9 @@ discard block |
||
619 | 619 | |
620 | 620 | // QUESTIONS |
621 | 621 | global $wpdb; |
622 | - $SQL = 'SELECT QST_system FROM ' . $wpdb->prefix . "esp_question WHERE QST_system != ''"; |
|
622 | + $SQL = 'SELECT QST_system FROM '.$wpdb->prefix."esp_question WHERE QST_system != ''"; |
|
623 | 623 | // what we have |
624 | - $questions = $wpdb->get_col( $SQL ); |
|
624 | + $questions = $wpdb->get_col($SQL); |
|
625 | 625 | // what we should have |
626 | 626 | $QST_systems = array( |
627 | 627 | 'fname', |
@@ -638,22 +638,22 @@ discard block |
||
638 | 638 | $order_for_group_1 = 1; |
639 | 639 | $order_for_group_2 = 1; |
640 | 640 | // loop thru what we should have and compare to what we have |
641 | - foreach ( $QST_systems as $QST_system ) { |
|
641 | + foreach ($QST_systems as $QST_system) { |
|
642 | 642 | // reset values array |
643 | 643 | $QST_values = array(); |
644 | 644 | // if we don't have what we should have |
645 | - if ( ! in_array( $QST_system, $questions )) { |
|
645 | + if ( ! in_array($QST_system, $questions)) { |
|
646 | 646 | // add it |
647 | - switch ( $QST_system ) { |
|
647 | + switch ($QST_system) { |
|
648 | 648 | |
649 | 649 | case 'fname': |
650 | 650 | $QST_values = array( |
651 | - 'QST_display_text' => __( 'First Name', 'event_espresso' ), |
|
652 | - 'QST_admin_label' => __( 'First Name - System Question', 'event_espresso' ), |
|
651 | + 'QST_display_text' => __('First Name', 'event_espresso'), |
|
652 | + 'QST_admin_label' => __('First Name - System Question', 'event_espresso'), |
|
653 | 653 | 'QST_system' => 'fname', |
654 | 654 | 'QST_type' => 'TEXT', |
655 | 655 | 'QST_required' => 1, |
656 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
656 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
657 | 657 | 'QST_order' => 1, |
658 | 658 | 'QST_admin_only' => 0, |
659 | 659 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -663,12 +663,12 @@ discard block |
||
663 | 663 | |
664 | 664 | case 'lname': |
665 | 665 | $QST_values = array( |
666 | - 'QST_display_text' => __( 'Last Name', 'event_espresso' ), |
|
667 | - 'QST_admin_label' => __( 'Last Name - System Question', 'event_espresso' ), |
|
666 | + 'QST_display_text' => __('Last Name', 'event_espresso'), |
|
667 | + 'QST_admin_label' => __('Last Name - System Question', 'event_espresso'), |
|
668 | 668 | 'QST_system' => 'lname', |
669 | 669 | 'QST_type' => 'TEXT', |
670 | 670 | 'QST_required' => 1, |
671 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
671 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
672 | 672 | 'QST_order' => 2, |
673 | 673 | 'QST_admin_only' => 0, |
674 | 674 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -678,12 +678,12 @@ discard block |
||
678 | 678 | |
679 | 679 | case 'email': |
680 | 680 | $QST_values = array( |
681 | - 'QST_display_text' => __( 'Email Address', 'event_espresso' ), |
|
682 | - 'QST_admin_label' => __( 'Email Address - System Question', 'event_espresso' ), |
|
681 | + 'QST_display_text' => __('Email Address', 'event_espresso'), |
|
682 | + 'QST_admin_label' => __('Email Address - System Question', 'event_espresso'), |
|
683 | 683 | 'QST_system' => 'email', |
684 | 684 | 'QST_type' => 'TEXT', |
685 | 685 | 'QST_required' => 1, |
686 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
686 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
687 | 687 | 'QST_order' => 3, |
688 | 688 | 'QST_admin_only' => 0, |
689 | 689 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -693,12 +693,12 @@ discard block |
||
693 | 693 | |
694 | 694 | case 'address': |
695 | 695 | $QST_values = array( |
696 | - 'QST_display_text' => __( 'Address', 'event_espresso' ), |
|
697 | - 'QST_admin_label' => __( 'Address - System Question', 'event_espresso' ), |
|
696 | + 'QST_display_text' => __('Address', 'event_espresso'), |
|
697 | + 'QST_admin_label' => __('Address - System Question', 'event_espresso'), |
|
698 | 698 | 'QST_system' => 'address', |
699 | 699 | 'QST_type' => 'TEXT', |
700 | 700 | 'QST_required' => 0, |
701 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
701 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
702 | 702 | 'QST_order' => 4, |
703 | 703 | 'QST_admin_only' => 0, |
704 | 704 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -708,12 +708,12 @@ discard block |
||
708 | 708 | |
709 | 709 | case 'address2': |
710 | 710 | $QST_values = array( |
711 | - 'QST_display_text' => __( 'Address2', 'event_espresso' ), |
|
712 | - 'QST_admin_label' => __( 'Address2 - System Question', 'event_espresso' ), |
|
711 | + 'QST_display_text' => __('Address2', 'event_espresso'), |
|
712 | + 'QST_admin_label' => __('Address2 - System Question', 'event_espresso'), |
|
713 | 713 | 'QST_system' => 'address2', |
714 | 714 | 'QST_type' => 'TEXT', |
715 | 715 | 'QST_required' => 0, |
716 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
716 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
717 | 717 | 'QST_order' => 5, |
718 | 718 | 'QST_admin_only' => 0, |
719 | 719 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -723,12 +723,12 @@ discard block |
||
723 | 723 | |
724 | 724 | case 'city': |
725 | 725 | $QST_values = array( |
726 | - 'QST_display_text' => __( 'City', 'event_espresso' ), |
|
727 | - 'QST_admin_label' => __( 'City - System Question', 'event_espresso' ), |
|
726 | + 'QST_display_text' => __('City', 'event_espresso'), |
|
727 | + 'QST_admin_label' => __('City - System Question', 'event_espresso'), |
|
728 | 728 | 'QST_system' => 'city', |
729 | 729 | 'QST_type' => 'TEXT', |
730 | 730 | 'QST_required' => 0, |
731 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
731 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
732 | 732 | 'QST_order' => 6, |
733 | 733 | 'QST_admin_only' => 0, |
734 | 734 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -738,12 +738,12 @@ discard block |
||
738 | 738 | |
739 | 739 | case 'state': |
740 | 740 | $QST_values = array( |
741 | - 'QST_display_text' => __( 'State/Province', 'event_espresso' ), |
|
742 | - 'QST_admin_label' => __( 'State/Province - System Question', 'event_espresso' ), |
|
741 | + 'QST_display_text' => __('State/Province', 'event_espresso'), |
|
742 | + 'QST_admin_label' => __('State/Province - System Question', 'event_espresso'), |
|
743 | 743 | 'QST_system' => 'state', |
744 | 744 | 'QST_type' => 'STATE', |
745 | 745 | 'QST_required' => 0, |
746 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
746 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
747 | 747 | 'QST_order' => 7, |
748 | 748 | 'QST_admin_only' => 0, |
749 | 749 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -753,12 +753,12 @@ discard block |
||
753 | 753 | |
754 | 754 | case 'country' : |
755 | 755 | $QST_values = array( |
756 | - 'QST_display_text' => __( 'Country', 'event_espresso' ), |
|
757 | - 'QST_admin_label' => __( 'Country - System Question', 'event_espresso' ), |
|
756 | + 'QST_display_text' => __('Country', 'event_espresso'), |
|
757 | + 'QST_admin_label' => __('Country - System Question', 'event_espresso'), |
|
758 | 758 | 'QST_system' => 'country', |
759 | 759 | 'QST_type' => 'COUNTRY', |
760 | 760 | 'QST_required' => 0, |
761 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
761 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
762 | 762 | 'QST_order' => 8, |
763 | 763 | 'QST_admin_only' => 0, |
764 | 764 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -768,12 +768,12 @@ discard block |
||
768 | 768 | |
769 | 769 | case 'zip': |
770 | 770 | $QST_values = array( |
771 | - 'QST_display_text' => __( 'Zip/Postal Code', 'event_espresso' ), |
|
772 | - 'QST_admin_label' => __( 'Zip/Postal Code - System Question', 'event_espresso' ), |
|
771 | + 'QST_display_text' => __('Zip/Postal Code', 'event_espresso'), |
|
772 | + 'QST_admin_label' => __('Zip/Postal Code - System Question', 'event_espresso'), |
|
773 | 773 | 'QST_system' => 'zip', |
774 | 774 | 'QST_type' => 'TEXT', |
775 | 775 | 'QST_required' => 0, |
776 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
776 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
777 | 777 | 'QST_order' => 9, |
778 | 778 | 'QST_admin_only' => 0, |
779 | 779 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -783,12 +783,12 @@ discard block |
||
783 | 783 | |
784 | 784 | case 'phone': |
785 | 785 | $QST_values = array( |
786 | - 'QST_display_text' => __( 'Phone Number', 'event_espresso' ), |
|
787 | - 'QST_admin_label' => __( 'Phone Number - System Question', 'event_espresso' ), |
|
786 | + 'QST_display_text' => __('Phone Number', 'event_espresso'), |
|
787 | + 'QST_admin_label' => __('Phone Number - System Question', 'event_espresso'), |
|
788 | 788 | 'QST_system' => 'phone', |
789 | 789 | 'QST_type' => 'TEXT', |
790 | 790 | 'QST_required' => 0, |
791 | - 'QST_required_text' => __( 'This field is required', 'event_espresso' ), |
|
791 | + 'QST_required_text' => __('This field is required', 'event_espresso'), |
|
792 | 792 | 'QST_order' => 10, |
793 | 793 | 'QST_admin_only' => 0, |
794 | 794 | 'QST_wp_user' => self::get_default_creator_id(), |
@@ -797,22 +797,22 @@ discard block |
||
797 | 797 | break; |
798 | 798 | |
799 | 799 | } |
800 | - if ( ! empty( $QST_values )) { |
|
800 | + if ( ! empty($QST_values)) { |
|
801 | 801 | // insert system question |
802 | 802 | $wpdb->insert( |
803 | - $wpdb->prefix . 'esp_question', |
|
803 | + $wpdb->prefix.'esp_question', |
|
804 | 804 | $QST_values, |
805 | - array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' ) |
|
805 | + array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d') |
|
806 | 806 | ); |
807 | 807 | $QST_ID = $wpdb->insert_id; |
808 | 808 | |
809 | 809 | // QUESTION GROUP QUESTIONS |
810 | - $QSG_ID = in_array( $QST_system, array('fname','lname','email')) ? 1 : 2; |
|
810 | + $QSG_ID = in_array($QST_system, array('fname', 'lname', 'email')) ? 1 : 2; |
|
811 | 811 | // add system questions to groups |
812 | 812 | $wpdb->insert( |
813 | - $wpdb->prefix . 'esp_question_group_question', |
|
814 | - array( 'QSG_ID' => $QSG_ID , 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID==1)? $order_for_group_1++ : $order_for_group_2++ ), |
|
815 | - array( '%d', '%d','%d' ) |
|
813 | + $wpdb->prefix.'esp_question_group_question', |
|
814 | + array('QSG_ID' => $QSG_ID, 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID == 1) ? $order_for_group_1++ : $order_for_group_2++), |
|
815 | + array('%d', '%d', '%d') |
|
816 | 816 | ); |
817 | 817 | } |
818 | 818 | } |
@@ -824,11 +824,11 @@ discard block |
||
824 | 824 | * Makes sure the default payment method (Invoice) is active. |
825 | 825 | * This used to be done automatically as part of constructing the old gateways config |
826 | 826 | */ |
827 | - public static function insert_default_payment_methods(){ |
|
828 | - if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){ |
|
829 | - EE_Registry::instance()->load_lib( 'Payment_Method_Manager' ); |
|
830 | - EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' ); |
|
831 | - }else{ |
|
827 | + public static function insert_default_payment_methods() { |
|
828 | + if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) { |
|
829 | + EE_Registry::instance()->load_lib('Payment_Method_Manager'); |
|
830 | + EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice'); |
|
831 | + } else { |
|
832 | 832 | EEM_Payment_Method::instance()->verify_button_urls(); |
833 | 833 | } |
834 | 834 | } |
@@ -844,12 +844,12 @@ discard block |
||
844 | 844 | |
845 | 845 | global $wpdb; |
846 | 846 | |
847 | - if ( EEH_Activation::table_exists( EEM_Status::instance()->table() ) ) { |
|
847 | + if (EEH_Activation::table_exists(EEM_Status::instance()->table())) { |
|
848 | 848 | |
849 | - $SQL = "DELETE FROM " . EEM_Status::instance()->table() . " WHERE STS_ID IN ( 'ACT', 'NAC', 'NOP', 'OPN', 'CLS', 'PND', 'ONG', 'SEC', 'DRF', 'DEL', 'DEN', 'EXP', 'RPP', 'RCN', 'RDC', 'RAP', 'RNA', 'TAB', 'TIN', 'TFL', 'TCM', 'TOP', 'PAP', 'PCN', 'PFL', 'PDC', 'EDR', 'ESN', 'PPN', 'RIC' );"; |
|
849 | + $SQL = "DELETE FROM ".EEM_Status::instance()->table()." WHERE STS_ID IN ( 'ACT', 'NAC', 'NOP', 'OPN', 'CLS', 'PND', 'ONG', 'SEC', 'DRF', 'DEL', 'DEN', 'EXP', 'RPP', 'RCN', 'RDC', 'RAP', 'RNA', 'TAB', 'TIN', 'TFL', 'TCM', 'TOP', 'PAP', 'PCN', 'PFL', 'PDC', 'EDR', 'ESN', 'PPN', 'RIC' );"; |
|
850 | 850 | $wpdb->query($SQL); |
851 | 851 | |
852 | - $SQL = "INSERT INTO " . EEM_Status::instance()->table() . " |
|
852 | + $SQL = "INSERT INTO ".EEM_Status::instance()->table()." |
|
853 | 853 | (STS_ID, STS_code, STS_type, STS_can_edit, STS_desc, STS_open) VALUES |
854 | 854 | ('ACT', 'ACTIVE', 'event', 0, NULL, 1), |
855 | 855 | ('NAC', 'NOT_ACTIVE', 'event', 0, NULL, 0), |
@@ -908,26 +908,26 @@ discard block |
||
908 | 908 | * @return boolean success of verifying upload directories exist |
909 | 909 | */ |
910 | 910 | public static function create_upload_directories() { |
911 | - EE_Registry::instance()->load_helper( 'File' ); |
|
911 | + EE_Registry::instance()->load_helper('File'); |
|
912 | 912 | // Create the required folders |
913 | 913 | $folders = array( |
914 | 914 | EVENT_ESPRESSO_UPLOAD_DIR, |
915 | 915 | EVENT_ESPRESSO_TEMPLATE_DIR, |
916 | 916 | EVENT_ESPRESSO_GATEWAY_DIR, |
917 | - EVENT_ESPRESSO_UPLOAD_DIR . '/logs/', |
|
918 | - EVENT_ESPRESSO_UPLOAD_DIR . '/css/', |
|
919 | - EVENT_ESPRESSO_UPLOAD_DIR . '/tickets/' |
|
917 | + EVENT_ESPRESSO_UPLOAD_DIR.'/logs/', |
|
918 | + EVENT_ESPRESSO_UPLOAD_DIR.'/css/', |
|
919 | + EVENT_ESPRESSO_UPLOAD_DIR.'/tickets/' |
|
920 | 920 | ); |
921 | - foreach ( $folders as $folder ) { |
|
921 | + foreach ($folders as $folder) { |
|
922 | 922 | try { |
923 | - EEH_File::ensure_folder_exists_and_is_writable( $folder ); |
|
924 | - @ chmod( $folder, 0755 ); |
|
925 | - } catch( EE_Error $e ){ |
|
923 | + EEH_File::ensure_folder_exists_and_is_writable($folder); |
|
924 | + @ chmod($folder, 0755); |
|
925 | + } catch (EE_Error $e) { |
|
926 | 926 | EE_Error::add_error( |
927 | 927 | sprintf( |
928 | - __( 'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ), |
|
928 | + __('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'), |
|
929 | 929 | $folder, |
930 | - '<br />' . $e->getMessage() |
|
930 | + '<br />'.$e->getMessage() |
|
931 | 931 | ), |
932 | 932 | __FILE__, __FUNCTION__, __LINE__ |
933 | 933 | ); |
@@ -953,16 +953,16 @@ discard block |
||
953 | 953 | $settings = $installed_messengers = $default_messengers = array(); |
954 | 954 | |
955 | 955 | //include our helper |
956 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
956 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
957 | 957 | |
958 | 958 | //get all installed messenger objects |
959 | 959 | $installed = EEH_MSG_Template::get_installed_message_objects(); |
960 | 960 | |
961 | 961 | //let's setup the $installed messengers in an array AND the messengers that are set to be activated on install. |
962 | - foreach ( $installed['messengers'] as $msgr ) { |
|
963 | - if ( $msgr instanceof EE_messenger ) { |
|
962 | + foreach ($installed['messengers'] as $msgr) { |
|
963 | + if ($msgr instanceof EE_messenger) { |
|
964 | 964 | $installed_messengers[$msgr->name] = $msgr; |
965 | - if ( $msgr->activate_on_install ) { |
|
965 | + if ($msgr->activate_on_install) { |
|
966 | 966 | $default_messengers[] = $msgr->name; |
967 | 967 | } |
968 | 968 | } |
@@ -972,36 +972,36 @@ discard block |
||
972 | 972 | $active_messengers = EEH_MSG_Template::get_active_messengers_in_db(); |
973 | 973 | |
974 | 974 | //things that have already been activated before |
975 | - $has_activated = get_option( 'ee_has_activated_messenger' ); |
|
975 | + $has_activated = get_option('ee_has_activated_messenger'); |
|
976 | 976 | |
977 | 977 | //do an initial loop to determine if we need to continue |
978 | 978 | $def_ms = array(); |
979 | - foreach ( $default_messengers as $msgr ) { |
|
980 | - if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) continue; |
|
979 | + foreach ($default_messengers as $msgr) { |
|
980 | + if (isset($active_messengers[$msgr]) || isset($has_activated[$msgr])) continue; |
|
981 | 981 | $def_ms[] = $msgr; |
982 | 982 | } |
983 | 983 | |
984 | 984 | //setup the $installed_mts in an array |
985 | - foreach ( $installed['message_types'] as $imt ) { |
|
986 | - if ( $imt instanceof EE_message_type ) { |
|
985 | + foreach ($installed['message_types'] as $imt) { |
|
986 | + if ($imt instanceof EE_message_type) { |
|
987 | 987 | $installed_mts[$imt->name] = $imt; |
988 | 988 | } |
989 | 989 | } |
990 | 990 | |
991 | 991 | //loop through default array for default messengers (if present) |
992 | - if ( ! empty( $def_ms ) ) { |
|
993 | - foreach ( $def_ms as $messenger ) { |
|
992 | + if ( ! empty($def_ms)) { |
|
993 | + foreach ($def_ms as $messenger) { |
|
994 | 994 | //all is good so let's setup the default stuff. We need to use the given messenger object (if exists) to get the default message type for the messenger. |
995 | - if ( ! isset( $installed_messengers[$messenger] )) { |
|
995 | + if ( ! isset($installed_messengers[$messenger])) { |
|
996 | 996 | continue; |
997 | 997 | } |
998 | 998 | /** @var EE_messenger[] $installed_messengers */ |
999 | 999 | $default_mts = $installed_messengers[$messenger]->get_default_message_types(); |
1000 | 1000 | $active_messengers[$messenger]['obj'] = $installed_messengers[$messenger]; |
1001 | - foreach ( $default_mts as $index => $mt ) { |
|
1001 | + foreach ($default_mts as $index => $mt) { |
|
1002 | 1002 | //is there an installed_mt matching the default string? If not then nothing to do here. |
1003 | - if ( ! isset( $installed_mts[$mt] ) ) { |
|
1004 | - unset( $default_mts[$index] ); |
|
1003 | + if ( ! isset($installed_mts[$mt])) { |
|
1004 | + unset($default_mts[$index]); |
|
1005 | 1005 | continue; |
1006 | 1006 | } |
1007 | 1007 | |
@@ -1010,41 +1010,41 @@ discard block |
||
1010 | 1010 | /** @var EE_message_type[] $installed_mts */ |
1011 | 1011 | $settings_fields = $installed_mts[$mt]->get_admin_settings_fields(); |
1012 | 1012 | $settings = array(); |
1013 | - if ( is_array( $settings_fields ) ) { |
|
1014 | - foreach ( $settings_fields as $field => $values ) { |
|
1015 | - if ( isset( $values['default'] ) ) { |
|
1013 | + if (is_array($settings_fields)) { |
|
1014 | + foreach ($settings_fields as $field => $values) { |
|
1015 | + if (isset($values['default'])) { |
|
1016 | 1016 | $settings[$field] = $values['default']; |
1017 | 1017 | } |
1018 | 1018 | } |
1019 | 1019 | } |
1020 | 1020 | |
1021 | - $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings; |
|
1021 | + $active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings; |
|
1022 | 1022 | $has_activated[$messenger][] = $mt; |
1023 | 1023 | } |
1024 | 1024 | |
1025 | 1025 | //setup any initial settings for the messenger |
1026 | 1026 | $msgr_settings = $installed_messengers[$messenger]->get_admin_settings_fields(); |
1027 | 1027 | |
1028 | - if ( !empty( $msgr_settings ) ) { |
|
1029 | - foreach ( $msgr_settings as $field => $value ) { |
|
1028 | + if ( ! empty($msgr_settings)) { |
|
1029 | + foreach ($msgr_settings as $field => $value) { |
|
1030 | 1030 | $active_messengers[$messenger]['settings'][$field] = $value; |
1031 | 1031 | } |
1032 | 1032 | } |
1033 | 1033 | |
1034 | 1034 | //now let's save the settings for this messenger! Must do now because the validator checks the db for active messengers to validate. |
1035 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1035 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1036 | 1036 | |
1037 | 1037 | //let's generate all the templates but only if the messenger has default_mts (otherwise its just activated). |
1038 | - if ( !empty( $default_mts ) ) { |
|
1039 | - $success = EEH_MSG_Template::generate_new_templates( $messenger, $default_mts, '', TRUE ); |
|
1038 | + if ( ! empty($default_mts)) { |
|
1039 | + $success = EEH_MSG_Template::generate_new_templates($messenger, $default_mts, '', TRUE); |
|
1040 | 1040 | } |
1041 | 1041 | } |
1042 | 1042 | } //end check for empty( $def_ms ) |
1043 | 1043 | |
1044 | 1044 | //still need to see if there are any message types to activate for active messengers |
1045 | - foreach ( $active_messengers as $messenger => $settings ) { |
|
1045 | + foreach ($active_messengers as $messenger => $settings) { |
|
1046 | 1046 | $msg_obj = $settings['obj']; |
1047 | - if ( ! $msg_obj instanceof EE_messenger ) { |
|
1047 | + if ( ! $msg_obj instanceof EE_messenger) { |
|
1048 | 1048 | continue; |
1049 | 1049 | } |
1050 | 1050 | |
@@ -1052,45 +1052,45 @@ discard block |
||
1052 | 1052 | $new_default_mts = array(); |
1053 | 1053 | |
1054 | 1054 | //loop through each default mt reported by the messenger and make sure its set in its active db entry. |
1055 | - foreach( $all_default_mts as $index => $mt ) { |
|
1055 | + foreach ($all_default_mts as $index => $mt) { |
|
1056 | 1056 | //already active? already has generated templates? || has already been activated before (we dont' want to reactivate things users intentionally deactivated). |
1057 | - if ( ( isset( $has_activated[$messenger] ) && in_array($mt, $has_activated[$messenger]) ) || isset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] ) || EEH_MSG_Template::already_generated( $messenger, $mt, 0, FALSE ) ) { |
|
1057 | + if ((isset($has_activated[$messenger]) && in_array($mt, $has_activated[$messenger])) || isset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]) || EEH_MSG_Template::already_generated($messenger, $mt, 0, FALSE)) { |
|
1058 | 1058 | continue; |
1059 | 1059 | } |
1060 | 1060 | |
1061 | 1061 | //is there an installed_mt matching the default string? If not then nothing to do here. |
1062 | - if ( ! isset( $installed_mts[$mt] ) ) { |
|
1063 | - unset( $all_default_mts[$mt] ); |
|
1062 | + if ( ! isset($installed_mts[$mt])) { |
|
1063 | + unset($all_default_mts[$mt]); |
|
1064 | 1064 | continue; |
1065 | 1065 | } |
1066 | 1066 | |
1067 | 1067 | $settings_fields = $installed_mts[$mt]->get_admin_settings_fields(); |
1068 | 1068 | $settings = array(); |
1069 | - if ( is_array( $settings_fields ) ) { |
|
1070 | - foreach ( $settings_fields as $field => $values ) { |
|
1071 | - if ( isset( $values['default'] ) ) { |
|
1069 | + if (is_array($settings_fields)) { |
|
1070 | + foreach ($settings_fields as $field => $values) { |
|
1071 | + if (isset($values['default'])) { |
|
1072 | 1072 | $settings[$field] = $values['default']; |
1073 | 1073 | } |
1074 | 1074 | } |
1075 | 1075 | } |
1076 | 1076 | |
1077 | - $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings; |
|
1077 | + $active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings; |
|
1078 | 1078 | $new_default_mts[] = $mt; |
1079 | 1079 | $has_activated[$messenger][] = $mt; |
1080 | 1080 | } |
1081 | 1081 | |
1082 | 1082 | |
1083 | - if ( ! empty( $new_default_mts ) ) { |
|
1084 | - $success = EEH_MSG_Template::generate_new_templates( $messenger, $new_default_mts, '', TRUE ); |
|
1083 | + if ( ! empty($new_default_mts)) { |
|
1084 | + $success = EEH_MSG_Template::generate_new_templates($messenger, $new_default_mts, '', TRUE); |
|
1085 | 1085 | } |
1086 | 1086 | |
1087 | 1087 | } |
1088 | 1088 | |
1089 | 1089 | //now let's save the settings for this messenger! |
1090 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1090 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1091 | 1091 | |
1092 | 1092 | //update $has_activated record |
1093 | - update_option( 'ee_has_activated_messenger', $has_activated ); |
|
1093 | + update_option('ee_has_activated_messenger', $has_activated); |
|
1094 | 1094 | |
1095 | 1095 | //that's it! |
1096 | 1096 | return $success; |
@@ -1110,47 +1110,47 @@ discard block |
||
1110 | 1110 | */ |
1111 | 1111 | public static function validate_messages_system() { |
1112 | 1112 | //include our helper |
1113 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
1113 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
1114 | 1114 | |
1115 | 1115 | //get active and installed messengers/message types. |
1116 | 1116 | $active_messengers = EEH_MSG_Template::get_active_messengers_in_db(); |
1117 | 1117 | $installed = EEH_MSG_Template::get_installed_message_objects(); |
1118 | 1118 | $installed_messengers = $installed_mts = array(); |
1119 | 1119 | //set up the arrays so they can be handled easier. |
1120 | - foreach( $installed['messengers'] as $im ) { |
|
1121 | - if ( $im instanceof EE_messenger ) { |
|
1120 | + foreach ($installed['messengers'] as $im) { |
|
1121 | + if ($im instanceof EE_messenger) { |
|
1122 | 1122 | $installed_messengers[$im->name] = $im; |
1123 | 1123 | } |
1124 | 1124 | } |
1125 | - foreach( $installed['message_types'] as $imt ) { |
|
1126 | - if ( $imt instanceof EE_message_type ) { |
|
1125 | + foreach ($installed['message_types'] as $imt) { |
|
1126 | + if ($imt instanceof EE_message_type) { |
|
1127 | 1127 | $installed_mts[$imt->name] = $imt; |
1128 | 1128 | } |
1129 | 1129 | } |
1130 | 1130 | |
1131 | 1131 | //now let's loop through the active array and validate |
1132 | - foreach( $active_messengers as $messenger => $active_details ) { |
|
1132 | + foreach ($active_messengers as $messenger => $active_details) { |
|
1133 | 1133 | //first let's see if this messenger is installed. |
1134 | - if ( ! isset( $installed_messengers[$messenger] ) ) { |
|
1134 | + if ( ! isset($installed_messengers[$messenger])) { |
|
1135 | 1135 | //not set so let's just remove from actives and make sure templates are inactive. |
1136 | - unset( $active_messengers[$messenger] ); |
|
1137 | - EEH_MSG_Template::update_to_inactive( $messenger ); |
|
1136 | + unset($active_messengers[$messenger]); |
|
1137 | + EEH_MSG_Template::update_to_inactive($messenger); |
|
1138 | 1138 | continue; |
1139 | 1139 | } |
1140 | 1140 | |
1141 | 1141 | //messenger is active, so let's just make sure that any active message types not installed are deactivated. |
1142 | - $mts = ! empty( $active_details['settings'][$messenger . '-message_types'] ) ? $active_details['settings'][$messenger . '-message_types'] : array(); |
|
1143 | - foreach ( $mts as $mt_name => $mt ) { |
|
1144 | - if ( ! isset( $installed_mts[$mt_name] ) ) { |
|
1145 | - unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] ); |
|
1146 | - EEH_MSG_Template::update_to_inactive( $messenger, $mt_name ); |
|
1142 | + $mts = ! empty($active_details['settings'][$messenger.'-message_types']) ? $active_details['settings'][$messenger.'-message_types'] : array(); |
|
1143 | + foreach ($mts as $mt_name => $mt) { |
|
1144 | + if ( ! isset($installed_mts[$mt_name])) { |
|
1145 | + unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt_name]); |
|
1146 | + EEH_MSG_Template::update_to_inactive($messenger, $mt_name); |
|
1147 | 1147 | } |
1148 | 1148 | } |
1149 | 1149 | } |
1150 | 1150 | |
1151 | 1151 | //all done! let's update the active_messengers. |
1152 | - EEH_MSG_Template::update_active_messengers_in_db( $active_messengers ); |
|
1153 | - do_action( 'AHEE__EEH_Activation__validate_messages_system' ); |
|
1152 | + EEH_MSG_Template::update_active_messengers_in_db($active_messengers); |
|
1153 | + do_action('AHEE__EEH_Activation__validate_messages_system'); |
|
1154 | 1154 | return; |
1155 | 1155 | } |
1156 | 1156 | |
@@ -1164,12 +1164,12 @@ discard block |
||
1164 | 1164 | * @static |
1165 | 1165 | * @return void |
1166 | 1166 | */ |
1167 | - public static function create_no_ticket_prices_array(){ |
|
1167 | + public static function create_no_ticket_prices_array() { |
|
1168 | 1168 | // this creates an array for tracking events that have no active ticket prices created |
1169 | 1169 | // this allows us to warn admins of the situation so that it can be corrected |
1170 | - $espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE ); |
|
1171 | - if ( ! $espresso_no_ticket_prices ) { |
|
1172 | - add_option( 'ee_no_ticket_prices', array(), '', FALSE ); |
|
1170 | + $espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE); |
|
1171 | + if ( ! $espresso_no_ticket_prices) { |
|
1172 | + add_option('ee_no_ticket_prices', array(), '', FALSE); |
|
1173 | 1173 | } |
1174 | 1174 | } |
1175 | 1175 | |
@@ -1191,24 +1191,24 @@ discard block |
||
1191 | 1191 | * Finds all our EE4 custom post types, and deletes them and their associated data (like post meta or term relations)/ |
1192 | 1192 | * @global wpdb $wpdb |
1193 | 1193 | */ |
1194 | - public static function delete_all_espresso_cpt_data(){ |
|
1194 | + public static function delete_all_espresso_cpt_data() { |
|
1195 | 1195 | global $wpdb; |
1196 | 1196 | //get all the CPT post_types |
1197 | 1197 | $ee_post_types = array(); |
1198 | - foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){ |
|
1199 | - if ( method_exists( $model_name, 'instance' )) { |
|
1200 | - $model_obj = call_user_func( array( $model_name, 'instance' )); |
|
1201 | - if ( $model_obj instanceof EEM_CPT_Base ) { |
|
1202 | - $ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type()); |
|
1198 | + foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) { |
|
1199 | + if (method_exists($model_name, 'instance')) { |
|
1200 | + $model_obj = call_user_func(array($model_name, 'instance')); |
|
1201 | + if ($model_obj instanceof EEM_CPT_Base) { |
|
1202 | + $ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type()); |
|
1203 | 1203 | } |
1204 | 1204 | } |
1205 | 1205 | } |
1206 | 1206 | //get all our CPTs |
1207 | - $query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")"; |
|
1207 | + $query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")"; |
|
1208 | 1208 | $cpt_ids = $wpdb->get_col($query); |
1209 | 1209 | //delete each post meta and term relations too |
1210 | - foreach($cpt_ids as $post_id){ |
|
1211 | - wp_delete_post($post_id,true); |
|
1210 | + foreach ($cpt_ids as $post_id) { |
|
1211 | + wp_delete_post($post_id, true); |
|
1212 | 1212 | } |
1213 | 1213 | } |
1214 | 1214 | |
@@ -1222,18 +1222,18 @@ discard block |
||
1222 | 1222 | * @param bool $remove_all |
1223 | 1223 | * @return void |
1224 | 1224 | */ |
1225 | - public static function delete_all_espresso_tables_and_data( $remove_all = true ) { |
|
1225 | + public static function delete_all_espresso_tables_and_data($remove_all = true) { |
|
1226 | 1226 | global $wpdb; |
1227 | 1227 | $undeleted_tables = array(); |
1228 | 1228 | |
1229 | 1229 | // load registry |
1230 | - foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){ |
|
1231 | - if ( method_exists( $model_name, 'instance' )) { |
|
1232 | - $model_obj = call_user_func( array( $model_name, 'instance' )); |
|
1233 | - if ( $model_obj instanceof EEM_Base ) { |
|
1234 | - foreach ( $model_obj->get_tables() as $table ) { |
|
1235 | - if ( strpos( $table->get_table_name(), 'esp_' )) { |
|
1236 | - switch ( EEH_Activation::delete_unused_db_table( $table->get_table_name() )) { |
|
1230 | + foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) { |
|
1231 | + if (method_exists($model_name, 'instance')) { |
|
1232 | + $model_obj = call_user_func(array($model_name, 'instance')); |
|
1233 | + if ($model_obj instanceof EEM_Base) { |
|
1234 | + foreach ($model_obj->get_tables() as $table) { |
|
1235 | + if (strpos($table->get_table_name(), 'esp_')) { |
|
1236 | + switch (EEH_Activation::delete_unused_db_table($table->get_table_name())) { |
|
1237 | 1237 | case false : |
1238 | 1238 | $undeleted_tables[] = $table->get_table_name(); |
1239 | 1239 | break; |
@@ -1258,8 +1258,8 @@ discard block |
||
1258 | 1258 | 'wp_esp_promotion_rule', |
1259 | 1259 | 'wp_esp_rule' |
1260 | 1260 | ); |
1261 | - foreach( $tables_without_models as $table ){ |
|
1262 | - EEH_Activation::delete_unused_db_table( $table ); |
|
1261 | + foreach ($tables_without_models as $table) { |
|
1262 | + EEH_Activation::delete_unused_db_table($table); |
|
1263 | 1263 | } |
1264 | 1264 | |
1265 | 1265 | |
@@ -1297,51 +1297,51 @@ discard block |
||
1297 | 1297 | ); |
1298 | 1298 | |
1299 | 1299 | $undeleted_options = array(); |
1300 | - foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) { |
|
1300 | + foreach ($wp_options_to_delete as $option_name => $no_wildcard) { |
|
1301 | 1301 | |
1302 | - if( $no_wildcard ){ |
|
1303 | - if( ! delete_option( $option_name ) ){ |
|
1302 | + if ($no_wildcard) { |
|
1303 | + if ( ! delete_option($option_name)) { |
|
1304 | 1304 | $undeleted_options[] = $option_name; |
1305 | 1305 | } |
1306 | - }else{ |
|
1307 | - $option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" ); |
|
1308 | - foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){ |
|
1309 | - if( ! delete_option( $option_name_from_wildcard ) ){ |
|
1306 | + } else { |
|
1307 | + $option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'"); |
|
1308 | + foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) { |
|
1309 | + if ( ! delete_option($option_name_from_wildcard)) { |
|
1310 | 1310 | $undeleted_options[] = $option_name_from_wildcard; |
1311 | 1311 | } |
1312 | 1312 | } |
1313 | 1313 | } |
1314 | 1314 | } |
1315 | 1315 | |
1316 | - if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) { |
|
1316 | + if ($remove_all && $espresso_db_update = get_option('espresso_db_update')) { |
|
1317 | 1317 | $db_update_sans_ee4 = array(); |
1318 | - foreach($espresso_db_update as $version => $times_activated){ |
|
1319 | - if( $version[0] =='3'){//if its NON EE4 |
|
1318 | + foreach ($espresso_db_update as $version => $times_activated) { |
|
1319 | + if ($version[0] == '3') {//if its NON EE4 |
|
1320 | 1320 | $db_update_sans_ee4[$version] = $times_activated; |
1321 | 1321 | } |
1322 | 1322 | } |
1323 | - update_option( 'espresso_db_update', $db_update_sans_ee4 ); |
|
1323 | + update_option('espresso_db_update', $db_update_sans_ee4); |
|
1324 | 1324 | } |
1325 | 1325 | |
1326 | 1326 | $errors = ''; |
1327 | - if ( ! empty( $undeleted_tables )) { |
|
1327 | + if ( ! empty($undeleted_tables)) { |
|
1328 | 1328 | $errors .= sprintf( |
1329 | - __( 'The following tables could not be deleted: %s%s', 'event_espresso' ), |
|
1329 | + __('The following tables could not be deleted: %s%s', 'event_espresso'), |
|
1330 | 1330 | '<br/>', |
1331 | - implode( ',<br/>', $undeleted_tables ) |
|
1331 | + implode(',<br/>', $undeleted_tables) |
|
1332 | 1332 | ); |
1333 | 1333 | } |
1334 | - if ( ! empty( $undeleted_options )) { |
|
1335 | - $errors .= ! empty( $undeleted_tables ) ? '<br/>' : ''; |
|
1334 | + if ( ! empty($undeleted_options)) { |
|
1335 | + $errors .= ! empty($undeleted_tables) ? '<br/>' : ''; |
|
1336 | 1336 | $errors .= sprintf( |
1337 | - __( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ), |
|
1337 | + __('The following wp-options could not be deleted: %s%s', 'event_espresso'), |
|
1338 | 1338 | '<br/>', |
1339 | - implode( ',<br/>', $undeleted_options ) |
|
1339 | + implode(',<br/>', $undeleted_options) |
|
1340 | 1340 | ); |
1341 | 1341 | |
1342 | 1342 | } |
1343 | - if ( $errors != '' ) { |
|
1344 | - EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ ); |
|
1343 | + if ($errors != '') { |
|
1344 | + EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__); |
|
1345 | 1345 | } |
1346 | 1346 | } |
1347 | 1347 | |
@@ -1351,25 +1351,25 @@ discard block |
||
1351 | 1351 | * @param string $table_name with or without $wpdb->prefix |
1352 | 1352 | * @return boolean |
1353 | 1353 | */ |
1354 | - public static function table_exists( $table_name ){ |
|
1354 | + public static function table_exists($table_name) { |
|
1355 | 1355 | global $wpdb, $EZSQL_ERROR; |
1356 | - if(strpos($table_name, $wpdb->prefix) !== 0){ |
|
1356 | + if (strpos($table_name, $wpdb->prefix) !== 0) { |
|
1357 | 1357 | $table_name = $wpdb->prefix.$table_name; |
1358 | 1358 | } |
1359 | 1359 | //ignore if this causes an sql error |
1360 | 1360 | $old_error = $wpdb->last_error; |
1361 | 1361 | $old_suppress_errors = $wpdb->suppress_errors(); |
1362 | - $old_show_errors_value = $wpdb->show_errors( FALSE ); |
|
1362 | + $old_show_errors_value = $wpdb->show_errors(FALSE); |
|
1363 | 1363 | $ezsql_error_cache = $EZSQL_ERROR; |
1364 | - $wpdb->get_results( "SELECT * from $table_name LIMIT 1"); |
|
1365 | - $wpdb->show_errors( $old_show_errors_value ); |
|
1366 | - $wpdb->suppress_errors( $old_suppress_errors ); |
|
1364 | + $wpdb->get_results("SELECT * from $table_name LIMIT 1"); |
|
1365 | + $wpdb->show_errors($old_show_errors_value); |
|
1366 | + $wpdb->suppress_errors($old_suppress_errors); |
|
1367 | 1367 | $new_error = $wpdb->last_error; |
1368 | 1368 | $wpdb->last_error = $old_error; |
1369 | 1369 | $EZSQL_ERROR = $ezsql_error_cache; |
1370 | - if( empty( $new_error ) ){ |
|
1370 | + if (empty($new_error)) { |
|
1371 | 1371 | return TRUE; |
1372 | - }else{ |
|
1372 | + } else { |
|
1373 | 1373 | return FALSE; |
1374 | 1374 | } |
1375 | 1375 | } |
@@ -1377,7 +1377,7 @@ discard block |
||
1377 | 1377 | /** |
1378 | 1378 | * Resets the cache on EEH_Activation |
1379 | 1379 | */ |
1380 | - public static function reset(){ |
|
1380 | + public static function reset() { |
|
1381 | 1381 | self::$_default_creator_id = NULL; |
1382 | 1382 | } |
1383 | 1383 | } |
@@ -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 | * Event Espresso |
4 | 6 | * |
@@ -217,7 +219,7 @@ discard block |
||
217 | 219 | $post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1"); |
218 | 220 | if($post_id){ |
219 | 221 | return get_post($post_id); |
220 | - }else{ |
|
222 | + } else{ |
|
221 | 223 | return NULL; |
222 | 224 | } |
223 | 225 | |
@@ -382,7 +384,7 @@ discard block |
||
382 | 384 | if($drop_table_if_pre_existed && EEH_Activation::table_exists( $wp_table_name ) ){ |
383 | 385 | if( defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){ |
384 | 386 | $wpdb->query("DROP TABLE IF EXISTS $wp_table_name "); |
385 | - }else{ |
|
387 | + } else{ |
|
386 | 388 | //so we should be more cautious rather than just dropping tables so easily |
387 | 389 | EE_Error::add_persistent_admin_notice( |
388 | 390 | 'bad_table_' . $wp_table_name . '_detected', |
@@ -533,13 +535,13 @@ discard block |
||
533 | 535 | foreach( $current_data_migration_script->get_errors() as $error ){ |
534 | 536 | EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ ); |
535 | 537 | } |
536 | - }else{ |
|
538 | + } else{ |
|
537 | 539 | EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) ); |
538 | 540 | } |
539 | 541 | return FALSE; |
540 | 542 | } |
541 | 543 | EE_Data_Migration_Manager::instance()->update_current_database_state_to(); |
542 | - }else{ |
|
544 | + } else{ |
|
543 | 545 | EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__); |
544 | 546 | return FALSE; |
545 | 547 | } |
@@ -828,7 +830,7 @@ discard block |
||
828 | 830 | if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){ |
829 | 831 | EE_Registry::instance()->load_lib( 'Payment_Method_Manager' ); |
830 | 832 | EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' ); |
831 | - }else{ |
|
833 | + } else{ |
|
832 | 834 | EEM_Payment_Method::instance()->verify_button_urls(); |
833 | 835 | } |
834 | 836 | } |
@@ -977,7 +979,9 @@ discard block |
||
977 | 979 | //do an initial loop to determine if we need to continue |
978 | 980 | $def_ms = array(); |
979 | 981 | foreach ( $default_messengers as $msgr ) { |
980 | - if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) continue; |
|
982 | + if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) { |
|
983 | + continue; |
|
984 | + } |
|
981 | 985 | $def_ms[] = $msgr; |
982 | 986 | } |
983 | 987 | |
@@ -1303,7 +1307,7 @@ discard block |
||
1303 | 1307 | if( ! delete_option( $option_name ) ){ |
1304 | 1308 | $undeleted_options[] = $option_name; |
1305 | 1309 | } |
1306 | - }else{ |
|
1310 | + } else{ |
|
1307 | 1311 | $option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" ); |
1308 | 1312 | foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){ |
1309 | 1313 | if( ! delete_option( $option_name_from_wildcard ) ){ |
@@ -1369,7 +1373,7 @@ discard block |
||
1369 | 1373 | $EZSQL_ERROR = $ezsql_error_cache; |
1370 | 1374 | if( empty( $new_error ) ){ |
1371 | 1375 | return TRUE; |
1372 | - }else{ |
|
1376 | + } else{ |
|
1373 | 1377 | return FALSE; |
1374 | 1378 | } |
1375 | 1379 | } |