eventespresso /
event-espresso-core
@@ -670,7 +670,7 @@ |
||
| 670 | 670 | |
| 671 | 671 | |
| 672 | 672 | /** |
| 673 | - * @param $model |
|
| 673 | + * @param \EEM_Base $model |
|
| 674 | 674 | * @param $query_params |
| 675 | 675 | * @return array |
| 676 | 676 | */ |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace EventEspresso\core\libraries\rest_api\controllers\model; |
| 3 | 3 | use EventEspresso\core\libraries\rest_api\Capabilities; |
| 4 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 5 | - exit( 'No direct script access allowed' ); |
|
| 4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 5 | + exit('No direct script access allowed'); |
|
| 6 | 6 | } |
| 7 | 7 | |
| 8 | 8 | /** |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function __construct() { |
| 26 | 26 | parent::__construct(); |
| 27 | - \EE_Registry::instance()->load_helper( 'Inflector' ); |
|
| 27 | + \EE_Registry::instance()->load_helper('Inflector'); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -32,22 +32,22 @@ discard block |
||
| 32 | 32 | * @param \WP_REST_Request $request |
| 33 | 33 | * @return \WP_REST_Response|\WP_Error |
| 34 | 34 | */ |
| 35 | - public static function handle_request_get_all( \WP_REST_Request $request) { |
|
| 35 | + public static function handle_request_get_all(\WP_REST_Request $request) { |
|
| 36 | 36 | $controller = new Read(); |
| 37 | - try{ |
|
| 37 | + try { |
|
| 38 | 38 | $matches = $controller->parse_route( |
| 39 | 39 | $request->get_route(), |
| 40 | - '~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~', |
|
| 41 | - array( 'version', 'model' ) |
|
| 40 | + '~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~', |
|
| 41 | + array('version', 'model') |
|
| 42 | 42 | ); |
| 43 | - $controller->set_requested_version( $matches[ 'version' ] ); |
|
| 44 | - $model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] ); |
|
| 45 | - if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) { |
|
| 43 | + $controller->set_requested_version($matches['version']); |
|
| 44 | + $model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']); |
|
| 45 | + if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) { |
|
| 46 | 46 | return $controller->send_response( |
| 47 | 47 | new \WP_Error( |
| 48 | 48 | 'endpoint_parsing_error', |
| 49 | 49 | sprintf( |
| 50 | - __( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ), |
|
| 50 | + __('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'), |
|
| 51 | 51 | $model_name_singular |
| 52 | 52 | ) |
| 53 | 53 | ) |
@@ -55,12 +55,12 @@ discard block |
||
| 55 | 55 | } |
| 56 | 56 | return $controller->send_response( |
| 57 | 57 | $controller->get_entities_from_model( |
| 58 | - $controller->get_model_version_info()->load_model( $model_name_singular ), |
|
| 58 | + $controller->get_model_version_info()->load_model($model_name_singular), |
|
| 59 | 59 | $request |
| 60 | 60 | ) |
| 61 | 61 | ); |
| 62 | - } catch( \Exception $e ) { |
|
| 63 | - return $controller->send_response( $e ); |
|
| 62 | + } catch (\Exception $e) { |
|
| 63 | + return $controller->send_response($e); |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
@@ -70,21 +70,21 @@ discard block |
||
| 70 | 70 | * @param \WP_Rest_Request $request |
| 71 | 71 | * @return \WP_REST_Response|\WP_Error |
| 72 | 72 | */ |
| 73 | - public static function handle_request_get_one( \WP_Rest_Request $request ) { |
|
| 73 | + public static function handle_request_get_one(\WP_Rest_Request $request) { |
|
| 74 | 74 | $controller = new Read(); |
| 75 | - try{ |
|
| 75 | + try { |
|
| 76 | 76 | $matches = $controller->parse_route( |
| 77 | 77 | $request->get_route(), |
| 78 | - '~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~', |
|
| 79 | - array( 'version', 'model', 'id' ) ); |
|
| 80 | - $controller->set_requested_version( $matches[ 'version' ] ); |
|
| 81 | - $model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] ); |
|
| 82 | - if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) { |
|
| 78 | + '~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~', |
|
| 79 | + array('version', 'model', 'id') ); |
|
| 80 | + $controller->set_requested_version($matches['version']); |
|
| 81 | + $model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']); |
|
| 82 | + if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) { |
|
| 83 | 83 | return $controller->send_response( |
| 84 | 84 | new \WP_Error( |
| 85 | 85 | 'endpoint_parsing_error', |
| 86 | 86 | sprintf( |
| 87 | - __( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ), |
|
| 87 | + __('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'), |
|
| 88 | 88 | $model_name_singular |
| 89 | 89 | ) |
| 90 | 90 | ) |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | return $controller->send_response( |
| 94 | 94 | $controller->get_entity_from_model( |
| 95 | - $controller->get_model_version_info()->load_model( $model_name_singular ), |
|
| 95 | + $controller->get_model_version_info()->load_model($model_name_singular), |
|
| 96 | 96 | $request |
| 97 | 97 | ) |
| 98 | 98 | ); |
| 99 | - } catch( \Exception $e ) { |
|
| 100 | - return $controller->send_response( $e ); |
|
| 99 | + } catch (\Exception $e) { |
|
| 100 | + return $controller->send_response($e); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
@@ -109,40 +109,40 @@ discard block |
||
| 109 | 109 | * @param \WP_REST_Request $request |
| 110 | 110 | * @return \WP_REST_Response|\WP_Error |
| 111 | 111 | */ |
| 112 | - public static function handle_request_get_related( \WP_REST_Request $request ) { |
|
| 112 | + public static function handle_request_get_related(\WP_REST_Request $request) { |
|
| 113 | 113 | $controller = new Read(); |
| 114 | - try{ |
|
| 114 | + try { |
|
| 115 | 115 | $matches = $controller->parse_route( |
| 116 | 116 | $request->get_route(), |
| 117 | - '~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~', |
|
| 118 | - array( 'version', 'model', 'id', 'related_model' ) |
|
| 117 | + '~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~', |
|
| 118 | + array('version', 'model', 'id', 'related_model') |
|
| 119 | 119 | ); |
| 120 | - $controller->set_requested_version( $matches[ 'version' ] ); |
|
| 121 | - $main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] ); |
|
| 122 | - if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) { |
|
| 120 | + $controller->set_requested_version($matches['version']); |
|
| 121 | + $main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']); |
|
| 122 | + if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) { |
|
| 123 | 123 | return $controller->send_response( |
| 124 | 124 | new \WP_Error( |
| 125 | 125 | 'endpoint_parsing_error', |
| 126 | 126 | sprintf( |
| 127 | - __( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ), |
|
| 127 | + __('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'), |
|
| 128 | 128 | $main_model_name_singular |
| 129 | 129 | ) |
| 130 | 130 | ) |
| 131 | 131 | ); |
| 132 | 132 | } |
| 133 | - $main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular ); |
|
| 133 | + $main_model = $controller->get_model_version_info()->load_model($main_model_name_singular); |
|
| 134 | 134 | //assume the related model name is plural and try to find the model's name |
| 135 | - $related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] ); |
|
| 136 | - if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) { |
|
| 135 | + $related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']); |
|
| 136 | + if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) { |
|
| 137 | 137 | //so the word didn't singularize well. Maybe that's just because it's a singular word? |
| 138 | - $related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] ); |
|
| 138 | + $related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']); |
|
| 139 | 139 | } |
| 140 | - if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) { |
|
| 140 | + if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) { |
|
| 141 | 141 | return $controller->send_response( |
| 142 | 142 | new \WP_Error( |
| 143 | 143 | 'endpoint_parsing_error', |
| 144 | 144 | sprintf( |
| 145 | - __( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ), |
|
| 145 | + __('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'), |
|
| 146 | 146 | $related_model_name_singular |
| 147 | 147 | ) |
| 148 | 148 | ) |
@@ -151,13 +151,13 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | return $controller->send_response( |
| 153 | 153 | $controller->get_entities_from_relation( |
| 154 | - $request->get_param( 'id' ), |
|
| 155 | - $main_model->related_settings_for( $related_model_name_singular ) , |
|
| 154 | + $request->get_param('id'), |
|
| 155 | + $main_model->related_settings_for($related_model_name_singular), |
|
| 156 | 156 | $request |
| 157 | 157 | ) |
| 158 | 158 | ); |
| 159 | - } catch( \Exception $e ) { |
|
| 160 | - return $controller->send_response( $e ); |
|
| 159 | + } catch (\Exception $e) { |
|
| 160 | + return $controller->send_response($e); |
|
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | |
@@ -170,31 +170,31 @@ discard block |
||
| 170 | 170 | * @param \WP_REST_Request $request |
| 171 | 171 | * @return array |
| 172 | 172 | */ |
| 173 | - public function get_entities_from_model( $model, $request) { |
|
| 174 | - $query_params = $this->create_model_query_params( $model, $request->get_params() ); |
|
| 175 | - if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) { |
|
| 176 | - $model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ); |
|
| 173 | + public function get_entities_from_model($model, $request) { |
|
| 174 | + $query_params = $this->create_model_query_params($model, $request->get_params()); |
|
| 175 | + if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) { |
|
| 176 | + $model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name()); |
|
| 177 | 177 | return new \WP_Error( |
| 178 | - sprintf( 'rest_%s_cannot_list', $model_name_plural ), |
|
| 178 | + sprintf('rest_%s_cannot_list', $model_name_plural), |
|
| 179 | 179 | sprintf( |
| 180 | - __( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ), |
|
| 180 | + __('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'), |
|
| 181 | 181 | $model_name_plural, |
| 182 | - Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] ) |
|
| 182 | + Capabilities::get_missing_permissions_string($model, $query_params['caps']) |
|
| 183 | 183 | ), |
| 184 | - array( 'status' => 403 ) |
|
| 184 | + array('status' => 403) |
|
| 185 | 185 | ); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - $this->_set_debug_info( 'model query params', $query_params ); |
|
| 188 | + $this->_set_debug_info('model query params', $query_params); |
|
| 189 | 189 | /** @type array $results */ |
| 190 | - $results = $model->get_all_wpdb_results( $query_params ); |
|
| 190 | + $results = $model->get_all_wpdb_results($query_params); |
|
| 191 | 191 | $nice_results = array( ); |
| 192 | - foreach ( $results as $result ) { |
|
| 193 | - $nice_results[ ] = $this->create_entity_from_wpdb_result( |
|
| 192 | + foreach ($results as $result) { |
|
| 193 | + $nice_results[] = $this->create_entity_from_wpdb_result( |
|
| 194 | 194 | $model, |
| 195 | 195 | $result, |
| 196 | - $request->get_param( 'include' ), |
|
| 197 | - $query_params[ 'caps' ] |
|
| 196 | + $request->get_param('include'), |
|
| 197 | + $query_params['caps'] |
|
| 198 | 198 | ); |
| 199 | 199 | } |
| 200 | 200 | return $nice_results; |
@@ -212,83 +212,83 @@ discard block |
||
| 212 | 212 | * @param \WP_REST_Request $request |
| 213 | 213 | * @return array |
| 214 | 214 | */ |
| 215 | - public function get_entities_from_relation( $id, $relation, $request ) { |
|
| 216 | - $context = $this->validate_context( $request->get_param( 'caps' )); |
|
| 215 | + public function get_entities_from_relation($id, $relation, $request) { |
|
| 216 | + $context = $this->validate_context($request->get_param('caps')); |
|
| 217 | 217 | $model = $relation->get_this_model(); |
| 218 | 218 | $related_model = $relation->get_other_model(); |
| 219 | 219 | //check if they can access the 1st model object |
| 220 | - $query_params = array( array( $model->primary_key_name() => $id ),'limit' => 1 ); |
|
| 221 | - if( $model instanceof \EEM_Soft_Delete_Base ){ |
|
| 220 | + $query_params = array(array($model->primary_key_name() => $id), 'limit' => 1); |
|
| 221 | + if ($model instanceof \EEM_Soft_Delete_Base) { |
|
| 222 | 222 | $query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params); |
| 223 | 223 | } |
| 224 | 224 | $restricted_query_params = $query_params; |
| 225 | - $restricted_query_params[ 'caps' ] = $context; |
|
| 226 | - $this->_set_debug_info( 'main model query params', $restricted_query_params ); |
|
| 227 | - $this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) ); |
|
| 225 | + $restricted_query_params['caps'] = $context; |
|
| 226 | + $this->_set_debug_info('main model query params', $restricted_query_params); |
|
| 227 | + $this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context)); |
|
| 228 | 228 | |
| 229 | - if( |
|
| 229 | + if ( |
|
| 230 | 230 | ! ( |
| 231 | - Capabilities::current_user_has_partial_access_to( $related_model, $context ) |
|
| 232 | - && $model->exists( $restricted_query_params ) |
|
| 231 | + Capabilities::current_user_has_partial_access_to($related_model, $context) |
|
| 232 | + && $model->exists($restricted_query_params) |
|
| 233 | 233 | ) |
| 234 | - ){ |
|
| 235 | - if( $relation instanceof \EE_Belongs_To_Relation ) { |
|
| 236 | - $related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() ); |
|
| 237 | - }else{ |
|
| 238 | - $related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() ); |
|
| 234 | + ) { |
|
| 235 | + if ($relation instanceof \EE_Belongs_To_Relation) { |
|
| 236 | + $related_model_name_maybe_plural = strtolower($related_model->get_this_model_name()); |
|
| 237 | + } else { |
|
| 238 | + $related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name()); |
|
| 239 | 239 | } |
| 240 | 240 | return new \WP_Error( |
| 241 | - sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ), |
|
| 241 | + sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural), |
|
| 242 | 242 | sprintf( |
| 243 | - __( 'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ), |
|
| 243 | + __('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'), |
|
| 244 | 244 | $related_model_name_maybe_plural, |
| 245 | 245 | $relation->get_this_model()->get_this_model_name(), |
| 246 | 246 | implode( |
| 247 | 247 | ',', |
| 248 | 248 | array_keys( |
| 249 | - Capabilities::get_missing_permissions( $related_model, $context ) |
|
| 249 | + Capabilities::get_missing_permissions($related_model, $context) |
|
| 250 | 250 | ) |
| 251 | 251 | ) |
| 252 | 252 | ), |
| 253 | - array( 'status' => 403 ) |
|
| 253 | + array('status' => 403) |
|
| 254 | 254 | ); |
| 255 | 255 | } |
| 256 | - $query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() ); |
|
| 257 | - $query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $relation->get_this_model()->primary_key_name() ] = $id; |
|
| 258 | - $query_params[ 'default_where_conditions' ] = 'none'; |
|
| 259 | - $query_params[ 'caps' ] = $context; |
|
| 260 | - $this->_set_debug_info( 'model query params', $query_params ); |
|
| 256 | + $query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params()); |
|
| 257 | + $query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$relation->get_this_model()->primary_key_name()] = $id; |
|
| 258 | + $query_params['default_where_conditions'] = 'none'; |
|
| 259 | + $query_params['caps'] = $context; |
|
| 260 | + $this->_set_debug_info('model query params', $query_params); |
|
| 261 | 261 | /** @type array $results */ |
| 262 | - $results = $relation->get_other_model()->get_all_wpdb_results( $query_params ); |
|
| 262 | + $results = $relation->get_other_model()->get_all_wpdb_results($query_params); |
|
| 263 | 263 | $nice_results = array(); |
| 264 | - foreach( $results as $result ) { |
|
| 264 | + foreach ($results as $result) { |
|
| 265 | 265 | $nice_result = $this->create_entity_from_wpdb_result( |
| 266 | 266 | $relation->get_other_model(), |
| 267 | 267 | $result, |
| 268 | - $request->get_param( 'include' ), |
|
| 269 | - $query_params[ 'caps' ] |
|
| 268 | + $request->get_param('include'), |
|
| 269 | + $query_params['caps'] |
|
| 270 | 270 | ); |
| 271 | - if( $relation instanceof \EE_HABTM_Relation ) { |
|
| 271 | + if ($relation instanceof \EE_HABTM_Relation) { |
|
| 272 | 272 | //put the unusual stuff (properties from the HABTM relation) first, and make sure |
| 273 | 273 | //if there are conflicts we prefer the properties from the main model |
| 274 | 274 | $join_model_result = $this->create_entity_from_wpdb_result( |
| 275 | 275 | $relation->get_join_model(), |
| 276 | 276 | $result, |
| 277 | - $request->get_param( 'include' ), |
|
| 278 | - $query_params[ 'caps' ] |
|
| 277 | + $request->get_param('include'), |
|
| 278 | + $query_params['caps'] |
|
| 279 | 279 | ); |
| 280 | - $joined_result = array_merge( $nice_result, $join_model_result ); |
|
| 280 | + $joined_result = array_merge($nice_result, $join_model_result); |
|
| 281 | 281 | //but keep the meta stuff from the main model |
| 282 | - if( isset( $nice_result['meta'] ) ){ |
|
| 282 | + if (isset($nice_result['meta'])) { |
|
| 283 | 283 | $joined_result['meta'] = $nice_result['meta']; |
| 284 | 284 | } |
| 285 | 285 | $nice_result = $joined_result; |
| 286 | 286 | } |
| 287 | 287 | $nice_results[] = $nice_result; |
| 288 | 288 | } |
| 289 | - if( $relation instanceof \EE_Belongs_To_Relation ){ |
|
| 290 | - return array_shift( $nice_results ); |
|
| 291 | - }else{ |
|
| 289 | + if ($relation instanceof \EE_Belongs_To_Relation) { |
|
| 290 | + return array_shift($nice_results); |
|
| 291 | + } else { |
|
| 292 | 292 | return $nice_results; |
| 293 | 293 | } |
| 294 | 294 | } |
@@ -325,110 +325,110 @@ discard block |
||
| 325 | 325 | * @param string $context one of the return values from EEM_Base::valid_cap_contexts() |
| 326 | 326 | * @return array ready for being converted into json for sending to client |
| 327 | 327 | */ |
| 328 | - public function create_entity_from_wpdb_result( $model, $db_row, $include, $context ) { |
|
| 329 | - if( $include == null ) { |
|
| 328 | + public function create_entity_from_wpdb_result($model, $db_row, $include, $context) { |
|
| 329 | + if ($include == null) { |
|
| 330 | 330 | $include = '*'; |
| 331 | 331 | } |
| 332 | - if( $context == null ) { |
|
| 332 | + if ($context == null) { |
|
| 333 | 333 | $context = \EEM_Base::caps_read; |
| 334 | 334 | } |
| 335 | - $result = $model->deduce_fields_n_values_from_cols_n_values( $db_row ); |
|
| 336 | - $result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) ); |
|
| 337 | - foreach( $result as $field_name => $raw_field_value ) { |
|
| 335 | + $result = $model->deduce_fields_n_values_from_cols_n_values($db_row); |
|
| 336 | + $result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model)); |
|
| 337 | + foreach ($result as $field_name => $raw_field_value) { |
|
| 338 | 338 | $field_obj = $model->field_settings_for($field_name); |
| 339 | - $field_value = $field_obj->prepare_for_set_from_db( $raw_field_value ); |
|
| 340 | - if( $this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_ignored() ) ){ |
|
| 341 | - unset( $result[ $field_name ] ); |
|
| 342 | - }elseif( |
|
| 343 | - $this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() ) |
|
| 344 | - ){ |
|
| 345 | - $result[ $field_name ] = array( |
|
| 346 | - 'raw' => $field_obj->prepare_for_get( $field_value ), |
|
| 347 | - 'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value ) |
|
| 339 | + $field_value = $field_obj->prepare_for_set_from_db($raw_field_value); |
|
| 340 | + if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) { |
|
| 341 | + unset($result[$field_name]); |
|
| 342 | + }elseif ( |
|
| 343 | + $this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format()) |
|
| 344 | + ) { |
|
| 345 | + $result[$field_name] = array( |
|
| 346 | + 'raw' => $field_obj->prepare_for_get($field_value), |
|
| 347 | + 'rendered' => $field_obj->prepare_for_pretty_echoing($field_value) |
|
| 348 | 348 | ); |
| 349 | - }elseif( |
|
| 350 | - $this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() ) |
|
| 351 | - ){ |
|
| 352 | - $result[ $field_name ] = array( |
|
| 353 | - 'raw' => $field_obj->prepare_for_get( $field_value ), |
|
| 354 | - 'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value ) |
|
| 349 | + }elseif ( |
|
| 350 | + $this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format()) |
|
| 351 | + ) { |
|
| 352 | + $result[$field_name] = array( |
|
| 353 | + 'raw' => $field_obj->prepare_for_get($field_value), |
|
| 354 | + 'pretty' => $field_obj->prepare_for_pretty_echoing($field_value) |
|
| 355 | 355 | ); |
| 356 | - }elseif( $field_obj instanceof \EE_Datetime_Field ){ |
|
| 357 | - if( $raw_field_value instanceof \DateTime ) { |
|
| 358 | - $raw_field_value = $raw_field_value->format( 'c' ); |
|
| 356 | + }elseif ($field_obj instanceof \EE_Datetime_Field) { |
|
| 357 | + if ($raw_field_value instanceof \DateTime) { |
|
| 358 | + $raw_field_value = $raw_field_value->format('c'); |
|
| 359 | 359 | } |
| 360 | - $result[ $field_name ] = mysql_to_rfc3339( $raw_field_value ); |
|
| 361 | - }else{ |
|
| 362 | - $value_prepared = $field_obj->prepare_for_get( $field_value ); |
|
| 360 | + $result[$field_name] = mysql_to_rfc3339($raw_field_value); |
|
| 361 | + } else { |
|
| 362 | + $value_prepared = $field_obj->prepare_for_get($field_value); |
|
| 363 | 363 | |
| 364 | - $result[ $field_name ] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared; |
|
| 364 | + $result[$field_name] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared; |
|
| 365 | 365 | } |
| 366 | 366 | } |
| 367 | - if( $model instanceof \EEM_CPT_Base ) { |
|
| 367 | + if ($model instanceof \EEM_CPT_Base) { |
|
| 368 | 368 | $attachment = wp_get_attachment_image_src( |
| 369 | - get_post_thumbnail_id( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ), |
|
| 369 | + get_post_thumbnail_id($db_row[$model->get_primary_key_field()->get_qualified_column()]), |
|
| 370 | 370 | 'full' |
| 371 | 371 | ); |
| 372 | - $result[ 'featured_image_url' ] = !empty( $attachment ) ? $attachment[ 0 ] : null; |
|
| 373 | - $result[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ); |
|
| 372 | + $result['featured_image_url'] = ! empty($attachment) ? $attachment[0] : null; |
|
| 373 | + $result['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]); |
|
| 374 | 374 | } |
| 375 | 375 | //add links to related data |
| 376 | 376 | $result['_links'] = array( |
| 377 | 377 | 'self' => array( |
| 378 | 378 | array( |
| 379 | 379 | 'href' => $this->get_versioned_link_to( |
| 380 | - \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ] |
|
| 380 | + \EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()] |
|
| 381 | 381 | ) |
| 382 | 382 | ) |
| 383 | 383 | ), |
| 384 | 384 | 'collection' => array( |
| 385 | 385 | array( |
| 386 | 386 | 'href' => $this->get_versioned_link_to( |
| 387 | - \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) |
|
| 387 | + \EEH_Inflector::pluralize_and_lower($model->get_this_model_name()) |
|
| 388 | 388 | ) |
| 389 | 389 | ) |
| 390 | 390 | ), |
| 391 | 391 | ); |
| 392 | 392 | global $wp_rest_server; |
| 393 | - if( $model instanceof \EEM_CPT_Base && |
|
| 393 | + if ($model instanceof \EEM_CPT_Base && |
|
| 394 | 394 | $wp_rest_server instanceof \WP_REST_Server && |
| 395 | - $wp_rest_server->get_route_options( '/wp/v2/posts' ) ) { |
|
| 396 | - $result[ '_links' ][ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array( |
|
| 395 | + $wp_rest_server->get_route_options('/wp/v2/posts')) { |
|
| 396 | + $result['_links'][\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array( |
|
| 397 | 397 | array( |
| 398 | - 'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ), |
|
| 398 | + 'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]), |
|
| 399 | 399 | 'single' => true |
| 400 | 400 | ) |
| 401 | 401 | ); |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | 404 | //filter fields if specified |
| 405 | - $includes_for_this_model = $this->extract_includes_for_this_model( $include ); |
|
| 406 | - if( ! empty( $includes_for_this_model ) ) { |
|
| 407 | - if( $model->has_primary_key_field() ) { |
|
| 405 | + $includes_for_this_model = $this->extract_includes_for_this_model($include); |
|
| 406 | + if ( ! empty($includes_for_this_model)) { |
|
| 407 | + if ($model->has_primary_key_field()) { |
|
| 408 | 408 | //always include the primary key |
| 409 | 409 | $includes_for_this_model[] = $model->primary_key_name(); |
| 410 | 410 | } |
| 411 | - $result = array_intersect_key( $result, array_flip( $includes_for_this_model ) ); |
|
| 411 | + $result = array_intersect_key($result, array_flip($includes_for_this_model)); |
|
| 412 | 412 | } |
| 413 | 413 | //add meta links and possibly include related models |
| 414 | 414 | $relation_settings = apply_filters( |
| 415 | 415 | 'FHEE__Read__create_entity_from_wpdb_result__related_models_to_include', |
| 416 | 416 | $model->relation_settings() |
| 417 | 417 | ); |
| 418 | - foreach( $relation_settings as $relation_name => $relation_obj ) { |
|
| 419 | - $related_model_part = $this->get_related_entity_name( $relation_name, $relation_obj ); |
|
| 420 | - if( empty( $includes_for_this_model ) || isset( $includes_for_this_model['meta'] ) ) { |
|
| 421 | - $result['_links'][ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part] = array( |
|
| 418 | + foreach ($relation_settings as $relation_name => $relation_obj) { |
|
| 419 | + $related_model_part = $this->get_related_entity_name($relation_name, $relation_obj); |
|
| 420 | + if (empty($includes_for_this_model) || isset($includes_for_this_model['meta'])) { |
|
| 421 | + $result['_links'][\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array( |
|
| 422 | 422 | array( |
| 423 | 423 | 'href' => $this->get_versioned_link_to( |
| 424 | - \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ] . '/' . $related_model_part |
|
| 424 | + \EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()].'/'.$related_model_part |
|
| 425 | 425 | ), |
| 426 | 426 | 'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false |
| 427 | 427 | ) |
| 428 | 428 | ); |
| 429 | 429 | } |
| 430 | - $related_fields_to_include = $this->extract_includes_for_this_model( $include, $relation_name ); |
|
| 431 | - if( $related_fields_to_include ) { |
|
| 430 | + $related_fields_to_include = $this->extract_includes_for_this_model($include, $relation_name); |
|
| 431 | + if ($related_fields_to_include) { |
|
| 432 | 432 | $pretend_related_request = new \WP_REST_Request(); |
| 433 | 433 | $pretend_related_request->set_query_params( |
| 434 | 434 | array( |
@@ -440,11 +440,11 @@ discard block |
||
| 440 | 440 | ) |
| 441 | 441 | ); |
| 442 | 442 | $related_results = $this->get_entities_from_relation( |
| 443 | - $result[ $model->primary_key_name() ], |
|
| 443 | + $result[$model->primary_key_name()], |
|
| 444 | 444 | $relation_obj, |
| 445 | 445 | $pretend_related_request |
| 446 | 446 | ); |
| 447 | - $result[ $related_model_part ] = $related_results instanceof \WP_Error ? null : $related_results; |
|
| 447 | + $result[$related_model_part] = $related_results instanceof \WP_Error ? null : $related_results; |
|
| 448 | 448 | } |
| 449 | 449 | } |
| 450 | 450 | $result = apply_filters( |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | ); |
| 462 | 462 | $this->_set_debug_info( |
| 463 | 463 | 'inaccessible fields', |
| 464 | - array_keys( array_diff_key( $result, $result_without_inaccessible_fields ) ) |
|
| 464 | + array_keys(array_diff_key($result, $result_without_inaccessible_fields)) |
|
| 465 | 465 | ); |
| 466 | 466 | return apply_filters( |
| 467 | 467 | 'FHEE__Read__create_entity_from_wpdb_results__entity_return', |
@@ -476,8 +476,8 @@ discard block |
||
| 476 | 476 | * @param string $link_part_after_version_and_slash eg "events/10/datetimes" |
| 477 | 477 | * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes" |
| 478 | 478 | */ |
| 479 | - public function get_versioned_link_to( $link_part_after_version_and_slash ) { |
|
| 480 | - return rest_url( \EED_Core_Rest_Api::ee_api_namespace . $this->get_model_version_info()->requested_version() . '/' . $link_part_after_version_and_slash ); |
|
| 479 | + public function get_versioned_link_to($link_part_after_version_and_slash) { |
|
| 480 | + return rest_url(\EED_Core_Rest_Api::ee_api_namespace.$this->get_model_version_info()->requested_version().'/'.$link_part_after_version_and_slash); |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | /** |
@@ -487,11 +487,11 @@ discard block |
||
| 487 | 487 | * @param \EE_Model_Relation_Base $relation_obj |
| 488 | 488 | * @return string |
| 489 | 489 | */ |
| 490 | - public static function get_related_entity_name( $relation_name, $relation_obj ){ |
|
| 491 | - if( $relation_obj instanceof \EE_Belongs_To_Relation ) { |
|
| 492 | - return strtolower( $relation_name ); |
|
| 493 | - }else{ |
|
| 494 | - return \EEH_Inflector::pluralize_and_lower( $relation_name ); |
|
| 490 | + public static function get_related_entity_name($relation_name, $relation_obj) { |
|
| 491 | + if ($relation_obj instanceof \EE_Belongs_To_Relation) { |
|
| 492 | + return strtolower($relation_name); |
|
| 493 | + } else { |
|
| 494 | + return \EEH_Inflector::pluralize_and_lower($relation_name); |
|
| 495 | 495 | } |
| 496 | 496 | } |
| 497 | 497 | |
@@ -504,44 +504,44 @@ discard block |
||
| 504 | 504 | * @param \WP_REST_Request $request |
| 505 | 505 | * @return array |
| 506 | 506 | */ |
| 507 | - public function get_entity_from_model( $model, $request ) { |
|
| 508 | - $query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1); |
|
| 509 | - if( $model instanceof \EEM_Soft_Delete_Base ){ |
|
| 507 | + public function get_entity_from_model($model, $request) { |
|
| 508 | + $query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1); |
|
| 509 | + if ($model instanceof \EEM_Soft_Delete_Base) { |
|
| 510 | 510 | $query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params); |
| 511 | 511 | } |
| 512 | 512 | $restricted_query_params = $query_params; |
| 513 | - $restricted_query_params[ 'caps' ] = $this->validate_context( $request->get_param( 'caps' ) ); |
|
| 514 | - $this->_set_debug_info( 'model query params', $restricted_query_params ); |
|
| 515 | - $model_rows = $model->get_all_wpdb_results( $restricted_query_params ); |
|
| 516 | - if ( ! empty ( $model_rows ) ) { |
|
| 513 | + $restricted_query_params['caps'] = $this->validate_context($request->get_param('caps')); |
|
| 514 | + $this->_set_debug_info('model query params', $restricted_query_params); |
|
| 515 | + $model_rows = $model->get_all_wpdb_results($restricted_query_params); |
|
| 516 | + if ( ! empty ($model_rows)) { |
|
| 517 | 517 | return $this->create_entity_from_wpdb_result( |
| 518 | 518 | $model, |
| 519 | - array_shift( $model_rows ), |
|
| 520 | - $request->get_param( 'include' ), |
|
| 521 | - $this->validate_context( $request->get_param( 'caps' ) ) ); |
|
| 519 | + array_shift($model_rows), |
|
| 520 | + $request->get_param('include'), |
|
| 521 | + $this->validate_context($request->get_param('caps')) ); |
|
| 522 | 522 | } else { |
| 523 | 523 | //ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities |
| 524 | - $lowercase_model_name = strtolower( $model->get_this_model_name() ); |
|
| 525 | - $model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params ); |
|
| 526 | - if( ! empty( $model_rows_found_sans_restrictions ) ) { |
|
| 524 | + $lowercase_model_name = strtolower($model->get_this_model_name()); |
|
| 525 | + $model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params); |
|
| 526 | + if ( ! empty($model_rows_found_sans_restrictions)) { |
|
| 527 | 527 | //you got shafted- it existed but we didn't want to tell you! |
| 528 | 528 | return new \WP_Error( |
| 529 | 529 | 'rest_user_cannot_read', |
| 530 | 530 | sprintf( |
| 531 | - __( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ), |
|
| 532 | - strtolower( $model->get_this_model_name() ), |
|
| 531 | + __('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'), |
|
| 532 | + strtolower($model->get_this_model_name()), |
|
| 533 | 533 | Capabilities::get_missing_permissions_string( |
| 534 | 534 | $model, |
| 535 | - $this->validate_context( $request->get_param( 'caps' ) ) ) |
|
| 535 | + $this->validate_context($request->get_param('caps')) ) |
|
| 536 | 536 | ), |
| 537 | - array( 'status' => 403 ) |
|
| 537 | + array('status' => 403) |
|
| 538 | 538 | ); |
| 539 | 539 | } else { |
| 540 | 540 | //it's not you. It just doesn't exist |
| 541 | 541 | return new \WP_Error( |
| 542 | - sprintf( 'rest_%s_invalid_id', $lowercase_model_name ), |
|
| 543 | - sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ), |
|
| 544 | - array( 'status' => 404 ) |
|
| 542 | + sprintf('rest_%s_invalid_id', $lowercase_model_name), |
|
| 543 | + sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name), |
|
| 544 | + array('status' => 404) |
|
| 545 | 545 | ); |
| 546 | 546 | } |
| 547 | 547 | } |
@@ -554,14 +554,14 @@ discard block |
||
| 554 | 554 | * @param string $context |
| 555 | 555 | * @return string array key of EEM_Base::cap_contexts_to_cap_action_map() |
| 556 | 556 | */ |
| 557 | - public function validate_context( $context ) { |
|
| 558 | - if( ! $context ) { |
|
| 557 | + public function validate_context($context) { |
|
| 558 | + if ( ! $context) { |
|
| 559 | 559 | $context = \EEM_Base::caps_read; |
| 560 | 560 | } |
| 561 | 561 | $valid_contexts = \EEM_Base::valid_cap_contexts(); |
| 562 | - if( in_array( $context, $valid_contexts ) ){ |
|
| 562 | + if (in_array($context, $valid_contexts)) { |
|
| 563 | 563 | return $context; |
| 564 | - }else{ |
|
| 564 | + } else { |
|
| 565 | 565 | return \EEM_Base::caps_read; |
| 566 | 566 | } |
| 567 | 567 | } |
@@ -577,73 +577,73 @@ discard block |
||
| 577 | 577 | * that absolutely no results should be returned |
| 578 | 578 | * @throws \EE_Error |
| 579 | 579 | */ |
| 580 | - public function create_model_query_params( $model, $query_parameters ) { |
|
| 580 | + public function create_model_query_params($model, $query_parameters) { |
|
| 581 | 581 | $model_query_params = array( ); |
| 582 | - if ( isset( $query_parameters[ 'where' ] ) ) { |
|
| 583 | - $model_query_params[ 0 ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'where' ] ); |
|
| 584 | - } |
|
| 585 | - if ( isset( $query_parameters[ 'order_by' ] ) ) { |
|
| 586 | - $order_by = $query_parameters[ 'order_by' ]; |
|
| 587 | - } elseif ( isset( $query_parameters[ 'orderby' ] ) ) { |
|
| 588 | - $order_by = $query_parameters[ 'orderby' ]; |
|
| 589 | - }else{ |
|
| 582 | + if (isset($query_parameters['where'])) { |
|
| 583 | + $model_query_params[0] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['where']); |
|
| 584 | + } |
|
| 585 | + if (isset($query_parameters['order_by'])) { |
|
| 586 | + $order_by = $query_parameters['order_by']; |
|
| 587 | + } elseif (isset($query_parameters['orderby'])) { |
|
| 588 | + $order_by = $query_parameters['orderby']; |
|
| 589 | + } else { |
|
| 590 | 590 | $order_by = null; |
| 591 | 591 | } |
| 592 | - if( $order_by !== null ){ |
|
| 593 | - $model_query_params[ 'order_by' ] = $this->prepare_rest_query_params_key_for_models( $model, $order_by ); |
|
| 592 | + if ($order_by !== null) { |
|
| 593 | + $model_query_params['order_by'] = $this->prepare_rest_query_params_key_for_models($model, $order_by); |
|
| 594 | 594 | } |
| 595 | - if ( isset( $query_parameters[ 'group_by' ] ) ) { |
|
| 596 | - $group_by = $query_parameters[ 'group_by' ]; |
|
| 597 | - } elseif ( isset( $query_parameters[ 'groupby' ] ) ) { |
|
| 598 | - $group_by = $query_parameters[ 'groupby' ]; |
|
| 599 | - }else{ |
|
| 595 | + if (isset($query_parameters['group_by'])) { |
|
| 596 | + $group_by = $query_parameters['group_by']; |
|
| 597 | + } elseif (isset($query_parameters['groupby'])) { |
|
| 598 | + $group_by = $query_parameters['groupby']; |
|
| 599 | + } else { |
|
| 600 | 600 | $group_by = null; |
| 601 | 601 | } |
| 602 | - if( $group_by !== null ){ |
|
| 603 | - if( is_array( $group_by ) ) { |
|
| 604 | - $group_by = $this->prepare_rest_query_params_values_for_models( $model, $group_by ); |
|
| 602 | + if ($group_by !== null) { |
|
| 603 | + if (is_array($group_by)) { |
|
| 604 | + $group_by = $this->prepare_rest_query_params_values_for_models($model, $group_by); |
|
| 605 | 605 | } |
| 606 | - $model_query_params[ 'group_by' ] = $group_by; |
|
| 606 | + $model_query_params['group_by'] = $group_by; |
|
| 607 | 607 | } |
| 608 | - if ( isset( $query_parameters[ 'having' ] ) ) { |
|
| 608 | + if (isset($query_parameters['having'])) { |
|
| 609 | 609 | //@todo: no good for permissions |
| 610 | - $model_query_params[ 'having' ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'having' ] ); |
|
| 610 | + $model_query_params['having'] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['having']); |
|
| 611 | 611 | } |
| 612 | - if ( isset( $query_parameters[ 'order' ] ) ) { |
|
| 613 | - $model_query_params[ 'order' ] = $query_parameters[ 'order' ]; |
|
| 612 | + if (isset($query_parameters['order'])) { |
|
| 613 | + $model_query_params['order'] = $query_parameters['order']; |
|
| 614 | 614 | } |
| 615 | - if ( isset( $query_parameters[ 'mine' ] ) ){ |
|
| 616 | - $model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params ); |
|
| 615 | + if (isset($query_parameters['mine'])) { |
|
| 616 | + $model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params); |
|
| 617 | 617 | } |
| 618 | - if( isset( $query_parameters[ 'limit' ] ) ) { |
|
| 618 | + if (isset($query_parameters['limit'])) { |
|
| 619 | 619 | //limit should be either a string like '23' or '23,43', or an array with two items in it |
| 620 | - if( is_string( $query_parameters[ 'limit' ] ) ) { |
|
| 620 | + if (is_string($query_parameters['limit'])) { |
|
| 621 | 621 | $limit_array = explode(',', $query_parameters['limit']); |
| 622 | - }else { |
|
| 623 | - $limit_array = $query_parameters[ 'limit' ]; |
|
| 622 | + } else { |
|
| 623 | + $limit_array = $query_parameters['limit']; |
|
| 624 | 624 | } |
| 625 | 625 | $sanitized_limit = array(); |
| 626 | - foreach( $limit_array as $key => $limit_part ) { |
|
| 627 | - if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) { |
|
| 626 | + foreach ($limit_array as $key => $limit_part) { |
|
| 627 | + if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) { |
|
| 628 | 628 | throw new \EE_Error( |
| 629 | 629 | sprintf( |
| 630 | - __( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ), |
|
| 631 | - json_encode( $query_parameters[ 'limit' ] ) |
|
| 630 | + __('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'), |
|
| 631 | + json_encode($query_parameters['limit']) |
|
| 632 | 632 | ) |
| 633 | 633 | ); |
| 634 | 634 | } |
| 635 | - $sanitized_limit[] = intval( $limit_part ); |
|
| 635 | + $sanitized_limit[] = intval($limit_part); |
|
| 636 | 636 | } |
| 637 | - $model_query_params[ 'limit' ] = implode( ',', $sanitized_limit ); |
|
| 638 | - }else{ |
|
| 639 | - $model_query_params[ 'limit' ] = 50; |
|
| 637 | + $model_query_params['limit'] = implode(',', $sanitized_limit); |
|
| 638 | + } else { |
|
| 639 | + $model_query_params['limit'] = 50; |
|
| 640 | 640 | } |
| 641 | - if( isset( $query_parameters[ 'caps' ] ) ) { |
|
| 642 | - $model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] ); |
|
| 643 | - }else{ |
|
| 644 | - $model_query_params[ 'caps' ] = \EEM_Base::caps_read; |
|
| 641 | + if (isset($query_parameters['caps'])) { |
|
| 642 | + $model_query_params['caps'] = $this->validate_context($query_parameters['caps']); |
|
| 643 | + } else { |
|
| 644 | + $model_query_params['caps'] = \EEM_Base::caps_read; |
|
| 645 | 645 | } |
| 646 | - return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model ); |
|
| 646 | + return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model); |
|
| 647 | 647 | } |
| 648 | 648 | |
| 649 | 649 | |
@@ -655,13 +655,13 @@ discard block |
||
| 655 | 655 | * @param array $query_params sub-array from @see EEM_Base::get_all() |
| 656 | 656 | * @return array |
| 657 | 657 | */ |
| 658 | - public function prepare_rest_query_params_key_for_models( $model, $query_params ) { |
|
| 658 | + public function prepare_rest_query_params_key_for_models($model, $query_params) { |
|
| 659 | 659 | $model_ready_query_params = array(); |
| 660 | - foreach( $query_params as $key => $value ) { |
|
| 661 | - if( is_array( $value ) ) { |
|
| 662 | - $model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value ); |
|
| 663 | - }else{ |
|
| 664 | - $model_ready_query_params[ $key ] = $value; |
|
| 660 | + foreach ($query_params as $key => $value) { |
|
| 661 | + if (is_array($value)) { |
|
| 662 | + $model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value); |
|
| 663 | + } else { |
|
| 664 | + $model_ready_query_params[$key] = $value; |
|
| 665 | 665 | } |
| 666 | 666 | } |
| 667 | 667 | return $model_ready_query_params; |
@@ -674,13 +674,13 @@ discard block |
||
| 674 | 674 | * @param $query_params |
| 675 | 675 | * @return array |
| 676 | 676 | */ |
| 677 | - public function prepare_rest_query_params_values_for_models( $model, $query_params ) { |
|
| 677 | + public function prepare_rest_query_params_values_for_models($model, $query_params) { |
|
| 678 | 678 | $model_ready_query_params = array(); |
| 679 | - foreach( $query_params as $key => $value ) { |
|
| 680 | - if( is_array( $value ) ) { |
|
| 681 | - $model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value ); |
|
| 679 | + foreach ($query_params as $key => $value) { |
|
| 680 | + if (is_array($value)) { |
|
| 681 | + $model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value); |
|
| 682 | 682 | } else { |
| 683 | - $model_ready_query_params[ $key ] = $value; |
|
| 683 | + $model_ready_query_params[$key] = $value; |
|
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | 686 | return $model_ready_query_params; |
@@ -696,33 +696,33 @@ discard block |
||
| 696 | 696 | * @return array of fields for this model. If $model_name is provided, then |
| 697 | 697 | * the fields for that model, with the model's name removed from each. |
| 698 | 698 | */ |
| 699 | - public function extract_includes_for_this_model( $include_string, $model_name = null ) { |
|
| 700 | - if( is_array( $include_string ) ) { |
|
| 701 | - $include_string = implode( ',', $include_string ); |
|
| 699 | + public function extract_includes_for_this_model($include_string, $model_name = null) { |
|
| 700 | + if (is_array($include_string)) { |
|
| 701 | + $include_string = implode(',', $include_string); |
|
| 702 | 702 | } |
| 703 | - if( $include_string === '*' ) { |
|
| 703 | + if ($include_string === '*') { |
|
| 704 | 704 | return array(); |
| 705 | 705 | } |
| 706 | - $includes = explode( ',', $include_string ); |
|
| 706 | + $includes = explode(',', $include_string); |
|
| 707 | 707 | $extracted_fields_to_include = array(); |
| 708 | - if( $model_name ){ |
|
| 709 | - foreach( $includes as $field_to_include ) { |
|
| 710 | - $field_to_include = trim( $field_to_include ); |
|
| 711 | - if( strpos( $field_to_include, $model_name . '.' ) === 0 ) { |
|
| 708 | + if ($model_name) { |
|
| 709 | + foreach ($includes as $field_to_include) { |
|
| 710 | + $field_to_include = trim($field_to_include); |
|
| 711 | + if (strpos($field_to_include, $model_name.'.') === 0) { |
|
| 712 | 712 | //found the model name at the exact start |
| 713 | - $field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include ); |
|
| 713 | + $field_sans_model_name = str_replace($model_name.'.', '', $field_to_include); |
|
| 714 | 714 | $extracted_fields_to_include[] = $field_sans_model_name; |
| 715 | - }elseif( $field_to_include == $model_name ){ |
|
| 715 | + }elseif ($field_to_include == $model_name) { |
|
| 716 | 716 | $extracted_fields_to_include[] = '*'; |
| 717 | 717 | } |
| 718 | 718 | } |
| 719 | - }else{ |
|
| 719 | + } else { |
|
| 720 | 720 | //look for ones with no period |
| 721 | - foreach( $includes as $field_to_include ) { |
|
| 722 | - $field_to_include = trim( $field_to_include ); |
|
| 721 | + foreach ($includes as $field_to_include) { |
|
| 722 | + $field_to_include = trim($field_to_include); |
|
| 723 | 723 | if ( |
| 724 | - strpos( $field_to_include, '.' ) === false |
|
| 725 | - && ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include ) |
|
| 724 | + strpos($field_to_include, '.') === false |
|
| 725 | + && ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include) |
|
| 726 | 726 | ) { |
| 727 | 727 | $extracted_fields_to_include[] = $field_to_include; |
| 728 | 728 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
| 3 | 3 | exit('NO direct script access allowed'); |
| 4 | 4 | |
| 5 | 5 | /** |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | |
| 43 | - public function __construct( $routing = TRUE ) { |
|
| 44 | - parent::__construct( $routing ); |
|
| 43 | + public function __construct($routing = TRUE) { |
|
| 44 | + parent::__construct($routing); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | |
| 59 | 59 | protected function _ajax_hooks() { |
| 60 | - add_action('wp_ajax_espresso_display_country_settings', array( $this, 'display_country_settings')); |
|
| 61 | - add_action('wp_ajax_espresso_display_country_states', array( $this, 'display_country_states')); |
|
| 62 | - add_action('wp_ajax_espresso_delete_state', array( $this, 'delete_state'), 10, 3 ); |
|
| 63 | - add_action('wp_ajax_espresso_add_new_state', array( $this, 'add_new_state')); |
|
| 60 | + add_action('wp_ajax_espresso_display_country_settings', array($this, 'display_country_settings')); |
|
| 61 | + add_action('wp_ajax_espresso_display_country_states', array($this, 'display_country_states')); |
|
| 62 | + add_action('wp_ajax_espresso_delete_state', array($this, 'delete_state'), 10, 3); |
|
| 63 | + add_action('wp_ajax_espresso_add_new_state', array($this, 'add_new_state')); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
@@ -153,14 +153,14 @@ discard block |
||
| 153 | 153 | 'label' => __('Critical Pages', 'event_espresso'), |
| 154 | 154 | 'order' => 50 |
| 155 | 155 | ), |
| 156 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ), |
|
| 156 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')), |
|
| 157 | 157 | 'help_tabs' => array( |
| 158 | 158 | 'general_settings_critical_pages_help_tab' => array( |
| 159 | 159 | 'title' => __('Critical Pages', 'event_espresso'), |
| 160 | 160 | 'filename' => 'general_settings_critical_pages' |
| 161 | 161 | ) |
| 162 | 162 | ), |
| 163 | - 'help_tour' => array( 'Critical_Pages_Help_Tour' ), |
|
| 163 | + 'help_tour' => array('Critical_Pages_Help_Tour'), |
|
| 164 | 164 | 'require_nonce' => FALSE |
| 165 | 165 | ), |
| 166 | 166 | 'default' => array( |
@@ -174,8 +174,8 @@ discard block |
||
| 174 | 174 | 'filename' => 'general_settings_your_organization' |
| 175 | 175 | ) |
| 176 | 176 | ), |
| 177 | - 'help_tour' => array( 'Your_Organization_Help_Tour' ), |
|
| 178 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ), |
|
| 177 | + 'help_tour' => array('Your_Organization_Help_Tour'), |
|
| 178 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')), |
|
| 179 | 179 | 'require_nonce' => FALSE |
| 180 | 180 | ), |
| 181 | 181 | 'admin_option_settings' => array( |
@@ -183,14 +183,14 @@ discard block |
||
| 183 | 183 | 'label' => __('Admin Options', 'event_espresso'), |
| 184 | 184 | 'order' => 60 |
| 185 | 185 | ), |
| 186 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ), |
|
| 186 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')), |
|
| 187 | 187 | 'help_tabs' => array( |
| 188 | 188 | 'general_settings_admin_options_help_tab' => array( |
| 189 | 189 | 'title' => __('Admin Options', 'event_espresso'), |
| 190 | 190 | 'filename' => 'general_settings_admin_options' |
| 191 | 191 | ) |
| 192 | 192 | ), |
| 193 | - 'help_tour' => array( 'Admin_Options_Help_Tour' ), |
|
| 193 | + 'help_tour' => array('Admin_Options_Help_Tour'), |
|
| 194 | 194 | 'require_nonce' => FALSE |
| 195 | 195 | ), |
| 196 | 196 | 'country_settings' => array( |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | 'filename' => 'general_settings_countries' |
| 205 | 205 | ) |
| 206 | 206 | ), |
| 207 | - 'help_tour' => array( 'Countries_Help_Tour' ), |
|
| 207 | + 'help_tour' => array('Countries_Help_Tour'), |
|
| 208 | 208 | 'require_nonce' => FALSE |
| 209 | 209 | ) |
| 210 | 210 | ); |
@@ -222,11 +222,11 @@ discard block |
||
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | public function admin_init() { |
| 225 | - EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' ); |
|
| 226 | - EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' ); |
|
| 227 | - EE_Registry::$i18n_js_strings[ 'confirm_delete_state' ] = __( 'Are you sure you want to delete this State / Province?', 'event_espresso' ); |
|
| 228 | - $protocol = isset( $_SERVER[ 'HTTPS' ] ) ? 'https://' : 'http://'; |
|
| 229 | - EE_Registry::$i18n_js_strings[ 'ajax_url' ] = admin_url( 'admin-ajax.php?page=espresso_general_settings', $protocol ); |
|
| 225 | + EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso'); |
|
| 226 | + EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso'); |
|
| 227 | + EE_Registry::$i18n_js_strings['confirm_delete_state'] = __('Are you sure you want to delete this State / Province?', 'event_espresso'); |
|
| 228 | + $protocol = isset($_SERVER['HTTPS']) ? 'https://' : 'http://'; |
|
| 229 | + EE_Registry::$i18n_js_strings['ajax_url'] = admin_url('admin-ajax.php?page=espresso_general_settings', $protocol); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | public function admin_notices() {} |
@@ -239,21 +239,21 @@ discard block |
||
| 239 | 239 | //scripts |
| 240 | 240 | wp_enqueue_script('media-upload'); |
| 241 | 241 | wp_enqueue_script('thickbox'); |
| 242 | - wp_register_script( 'organization_settings', GEN_SET_ASSETS_URL . 'your_organization_settings.js', array( 'jquery','media-upload','thickbox' ), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 243 | - wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION ); |
|
| 244 | - wp_enqueue_script( 'organization_settings' ); |
|
| 245 | - wp_enqueue_style( 'organization-css' ); |
|
| 246 | - $confirm_image_delete = array( 'text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso')); |
|
| 247 | - wp_localize_script( 'organization_settings', 'confirm_image_delete', $confirm_image_delete ); |
|
| 242 | + wp_register_script('organization_settings', GEN_SET_ASSETS_URL.'your_organization_settings.js', array('jquery', 'media-upload', 'thickbox'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 243 | + wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION); |
|
| 244 | + wp_enqueue_script('organization_settings'); |
|
| 245 | + wp_enqueue_style('organization-css'); |
|
| 246 | + $confirm_image_delete = array('text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.', 'event_espresso')); |
|
| 247 | + wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete); |
|
| 248 | 248 | |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | public function load_scripts_styles_country_settings() { |
| 252 | 252 | //scripts |
| 253 | - wp_register_script( 'gen_settings_countries', GEN_SET_ASSETS_URL . 'gen_settings_countries.js', array( 'ee_admin_js' ), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 254 | - wp_register_style( 'organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION ); |
|
| 255 | - wp_enqueue_script( 'gen_settings_countries' ); |
|
| 256 | - wp_enqueue_style( 'organization-css' ); |
|
| 253 | + wp_register_script('gen_settings_countries', GEN_SET_ASSETS_URL.'gen_settings_countries.js', array('ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 254 | + wp_register_style('organization-css', GEN_SET_ASSETS_URL.'organization.css', array(), EVENT_ESPRESSO_VERSION); |
|
| 255 | + wp_enqueue_script('gen_settings_countries'); |
|
| 256 | + wp_enqueue_style('organization-css'); |
|
| 257 | 257 | |
| 258 | 258 | } |
| 259 | 259 | |
@@ -265,37 +265,37 @@ discard block |
||
| 265 | 265 | |
| 266 | 266 | // Check to make sure all of the main pages are setup properly, |
| 267 | 267 | // if not create the default pages and display an admin notice |
| 268 | - EE_Registry::instance()->load_helper( 'Activation' ); |
|
| 268 | + EE_Registry::instance()->load_helper('Activation'); |
|
| 269 | 269 | EEH_Activation::verify_default_pages_exist(); |
| 270 | 270 | |
| 271 | 271 | $this->_transient_garbage_collection(); |
| 272 | 272 | $this->_template_args['values'] = $this->_yes_no_values; |
| 273 | 273 | |
| 274 | - $this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ?EE_Registry::instance()->CFG->core->reg_page_id : NULL; |
|
| 275 | - $this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id ) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id ) : FALSE; |
|
| 274 | + $this->_template_args['reg_page_id'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ? EE_Registry::instance()->CFG->core->reg_page_id : NULL; |
|
| 275 | + $this->_template_args['reg_page_obj'] = isset(EE_Registry::instance()->CFG->core->reg_page_id) ? get_page(EE_Registry::instance()->CFG->core->reg_page_id) : FALSE; |
|
| 276 | 276 | |
| 277 | - $this->_template_args['txn_page_id'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ?EE_Registry::instance()->CFG->core->txn_page_id : NULL; |
|
| 278 | - $this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id ) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id ) : FALSE; |
|
| 277 | + $this->_template_args['txn_page_id'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ? EE_Registry::instance()->CFG->core->txn_page_id : NULL; |
|
| 278 | + $this->_template_args['txn_page_obj'] = isset(EE_Registry::instance()->CFG->core->txn_page_id) ? get_page(EE_Registry::instance()->CFG->core->txn_page_id) : FALSE; |
|
| 279 | 279 | |
| 280 | - $this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ?EE_Registry::instance()->CFG->core->thank_you_page_id : NULL; |
|
| 281 | - $this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id ) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id ) : FALSE; |
|
| 280 | + $this->_template_args['thank_you_page_id'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ? EE_Registry::instance()->CFG->core->thank_you_page_id : NULL; |
|
| 281 | + $this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id) ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id) : FALSE; |
|
| 282 | 282 | |
| 283 | - $this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ?EE_Registry::instance()->CFG->core->cancel_page_id : NULL; |
|
| 284 | - $this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id ) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id ) : FALSE; |
|
| 283 | + $this->_template_args['cancel_page_id'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ? EE_Registry::instance()->CFG->core->cancel_page_id : NULL; |
|
| 284 | + $this->_template_args['cancel_page_obj'] = isset(EE_Registry::instance()->CFG->core->cancel_page_id) ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id) : FALSE; |
|
| 285 | 285 | |
| 286 | - $this->_set_add_edit_form_tags( 'update_espresso_page_settings' ); |
|
| 287 | - $this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
|
| 288 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php', $this->_template_args, TRUE ); |
|
| 286 | + $this->_set_add_edit_form_tags('update_espresso_page_settings'); |
|
| 287 | + $this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE); |
|
| 288 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'espresso_page_settings.template.php', $this->_template_args, TRUE); |
|
| 289 | 289 | $this->display_admin_page_with_sidebar(); |
| 290 | 290 | |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | protected function _update_espresso_page_settings() { |
| 294 | 294 | // capture incoming request data |
| 295 | - $reg_page_id = isset( $this->_req_data['reg_page_id'] ) ? absint( $this->_req_data['reg_page_id'] ) : EE_Registry::instance()->CFG->core->reg_page_id; |
|
| 296 | - $txn_page_id = isset( $this->_req_data['txn_page_id'] ) ? absint( $this->_req_data['txn_page_id'] ) : EE_Registry::instance()->CFG->core->txn_page_id; |
|
| 297 | - $thank_you_page_id = isset( $this->_req_data['thank_you_page_id'] ) ? absint( $this->_req_data['thank_you_page_id'] ) : EE_Registry::instance()->CFG->core->thank_you_page_id; |
|
| 298 | - $cancel_page_id = isset( $this->_req_data['cancel_page_id'] ) ? absint( $this->_req_data['cancel_page_id'] ) : EE_Registry::instance()->CFG->core->cancel_page_id; |
|
| 295 | + $reg_page_id = isset($this->_req_data['reg_page_id']) ? absint($this->_req_data['reg_page_id']) : EE_Registry::instance()->CFG->core->reg_page_id; |
|
| 296 | + $txn_page_id = isset($this->_req_data['txn_page_id']) ? absint($this->_req_data['txn_page_id']) : EE_Registry::instance()->CFG->core->txn_page_id; |
|
| 297 | + $thank_you_page_id = isset($this->_req_data['thank_you_page_id']) ? absint($this->_req_data['thank_you_page_id']) : EE_Registry::instance()->CFG->core->thank_you_page_id; |
|
| 298 | + $cancel_page_id = isset($this->_req_data['cancel_page_id']) ? absint($this->_req_data['cancel_page_id']) : EE_Registry::instance()->CFG->core->cancel_page_id; |
|
| 299 | 299 | // pack critical_pages into an array |
| 300 | 300 | $critical_pages = array( |
| 301 | 301 | 'reg_page_id' => $reg_page_id, |
@@ -303,17 +303,17 @@ discard block |
||
| 303 | 303 | 'thank_you_page_id' => $thank_you_page_id, |
| 304 | 304 | 'cancel_page_id' => $cancel_page_id |
| 305 | 305 | ); |
| 306 | - foreach ( $critical_pages as $critical_page_name => $critical_page_id ) { |
|
| 306 | + foreach ($critical_pages as $critical_page_name => $critical_page_id) { |
|
| 307 | 307 | // has the page changed ? |
| 308 | - if ( EE_Registry::instance()->CFG->core->{$critical_page_name} != $critical_page_id ) { |
|
| 308 | + if (EE_Registry::instance()->CFG->core->{$critical_page_name} != $critical_page_id) { |
|
| 309 | 309 | // grab post object for old page |
| 310 | - $post = get_post( EE_Registry::instance()->CFG->core->{$critical_page_name} ); |
|
| 310 | + $post = get_post(EE_Registry::instance()->CFG->core->{$critical_page_name} ); |
|
| 311 | 311 | // update post shortcodes for old page |
| 312 | - EE_Admin::parse_post_content_on_save( $critical_page_id, $post ); |
|
| 312 | + EE_Admin::parse_post_content_on_save($critical_page_id, $post); |
|
| 313 | 313 | // grab post object for new page |
| 314 | - $post = get_post( $critical_page_id ); |
|
| 314 | + $post = get_post($critical_page_id); |
|
| 315 | 315 | // update post shortcodes for new page |
| 316 | - EE_Admin::parse_post_content_on_save( $critical_page_id, $post ); |
|
| 316 | + EE_Admin::parse_post_content_on_save($critical_page_id, $post); |
|
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | 319 | // set page IDs |
@@ -322,14 +322,14 @@ discard block |
||
| 322 | 322 | EE_Registry::instance()->CFG->core->thank_you_page_id = $thank_you_page_id; |
| 323 | 323 | EE_Registry::instance()->CFG->core->cancel_page_id = $cancel_page_id; |
| 324 | 324 | |
| 325 | - EE_Registry::instance()->CFG->core = apply_filters( 'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data ); |
|
| 325 | + EE_Registry::instance()->CFG->core = apply_filters('FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core', EE_Registry::instance()->CFG->core, $this->_req_data); |
|
| 326 | 326 | |
| 327 | 327 | $what = __('Critical Pages & Shortcodes', 'event_espresso'); |
| 328 | - $success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 328 | + $success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->core, __FILE__, __FUNCTION__, __LINE__); |
|
| 329 | 329 | $query_args = array( |
| 330 | 330 | 'action' => 'critical_pages' |
| 331 | 331 | ); |
| 332 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
| 332 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
| 333 | 333 | |
| 334 | 334 | } |
| 335 | 335 | |
@@ -344,35 +344,35 @@ discard block |
||
| 344 | 344 | |
| 345 | 345 | protected function _your_organization_settings() { |
| 346 | 346 | |
| 347 | - $this->_template_args['site_license_key'] = isset( EE_Registry::instance()->NET_CFG->core->site_license_key ) ? EE_Registry::instance()->NET_CFG->core->get_pretty( 'site_license_key' ) : ''; |
|
| 348 | - $this->_template_args['organization_name'] = isset( EE_Registry::instance()->CFG->organization->name ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) : ''; |
|
| 349 | - $this->_template_args['organization_address_1'] = isset( EE_Registry::instance()->CFG->organization->address_1 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' ) : ''; |
|
| 350 | - $this->_template_args['organization_address_2'] = isset( EE_Registry::instance()->CFG->organization->address_2 ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' ) : ''; |
|
| 351 | - $this->_template_args['organization_city'] = isset( EE_Registry::instance()->CFG->organization->city ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'city' ) : ''; |
|
| 352 | - $this->_template_args['organization_zip'] = isset( EE_Registry::instance()->CFG->organization->zip ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'zip' ) : ''; |
|
| 353 | - $this->_template_args['organization_email'] = isset( EE_Registry::instance()->CFG->organization->email ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) : ''; |
|
| 354 | - $this->_template_args['organization_phone'] = isset( EE_Registry::instance()->CFG->organization->phone ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'phone' ) : ''; |
|
| 355 | - $this->_template_args['organization_vat'] = isset( EE_Registry::instance()->CFG->organization->vat ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'vat' ) : ''; |
|
| 356 | - $this->_template_args['currency_sign'] = isset( EE_Registry::instance()->CFG->currency->sign ) ? EE_Registry::instance()->CFG->currency->get_pretty( 'sign' ) : '$'; |
|
| 357 | - $this->_template_args['organization_logo_url'] = isset( EE_Registry::instance()->CFG->organization->logo_url ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) : FALSE; |
|
| 358 | - $this->_template_args['organization_facebook'] = isset( EE_Registry::instance()->CFG->organization->facebook ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' ) : ''; |
|
| 359 | - $this->_template_args['organization_twitter'] = isset( EE_Registry::instance()->CFG->organization->twitter ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' ) : ''; |
|
| 360 | - $this->_template_args['organization_linkedin'] = isset( EE_Registry::instance()->CFG->organization->linkedin ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' ) : ''; |
|
| 361 | - $this->_template_args['organization_pinterest'] = isset( EE_Registry::instance()->CFG->organization->pinterest ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' ) : ''; |
|
| 362 | - $this->_template_args['organization_google'] = isset( EE_Registry::instance()->CFG->organization->google ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'google' ) : ''; |
|
| 363 | - $this->_template_args['organization_instagram'] = isset( EE_Registry::instance()->CFG->organization->instagram ) ? EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' ) : ''; |
|
| 347 | + $this->_template_args['site_license_key'] = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->get_pretty('site_license_key') : ''; |
|
| 348 | + $this->_template_args['organization_name'] = isset(EE_Registry::instance()->CFG->organization->name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : ''; |
|
| 349 | + $this->_template_args['organization_address_1'] = isset(EE_Registry::instance()->CFG->organization->address_1) ? EE_Registry::instance()->CFG->organization->get_pretty('address_1') : ''; |
|
| 350 | + $this->_template_args['organization_address_2'] = isset(EE_Registry::instance()->CFG->organization->address_2) ? EE_Registry::instance()->CFG->organization->get_pretty('address_2') : ''; |
|
| 351 | + $this->_template_args['organization_city'] = isset(EE_Registry::instance()->CFG->organization->city) ? EE_Registry::instance()->CFG->organization->get_pretty('city') : ''; |
|
| 352 | + $this->_template_args['organization_zip'] = isset(EE_Registry::instance()->CFG->organization->zip) ? EE_Registry::instance()->CFG->organization->get_pretty('zip') : ''; |
|
| 353 | + $this->_template_args['organization_email'] = isset(EE_Registry::instance()->CFG->organization->email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : ''; |
|
| 354 | + $this->_template_args['organization_phone'] = isset(EE_Registry::instance()->CFG->organization->phone) ? EE_Registry::instance()->CFG->organization->get_pretty('phone') : ''; |
|
| 355 | + $this->_template_args['organization_vat'] = isset(EE_Registry::instance()->CFG->organization->vat) ? EE_Registry::instance()->CFG->organization->get_pretty('vat') : ''; |
|
| 356 | + $this->_template_args['currency_sign'] = isset(EE_Registry::instance()->CFG->currency->sign) ? EE_Registry::instance()->CFG->currency->get_pretty('sign') : '$'; |
|
| 357 | + $this->_template_args['organization_logo_url'] = isset(EE_Registry::instance()->CFG->organization->logo_url) ? EE_Registry::instance()->CFG->organization->get_pretty('logo_url') : FALSE; |
|
| 358 | + $this->_template_args['organization_facebook'] = isset(EE_Registry::instance()->CFG->organization->facebook) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : ''; |
|
| 359 | + $this->_template_args['organization_twitter'] = isset(EE_Registry::instance()->CFG->organization->twitter) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : ''; |
|
| 360 | + $this->_template_args['organization_linkedin'] = isset(EE_Registry::instance()->CFG->organization->linkedin) ? EE_Registry::instance()->CFG->organization->get_pretty('linkedin') : ''; |
|
| 361 | + $this->_template_args['organization_pinterest'] = isset(EE_Registry::instance()->CFG->organization->pinterest) ? EE_Registry::instance()->CFG->organization->get_pretty('pinterest') : ''; |
|
| 362 | + $this->_template_args['organization_google'] = isset(EE_Registry::instance()->CFG->organization->google) ? EE_Registry::instance()->CFG->organization->get_pretty('google') : ''; |
|
| 363 | + $this->_template_args['organization_instagram'] = isset(EE_Registry::instance()->CFG->organization->instagram) ? EE_Registry::instance()->CFG->organization->get_pretty('instagram') : ''; |
|
| 364 | 364 | //UXIP settings |
| 365 | - $this->_template_args['ee_ueip_optin'] = isset( EE_Registry::instance()->CFG->core->ee_ueip_optin ) ? EE_Registry::instance()->CFG->core->get_pretty( 'ee_ueip_optin' ) : TRUE; |
|
| 365 | + $this->_template_args['ee_ueip_optin'] = isset(EE_Registry::instance()->CFG->core->ee_ueip_optin) ? EE_Registry::instance()->CFG->core->get_pretty('ee_ueip_optin') : TRUE; |
|
| 366 | 366 | |
| 367 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
| 368 | - $STA_ID = isset( EE_Registry::instance()->CFG->organization->STA_ID ) ? EE_Registry::instance()->CFG->organization->STA_ID : 4; |
|
| 367 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
| 368 | + $STA_ID = isset(EE_Registry::instance()->CFG->organization->STA_ID) ? EE_Registry::instance()->CFG->organization->STA_ID : 4; |
|
| 369 | 369 | $this->_template_args['states'] = new EE_Question_Form_Input( |
| 370 | - EE_Question::new_instance ( array( |
|
| 370 | + EE_Question::new_instance(array( |
|
| 371 | 371 | 'QST_ID'=> 0, |
| 372 | 372 | 'QST_display_text'=> __('State/Province', 'event_espresso'), |
| 373 | 373 | 'QST_system'=>'admin-state' |
| 374 | 374 | )), |
| 375 | - EE_Answer::new_instance ( array( |
|
| 375 | + EE_Answer::new_instance(array( |
|
| 376 | 376 | 'ANS_ID' => 0, |
| 377 | 377 | 'ANS_value' => $STA_ID |
| 378 | 378 | )), |
@@ -384,14 +384,14 @@ discard block |
||
| 384 | 384 | ) |
| 385 | 385 | ); |
| 386 | 386 | |
| 387 | - $CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US'; |
|
| 387 | + $CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US'; |
|
| 388 | 388 | $this->_template_args['countries'] = new EE_Question_Form_Input( |
| 389 | - EE_Question::new_instance ( array( |
|
| 389 | + EE_Question::new_instance(array( |
|
| 390 | 390 | 'QST_ID'=> 0, |
| 391 | 391 | 'QST_display_text'=> __('Country', 'event_espresso'), |
| 392 | 392 | 'QST_system'=>'admin-country' |
| 393 | 393 | )), |
| 394 | - EE_Answer::new_instance ( array( |
|
| 394 | + EE_Answer::new_instance(array( |
|
| 395 | 395 | 'ANS_ID' => 0, |
| 396 | 396 | 'ANS_value' => $CNT_ISO |
| 397 | 397 | )), |
@@ -403,51 +403,51 @@ discard block |
||
| 403 | 403 | ) |
| 404 | 404 | ); |
| 405 | 405 | |
| 406 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 ); |
|
| 407 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 ); |
|
| 406 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2); |
|
| 407 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2); |
|
| 408 | 408 | |
| 409 | 409 | //PUE verification stuff |
| 410 | - $ver_option_key = 'puvererr_' . basename( EE_PLUGIN_BASENAME ); |
|
| 411 | - $verify_fail = get_option( $ver_option_key ); |
|
| 412 | - $this->_template_args['site_license_key_verified'] = $verify_fail || !empty( $verify_fail ) || ( empty( $this->_template_args['site_license_key'] ) && empty( $verify_fail ) )? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>'; |
|
| 410 | + $ver_option_key = 'puvererr_'.basename(EE_PLUGIN_BASENAME); |
|
| 411 | + $verify_fail = get_option($ver_option_key); |
|
| 412 | + $this->_template_args['site_license_key_verified'] = $verify_fail || ! empty($verify_fail) || (empty($this->_template_args['site_license_key']) && empty($verify_fail)) ? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>'; |
|
| 413 | 413 | |
| 414 | - $this->_set_add_edit_form_tags( 'update_your_organization_settings' ); |
|
| 415 | - $this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
|
| 416 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'your_organization_settings.template.php', $this->_template_args, TRUE ); |
|
| 414 | + $this->_set_add_edit_form_tags('update_your_organization_settings'); |
|
| 415 | + $this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE); |
|
| 416 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'your_organization_settings.template.php', $this->_template_args, TRUE); |
|
| 417 | 417 | |
| 418 | 418 | $this->display_admin_page_with_sidebar(); |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | protected function _update_your_organization_settings() { |
| 422 | - if ( is_main_site() ) |
|
| 423 | - EE_Registry::instance()->NET_CFG->core->site_license_key = isset( $this->_req_data['site_license_key'] ) ? sanitize_text_field( $this->_req_data['site_license_key'] ) : EE_Registry::instance()->NET_CFG->core->site_license_key; |
|
| 424 | - EE_Registry::instance()->CFG->organization->name = isset( $this->_req_data['organization_name'] ) ? sanitize_text_field( $this->_req_data['organization_name'] ) : EE_Registry::instance()->CFG->organization->name; |
|
| 425 | - EE_Registry::instance()->CFG->organization->address_1 = isset( $this->_req_data['organization_address_1'] ) ? sanitize_text_field( $this->_req_data['organization_address_1'] ) : EE_Registry::instance()->CFG->organization->address_1; |
|
| 426 | - EE_Registry::instance()->CFG->organization->address_2 = isset( $this->_req_data['organization_address_2'] ) ? sanitize_text_field( $this->_req_data['organization_address_2'] ) : EE_Registry::instance()->CFG->organization->address_2; |
|
| 427 | - EE_Registry::instance()->CFG->organization->city = isset( $this->_req_data['organization_city'] ) ? sanitize_text_field( $this->_req_data['organization_city'] ) : EE_Registry::instance()->CFG->organization->city; |
|
| 428 | - EE_Registry::instance()->CFG->organization->STA_ID = isset( $this->_req_data['organization_state'] ) ? absint( $this->_req_data['organization_state'] ) : EE_Registry::instance()->CFG->organization->STA_ID; |
|
| 429 | - EE_Registry::instance()->CFG->organization->CNT_ISO = isset( $this->_req_data['organization_country'] ) ? sanitize_text_field( $this->_req_data['organization_country'] ) : EE_Registry::instance()->CFG->organization->CNT_ISO; |
|
| 430 | - EE_Registry::instance()->CFG->organization->zip = isset( $this->_req_data['organization_zip'] ) ? sanitize_text_field( $this->_req_data['organization_zip'] ) : EE_Registry::instance()->CFG->organization->zip; |
|
| 431 | - EE_Registry::instance()->CFG->organization->email = isset( $this->_req_data['organization_email'] ) ? sanitize_email( $this->_req_data['organization_email'] ) : EE_Registry::instance()->CFG->organization->email; |
|
| 432 | - EE_Registry::instance()->CFG->organization->vat = isset( $this->_req_data['organization_vat'] ) ? sanitize_text_field( $this->_req_data['organization_vat'] ) : EE_Registry::instance()->CFG->organization->vat; |
|
| 433 | - EE_Registry::instance()->CFG->organization->phone = isset( $this->_req_data['organization_phone'] ) ? sanitize_text_field( $this->_req_data['organization_phone'] ) : EE_Registry::instance()->CFG->organization->phone; |
|
| 434 | - EE_Registry::instance()->CFG->organization->logo_url = isset( $this->_req_data['organization_logo_url'] ) ? esc_url_raw( $this->_req_data['organization_logo_url'] ) : EE_Registry::instance()->CFG->organization->logo_url; |
|
| 435 | - EE_Registry::instance()->CFG->organization->facebook = isset( $this->_req_data['organization_facebook'] ) ? esc_url_raw( $this->_req_data['organization_facebook'] ) : EE_Registry::instance()->CFG->organization->facebook; |
|
| 436 | - EE_Registry::instance()->CFG->organization->twitter = isset( $this->_req_data['organization_twitter'] ) ? esc_url_raw( $this->_req_data['organization_twitter'] ) : EE_Registry::instance()->CFG->organization->twitter; |
|
| 437 | - EE_Registry::instance()->CFG->organization->linkedin = isset( $this->_req_data['organization_linkedin'] ) ? esc_url_raw( $this->_req_data['organization_linkedin'] ) : EE_Registry::instance()->CFG->organization->linkedin; |
|
| 438 | - EE_Registry::instance()->CFG->organization->pinterest = isset( $this->_req_data['organization_pinterest'] ) ? esc_url_raw( $this->_req_data['organization_pinterest'] ) : EE_Registry::instance()->CFG->organization->pinterest; |
|
| 439 | - EE_Registry::instance()->CFG->organization->google = isset( $this->_req_data['organization_google'] ) ? esc_url_raw( $this->_req_data['organization_google'] ) : EE_Registry::instance()->CFG->organization->google; |
|
| 440 | - EE_Registry::instance()->CFG->organization->instagram = isset( $this->_req_data['organization_instagram'] ) ? esc_url_raw( $this->_req_data['organization_instagram'] ) : EE_Registry::instance()->CFG->organization->instagram; |
|
| 441 | - EE_Registry::instance()->CFG->core->ee_ueip_optin = isset( $this->_req_data['ueip_optin'] ) && !empty( $this->_req_data['ueip_optin'] ) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin; |
|
| 442 | - |
|
| 443 | - EE_Registry::instance()->CFG->currency = new EE_Currency_Config( EE_Registry::instance()->CFG->organization->CNT_ISO ); |
|
| 444 | - |
|
| 445 | - EE_Registry::instance()->CFG = apply_filters( 'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG ); |
|
| 422 | + if (is_main_site()) |
|
| 423 | + EE_Registry::instance()->NET_CFG->core->site_license_key = isset($this->_req_data['site_license_key']) ? sanitize_text_field($this->_req_data['site_license_key']) : EE_Registry::instance()->NET_CFG->core->site_license_key; |
|
| 424 | + EE_Registry::instance()->CFG->organization->name = isset($this->_req_data['organization_name']) ? sanitize_text_field($this->_req_data['organization_name']) : EE_Registry::instance()->CFG->organization->name; |
|
| 425 | + EE_Registry::instance()->CFG->organization->address_1 = isset($this->_req_data['organization_address_1']) ? sanitize_text_field($this->_req_data['organization_address_1']) : EE_Registry::instance()->CFG->organization->address_1; |
|
| 426 | + EE_Registry::instance()->CFG->organization->address_2 = isset($this->_req_data['organization_address_2']) ? sanitize_text_field($this->_req_data['organization_address_2']) : EE_Registry::instance()->CFG->organization->address_2; |
|
| 427 | + EE_Registry::instance()->CFG->organization->city = isset($this->_req_data['organization_city']) ? sanitize_text_field($this->_req_data['organization_city']) : EE_Registry::instance()->CFG->organization->city; |
|
| 428 | + EE_Registry::instance()->CFG->organization->STA_ID = isset($this->_req_data['organization_state']) ? absint($this->_req_data['organization_state']) : EE_Registry::instance()->CFG->organization->STA_ID; |
|
| 429 | + EE_Registry::instance()->CFG->organization->CNT_ISO = isset($this->_req_data['organization_country']) ? sanitize_text_field($this->_req_data['organization_country']) : EE_Registry::instance()->CFG->organization->CNT_ISO; |
|
| 430 | + EE_Registry::instance()->CFG->organization->zip = isset($this->_req_data['organization_zip']) ? sanitize_text_field($this->_req_data['organization_zip']) : EE_Registry::instance()->CFG->organization->zip; |
|
| 431 | + EE_Registry::instance()->CFG->organization->email = isset($this->_req_data['organization_email']) ? sanitize_email($this->_req_data['organization_email']) : EE_Registry::instance()->CFG->organization->email; |
|
| 432 | + EE_Registry::instance()->CFG->organization->vat = isset($this->_req_data['organization_vat']) ? sanitize_text_field($this->_req_data['organization_vat']) : EE_Registry::instance()->CFG->organization->vat; |
|
| 433 | + EE_Registry::instance()->CFG->organization->phone = isset($this->_req_data['organization_phone']) ? sanitize_text_field($this->_req_data['organization_phone']) : EE_Registry::instance()->CFG->organization->phone; |
|
| 434 | + EE_Registry::instance()->CFG->organization->logo_url = isset($this->_req_data['organization_logo_url']) ? esc_url_raw($this->_req_data['organization_logo_url']) : EE_Registry::instance()->CFG->organization->logo_url; |
|
| 435 | + EE_Registry::instance()->CFG->organization->facebook = isset($this->_req_data['organization_facebook']) ? esc_url_raw($this->_req_data['organization_facebook']) : EE_Registry::instance()->CFG->organization->facebook; |
|
| 436 | + EE_Registry::instance()->CFG->organization->twitter = isset($this->_req_data['organization_twitter']) ? esc_url_raw($this->_req_data['organization_twitter']) : EE_Registry::instance()->CFG->organization->twitter; |
|
| 437 | + EE_Registry::instance()->CFG->organization->linkedin = isset($this->_req_data['organization_linkedin']) ? esc_url_raw($this->_req_data['organization_linkedin']) : EE_Registry::instance()->CFG->organization->linkedin; |
|
| 438 | + EE_Registry::instance()->CFG->organization->pinterest = isset($this->_req_data['organization_pinterest']) ? esc_url_raw($this->_req_data['organization_pinterest']) : EE_Registry::instance()->CFG->organization->pinterest; |
|
| 439 | + EE_Registry::instance()->CFG->organization->google = isset($this->_req_data['organization_google']) ? esc_url_raw($this->_req_data['organization_google']) : EE_Registry::instance()->CFG->organization->google; |
|
| 440 | + EE_Registry::instance()->CFG->organization->instagram = isset($this->_req_data['organization_instagram']) ? esc_url_raw($this->_req_data['organization_instagram']) : EE_Registry::instance()->CFG->organization->instagram; |
|
| 441 | + EE_Registry::instance()->CFG->core->ee_ueip_optin = isset($this->_req_data['ueip_optin']) && ! empty($this->_req_data['ueip_optin']) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin; |
|
| 442 | + |
|
| 443 | + EE_Registry::instance()->CFG->currency = new EE_Currency_Config(EE_Registry::instance()->CFG->organization->CNT_ISO); |
|
| 444 | + |
|
| 445 | + EE_Registry::instance()->CFG = apply_filters('FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG', EE_Registry::instance()->CFG); |
|
| 446 | 446 | |
| 447 | 447 | $what = 'Your Organization Settings'; |
| 448 | - $success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 448 | + $success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__); |
|
| 449 | 449 | |
| 450 | - $this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default' ) ); |
|
| 450 | + $this->_redirect_after_action($success, $what, 'updated', array('action' => 'default')); |
|
| 451 | 451 | |
| 452 | 452 | } |
| 453 | 453 | |
@@ -458,36 +458,36 @@ discard block |
||
| 458 | 458 | protected function _admin_option_settings() { |
| 459 | 459 | |
| 460 | 460 | $this->_template_args['values'] = $this->_yes_no_values; |
| 461 | - $this->_template_args['use_personnel_manager'] = isset( EE_Registry::instance()->CFG->admin->use_personnel_manager ) ? absint( EE_Registry::instance()->CFG->admin->use_personnel_manager ) : FALSE; |
|
| 462 | - $this->_template_args['use_dashboard_widget'] = isset( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) ? absint( EE_Registry::instance()->CFG->admin->use_dashboard_widget ) : TRUE; |
|
| 463 | - $this->_template_args['events_in_dashboard'] = isset( EE_Registry::instance()->CFG->admin->events_in_dashboard ) ? absint( EE_Registry::instance()->CFG->admin->events_in_dashboard ) : 30; |
|
| 464 | - $this->_template_args['use_event_timezones'] = isset( EE_Registry::instance()->CFG->admin->use_event_timezones ) ? absint( EE_Registry::instance()->CFG->admin->use_event_timezones ) : FALSE; |
|
| 465 | - $this->_template_args['show_reg_footer'] = isset( EE_Registry::instance()->CFG->admin->show_reg_footer ) ? absint( EE_Registry::instance()->CFG->admin->show_reg_footer ) : TRUE; |
|
| 466 | - $this->_template_args['affiliate_id'] = isset( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : ''; |
|
| 467 | - $this->_template_args['help_tour_activation'] = isset( EE_Registry::instance()->CFG->admin->help_tour_activation ) ? absint( EE_Registry::instance()->CFG->admin->help_tour_activation ): 1; |
|
| 468 | - |
|
| 469 | - $this->_set_add_edit_form_tags( 'update_admin_option_settings' ); |
|
| 470 | - $this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
|
| 461 | + $this->_template_args['use_personnel_manager'] = isset(EE_Registry::instance()->CFG->admin->use_personnel_manager) ? absint(EE_Registry::instance()->CFG->admin->use_personnel_manager) : FALSE; |
|
| 462 | + $this->_template_args['use_dashboard_widget'] = isset(EE_Registry::instance()->CFG->admin->use_dashboard_widget) ? absint(EE_Registry::instance()->CFG->admin->use_dashboard_widget) : TRUE; |
|
| 463 | + $this->_template_args['events_in_dashboard'] = isset(EE_Registry::instance()->CFG->admin->events_in_dashboard) ? absint(EE_Registry::instance()->CFG->admin->events_in_dashboard) : 30; |
|
| 464 | + $this->_template_args['use_event_timezones'] = isset(EE_Registry::instance()->CFG->admin->use_event_timezones) ? absint(EE_Registry::instance()->CFG->admin->use_event_timezones) : FALSE; |
|
| 465 | + $this->_template_args['show_reg_footer'] = isset(EE_Registry::instance()->CFG->admin->show_reg_footer) ? absint(EE_Registry::instance()->CFG->admin->show_reg_footer) : TRUE; |
|
| 466 | + $this->_template_args['affiliate_id'] = isset(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->get_pretty('affiliate_id') : ''; |
|
| 467 | + $this->_template_args['help_tour_activation'] = isset(EE_Registry::instance()->CFG->admin->help_tour_activation) ? absint(EE_Registry::instance()->CFG->admin->help_tour_activation) : 1; |
|
| 468 | + |
|
| 469 | + $this->_set_add_edit_form_tags('update_admin_option_settings'); |
|
| 470 | + $this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE); |
|
| 471 | 471 | $this->_template_args['template_args'] = $this->_template_args; |
| 472 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'admin_option_settings.template.php', $this->_template_args, TRUE ); |
|
| 472 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'admin_option_settings.template.php', $this->_template_args, TRUE); |
|
| 473 | 473 | $this->display_admin_page_with_sidebar(); |
| 474 | 474 | } |
| 475 | 475 | |
| 476 | 476 | protected function _update_admin_option_settings() { |
| 477 | - EE_Registry::instance()->CFG->admin->use_personnel_manager = isset( $this->_req_data['use_personnel_manager'] ) ? absint( $this->_req_data['use_personnel_manager'] ) : EE_Registry::instance()->CFG->admin->use_personnel_manager; |
|
| 478 | - EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset( $this->_req_data['use_dashboard_widget'] ) ? absint( $this->_req_data['use_dashboard_widget'] ) : EE_Registry::instance()->CFG->admin->use_dashboard_widget; |
|
| 479 | - EE_Registry::instance()->CFG->admin->events_in_dashboard = isset( $this->_req_data['events_in_dashboard'] ) ? absint( $this->_req_data['events_in_dashboard'] ) : EE_Registry::instance()->CFG->admin->events_in_dashboard; |
|
| 480 | - EE_Registry::instance()->CFG->admin->use_event_timezones = isset( $this->_req_data['use_event_timezones'] ) ? absint( $this->_req_data['use_event_timezones'] ) : EE_Registry::instance()->CFG->admin->use_event_timezones; |
|
| 481 | - EE_Registry::instance()->CFG->admin->show_reg_footer = isset( $this->_req_data['show_reg_footer'] ) ? absint( $this->_req_data['show_reg_footer'] ) : EE_Registry::instance()->CFG->admin->show_reg_footer; |
|
| 482 | - EE_Registry::instance()->CFG->admin->affiliate_id = isset( $this->_req_data['affiliate_id'] ) ? sanitize_text_field( $this->_req_data['affiliate_id'] ) : EE_Registry::instance()->CFG->admin->affiliate_id; |
|
| 483 | - EE_Registry::instance()->CFG->admin->help_tour_activation = isset( $this->_req_data['help_tour_activation'] ) ? absint( $this->_req_data['help_tour_activation'] ) : EE_Registry::instance()->CFG->admin->help_tour_activation; |
|
| 477 | + EE_Registry::instance()->CFG->admin->use_personnel_manager = isset($this->_req_data['use_personnel_manager']) ? absint($this->_req_data['use_personnel_manager']) : EE_Registry::instance()->CFG->admin->use_personnel_manager; |
|
| 478 | + EE_Registry::instance()->CFG->admin->use_dashboard_widget = isset($this->_req_data['use_dashboard_widget']) ? absint($this->_req_data['use_dashboard_widget']) : EE_Registry::instance()->CFG->admin->use_dashboard_widget; |
|
| 479 | + EE_Registry::instance()->CFG->admin->events_in_dashboard = isset($this->_req_data['events_in_dashboard']) ? absint($this->_req_data['events_in_dashboard']) : EE_Registry::instance()->CFG->admin->events_in_dashboard; |
|
| 480 | + EE_Registry::instance()->CFG->admin->use_event_timezones = isset($this->_req_data['use_event_timezones']) ? absint($this->_req_data['use_event_timezones']) : EE_Registry::instance()->CFG->admin->use_event_timezones; |
|
| 481 | + EE_Registry::instance()->CFG->admin->show_reg_footer = isset($this->_req_data['show_reg_footer']) ? absint($this->_req_data['show_reg_footer']) : EE_Registry::instance()->CFG->admin->show_reg_footer; |
|
| 482 | + EE_Registry::instance()->CFG->admin->affiliate_id = isset($this->_req_data['affiliate_id']) ? sanitize_text_field($this->_req_data['affiliate_id']) : EE_Registry::instance()->CFG->admin->affiliate_id; |
|
| 483 | + EE_Registry::instance()->CFG->admin->help_tour_activation = isset($this->_req_data['help_tour_activation']) ? absint($this->_req_data['help_tour_activation']) : EE_Registry::instance()->CFG->admin->help_tour_activation; |
|
| 484 | 484 | |
| 485 | - EE_Registry::instance()->CFG->admin = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin ); |
|
| 485 | + EE_Registry::instance()->CFG->admin = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', EE_Registry::instance()->CFG->admin); |
|
| 486 | 486 | |
| 487 | 487 | $what = 'Admin Options'; |
| 488 | - $success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 489 | - $success = apply_filters( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success ); |
|
| 490 | - $this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'admin_option_settings' ) ); |
|
| 488 | + $success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->admin, __FILE__, __FUNCTION__, __LINE__); |
|
| 489 | + $success = apply_filters('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', $success); |
|
| 490 | + $this->_redirect_after_action($success, $what, 'updated', array('action' => 'admin_option_settings')); |
|
| 491 | 491 | |
| 492 | 492 | } |
| 493 | 493 | |
@@ -500,21 +500,21 @@ discard block |
||
| 500 | 500 | |
| 501 | 501 | protected function _country_settings() { |
| 502 | 502 | |
| 503 | - $CNT_ISO = isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US'; |
|
| 504 | - $CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO; |
|
| 503 | + $CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US'; |
|
| 504 | + $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO; |
|
| 505 | 505 | |
| 506 | 506 | //load field generator helper |
| 507 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
| 507 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
| 508 | 508 | |
| 509 | 509 | $this->_template_args['values'] = $this->_yes_no_values; |
| 510 | 510 | |
| 511 | 511 | $this->_template_args['countries'] = new EE_Question_Form_Input( |
| 512 | - EE_Question::new_instance ( array( |
|
| 512 | + EE_Question::new_instance(array( |
|
| 513 | 513 | 'QST_ID'=> 0, |
| 514 | 514 | 'QST_display_text'=> __('Select Country', 'event_espresso'), |
| 515 | 515 | 'QST_system'=>'admin-country' |
| 516 | 516 | )), |
| 517 | - EE_Answer::new_instance ( array( |
|
| 517 | + EE_Answer::new_instance(array( |
|
| 518 | 518 | 'ANS_ID' => 0, |
| 519 | 519 | 'ANS_value' => $CNT_ISO |
| 520 | 520 | )), |
@@ -527,14 +527,14 @@ discard block |
||
| 527 | 527 | ); |
| 528 | 528 | // EEH_Debug_Tools::printr( $this->_template_args['countries'], 'countries <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 529 | 529 | |
| 530 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 ); |
|
| 531 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 ); |
|
| 530 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2); |
|
| 531 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2); |
|
| 532 | 532 | $this->_template_args['country_details_settings'] = $this->display_country_settings(); |
| 533 | 533 | $this->_template_args['country_states_settings'] = $this->display_country_states(); |
| 534 | 534 | |
| 535 | - $this->_set_add_edit_form_tags( 'update_country_settings' ); |
|
| 536 | - $this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
|
| 537 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php', $this->_template_args, TRUE ); |
|
| 535 | + $this->_set_add_edit_form_tags('update_country_settings'); |
|
| 536 | + $this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE); |
|
| 537 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'countries_settings.template.php', $this->_template_args, TRUE); |
|
| 538 | 538 | $this->display_admin_page_with_no_sidebar(); |
| 539 | 539 | } |
| 540 | 540 | |
@@ -547,44 +547,44 @@ discard block |
||
| 547 | 547 | * @param string $CNT_ISO |
| 548 | 548 | * @return mixed string | array |
| 549 | 549 | */ |
| 550 | - public function display_country_settings( $CNT_ISO = '' ) { |
|
| 550 | + public function display_country_settings($CNT_ISO = '') { |
|
| 551 | 551 | |
| 552 | - $CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : $CNT_ISO; |
|
| 553 | - if ( ! $CNT_ISO ) { |
|
| 552 | + $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO; |
|
| 553 | + if ( ! $CNT_ISO) { |
|
| 554 | 554 | return ''; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | // for ajax |
| 558 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
| 559 | - remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' ); |
|
| 560 | - remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' ); |
|
| 561 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'country_form_field_label_wrap' ), 10, 2 ); |
|
| 562 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'country_form_field_input__wrap' ), 10, 2 ); |
|
| 563 | - $country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO ); |
|
| 558 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
| 559 | + remove_all_filters('FHEE__EEH_Form_Fields__label_html'); |
|
| 560 | + remove_all_filters('FHEE__EEH_Form_Fields__input_html'); |
|
| 561 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2); |
|
| 562 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2); |
|
| 563 | + $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO); |
|
| 564 | 564 | //EEH_Debug_Tools::printr( $country, '$country <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 565 | 565 | $country_input_types = array( |
| 566 | - 'CNT_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE ), |
|
| 567 | - 'CNT_ISO' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ), |
|
| 568 | - 'CNT_ISO3' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ), |
|
| 569 | - 'RGN_ID' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ), |
|
| 570 | - 'CNT_name' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'regular-text' ), |
|
| 571 | - 'CNT_cur_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ), |
|
| 572 | - 'CNT_cur_single' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ), |
|
| 573 | - 'CNT_cur_plural' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'medium-text' ), |
|
| 574 | - 'CNT_cur_sign' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text', 'htmlentities' => FALSE ), |
|
| 575 | - 'CNT_cur_sign_b4' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE ), |
|
| 576 | - 'CNT_cur_dec_plc' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => 0, 'text' => '' ), array( 'id' => 1, 'text' => '' ), array( 'id' => 2, 'text' => '' ), array( 'id' => 3, 'text' => '' ))), |
|
| 577 | - 'CNT_cur_dec_mrk' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ), |
|
| 578 | - 'CNT_cur_thsnds' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => array( array( 'id' => ',', 'text' => __(', (comma)', 'event_espresso')), array( 'id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE ), |
|
| 579 | - 'CNT_tel_code' => array( 'type' => 'TEXT', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => 'small-text' ), |
|
| 580 | - 'CNT_is_EU' => array( 'type' => 'RADIO_BTN', 'input_name' => 'cntry[' . $CNT_ISO . ']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE ) |
|
| 566 | + 'CNT_active' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE), |
|
| 567 | + 'CNT_ISO' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'), |
|
| 568 | + 'CNT_ISO3' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'), |
|
| 569 | + 'RGN_ID' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'), |
|
| 570 | + 'CNT_name' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'regular-text'), |
|
| 571 | + 'CNT_cur_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'), |
|
| 572 | + 'CNT_cur_single' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'), |
|
| 573 | + 'CNT_cur_plural' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'medium-text'), |
|
| 574 | + 'CNT_cur_sign' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text', 'htmlentities' => FALSE), |
|
| 575 | + 'CNT_cur_sign_b4' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE), |
|
| 576 | + 'CNT_cur_dec_plc' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => 0, 'text' => ''), array('id' => 1, 'text' => ''), array('id' => 2, 'text' => ''), array('id' => 3, 'text' => ''))), |
|
| 577 | + 'CNT_cur_dec_mrk' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE), |
|
| 578 | + 'CNT_cur_thsnds' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => array(array('id' => ',', 'text' => __(', (comma)', 'event_espresso')), array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))), 'use_desc_4_label' => TRUE), |
|
| 579 | + 'CNT_tel_code' => array('type' => 'TEXT', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => 'small-text'), |
|
| 580 | + 'CNT_is_EU' => array('type' => 'RADIO_BTN', 'input_name' => 'cntry['.$CNT_ISO.']', 'class' => '', 'options' => $this->_yes_no_values, 'use_desc_4_label' => TRUE) |
|
| 581 | 581 | ); |
| 582 | - $this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $country, $country_input_types ); |
|
| 583 | - $country_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php', $this->_template_args, TRUE ); |
|
| 582 | + $this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($country, $country_input_types); |
|
| 583 | + $country_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'country_details_settings.template.php', $this->_template_args, TRUE); |
|
| 584 | 584 | |
| 585 | - if ( defined( 'DOING_AJAX' )) { |
|
| 586 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
| 587 | - echo json_encode( array( 'return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] )); |
|
| 585 | + if (defined('DOING_AJAX')) { |
|
| 586 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
| 587 | + echo json_encode(array('return_data' => $country_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'])); |
|
| 588 | 588 | die(); |
| 589 | 589 | } else { |
| 590 | 590 | return $country_details_settings; |
@@ -602,50 +602,50 @@ discard block |
||
| 602 | 602 | * @param string $CNT_ISO |
| 603 | 603 | * @return string |
| 604 | 604 | */ |
| 605 | - public function display_country_states( $CNT_ISO = '' ) { |
|
| 605 | + public function display_country_states($CNT_ISO = '') { |
|
| 606 | 606 | |
| 607 | - $CNT_ISO = isset( $this->_req_data['country'] ) ? sanitize_text_field( $this->_req_data['country'] ) : $CNT_ISO; |
|
| 607 | + $CNT_ISO = isset($this->_req_data['country']) ? sanitize_text_field($this->_req_data['country']) : $CNT_ISO; |
|
| 608 | 608 | |
| 609 | - if ( ! $CNT_ISO ) { |
|
| 609 | + if ( ! $CNT_ISO) { |
|
| 610 | 610 | return ''; |
| 611 | 611 | } |
| 612 | 612 | // for ajax |
| 613 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
| 614 | - remove_all_filters( 'FHEE__EEH_Form_Fields__label_html' ); |
|
| 615 | - remove_all_filters( 'FHEE__EEH_Form_Fields__input_html' ); |
|
| 616 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $this, 'state_form_field_label_wrap' ), 10, 2 ); |
|
| 617 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $this, 'state_form_field_input__wrap' ), 10, 2 ); |
|
| 618 | - $states = EEM_State::instance()->get_all_states_for_these_countries( array( $CNT_ISO => $CNT_ISO )); |
|
| 613 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
| 614 | + remove_all_filters('FHEE__EEH_Form_Fields__label_html'); |
|
| 615 | + remove_all_filters('FHEE__EEH_Form_Fields__input_html'); |
|
| 616 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'state_form_field_label_wrap'), 10, 2); |
|
| 617 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'state_form_field_input__wrap'), 10, 2); |
|
| 618 | + $states = EEM_State::instance()->get_all_states_for_these_countries(array($CNT_ISO => $CNT_ISO)); |
|
| 619 | 619 | |
| 620 | 620 | // echo '<h4>$CNT_ISO : ' . $CNT_ISO . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>'; |
| 621 | 621 | // global $wpdb; |
| 622 | 622 | // echo '<h4>' . $wpdb->last_query . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>'; |
| 623 | 623 | // EEH_Debug_Tools::printr( $states, '$states <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 624 | - if ( $states ) { |
|
| 625 | - foreach ( $states as $STA_ID => $state ) { |
|
| 626 | - if ( $state instanceof EE_State ) { |
|
| 624 | + if ($states) { |
|
| 625 | + foreach ($states as $STA_ID => $state) { |
|
| 626 | + if ($state instanceof EE_State) { |
|
| 627 | 627 | //STA_abbrev STA_name STA_active |
| 628 | 628 | $state_input_types = array( |
| 629 | - 'STA_abbrev' => array( 'type' => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'mid-text' ), |
|
| 630 | - 'STA_name' => array( 'type' => 'TEXT', 'input_name' => 'states[' . $STA_ID . ']', 'class' => 'regular-text' ), |
|
| 631 | - 'STA_active' => array( 'type' => 'RADIO_BTN', 'input_name' => 'states[' . $STA_ID . ']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true ) |
|
| 629 | + 'STA_abbrev' => array('type' => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'mid-text'), |
|
| 630 | + 'STA_name' => array('type' => 'TEXT', 'input_name' => 'states['.$STA_ID.']', 'class' => 'regular-text'), |
|
| 631 | + 'STA_active' => array('type' => 'RADIO_BTN', 'input_name' => 'states['.$STA_ID.']', 'options' => $this->_yes_no_values, 'use_desc_4_label' => true) |
|
| 632 | 632 | ); |
| 633 | - $this->_template_args[ 'states' ][ $STA_ID ][ 'inputs' ] = EE_Question_Form_Input::generate_question_form_inputs_for_object( $state, $state_input_types ); |
|
| 634 | - $query_args = array( 'action' => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev() ); |
|
| 635 | - $this->_template_args[ 'states' ][ $STA_ID ][ 'delete_state_url' ] = EE_Admin_Page::add_query_args_and_nonce( $query_args, GEN_SET_ADMIN_URL ); |
|
| 633 | + $this->_template_args['states'][$STA_ID]['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($state, $state_input_types); |
|
| 634 | + $query_args = array('action' => 'delete_state', 'STA_ID' => $STA_ID, 'CNT_ISO' => $CNT_ISO, 'STA_abbrev' => $state->abbrev()); |
|
| 635 | + $this->_template_args['states'][$STA_ID]['delete_state_url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, GEN_SET_ADMIN_URL); |
|
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | } else { |
| 639 | 639 | $this->_template_args['states'] = FALSE; |
| 640 | 640 | } |
| 641 | 641 | // EEH_Debug_Tools::printr( $this->_template_args['states'], 'states <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 642 | - $this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'add_new_state' ), GEN_SET_ADMIN_URL ); |
|
| 642 | + $this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'add_new_state'), GEN_SET_ADMIN_URL); |
|
| 643 | 643 | |
| 644 | - $state_details_settings = EEH_Template::display_template( GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php', $this->_template_args, TRUE ); |
|
| 644 | + $state_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH.'state_details_settings.template.php', $this->_template_args, TRUE); |
|
| 645 | 645 | |
| 646 | - if ( defined( 'DOING_AJAX' )) { |
|
| 647 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
| 648 | - echo json_encode( array( 'return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'] )); |
|
| 646 | + if (defined('DOING_AJAX')) { |
|
| 647 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
| 648 | + echo json_encode(array('return_data' => $state_details_settings, 'success' => $notices['success'], 'errors' => $notices['errors'])); |
|
| 649 | 649 | die(); |
| 650 | 650 | } else { |
| 651 | 651 | return $state_details_settings; |
@@ -666,40 +666,39 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | $success = TRUE; |
| 668 | 668 | |
| 669 | - $CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE; |
|
| 670 | - if ( ! $CNT_ISO ) { |
|
| 671 | - EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 669 | + $CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE; |
|
| 670 | + if ( ! $CNT_ISO) { |
|
| 671 | + EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 672 | 672 | $success = FALSE; |
| 673 | 673 | } |
| 674 | - $STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE; |
|
| 675 | - if ( ! $STA_abbrev ) { |
|
| 676 | - EE_Error::add_error( __( 'No State ISO code or an invalid State ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 674 | + $STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE; |
|
| 675 | + if ( ! $STA_abbrev) { |
|
| 676 | + EE_Error::add_error(__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 677 | 677 | $success = FALSE; |
| 678 | 678 | } |
| 679 | - $STA_name = isset( $this->_req_data['STA_name'] ) ? sanitize_text_field( $this->_req_data['STA_name'] ) : |
|
| 680 | - FALSE; |
|
| 681 | - if ( ! $STA_name ) { |
|
| 682 | - EE_Error::add_error( __( 'No State name or an invalid State name was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 679 | + $STA_name = isset($this->_req_data['STA_name']) ? sanitize_text_field($this->_req_data['STA_name']) : FALSE; |
|
| 680 | + if ( ! $STA_name) { |
|
| 681 | + EE_Error::add_error(__('No State name or an invalid State name was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 683 | 682 | $success = FALSE; |
| 684 | 683 | } |
| 685 | 684 | |
| 686 | - if ( $success ) { |
|
| 685 | + if ($success) { |
|
| 687 | 686 | $cols_n_values = array( |
| 688 | 687 | 'CNT_ISO' => $CNT_ISO, |
| 689 | 688 | 'STA_abbrev' => $STA_abbrev, |
| 690 | 689 | 'STA_name' => $STA_name, |
| 691 | 690 | 'STA_active' => TRUE |
| 692 | 691 | ); |
| 693 | - $success = EEM_State::instance()->insert ( $cols_n_values ); |
|
| 694 | - EE_Error::add_success( __( 'The State was added successfully.', 'event_espresso' ) ); |
|
| 692 | + $success = EEM_State::instance()->insert($cols_n_values); |
|
| 693 | + EE_Error::add_success(__('The State was added successfully.', 'event_espresso')); |
|
| 695 | 694 | } |
| 696 | 695 | |
| 697 | - if ( defined( 'DOING_AJAX' )) { |
|
| 698 | - $notices = EE_Error::get_notices( FALSE, FALSE, FALSE ); |
|
| 699 | - echo json_encode( array_merge( $notices, array( 'return_data' => $CNT_ISO ) ) ); |
|
| 696 | + if (defined('DOING_AJAX')) { |
|
| 697 | + $notices = EE_Error::get_notices(FALSE, FALSE, FALSE); |
|
| 698 | + echo json_encode(array_merge($notices, array('return_data' => $CNT_ISO))); |
|
| 700 | 699 | die(); |
| 701 | 700 | } else { |
| 702 | - $this->_redirect_after_action( $success, 'State', 'added', array( 'action' => 'country_settings' ) ); |
|
| 701 | + $this->_redirect_after_action($success, 'State', 'added', array('action' => 'country_settings')); |
|
| 703 | 702 | } |
| 704 | 703 | } |
| 705 | 704 | |
@@ -712,25 +711,25 @@ discard block |
||
| 712 | 711 | * @return boolean | void |
| 713 | 712 | */ |
| 714 | 713 | public function delete_state() { |
| 715 | - $CNT_ISO = isset( $this->_req_data['CNT_ISO'] ) ? strtoupper( sanitize_text_field( $this->_req_data['CNT_ISO'] )) : FALSE; |
|
| 716 | - $STA_ID = isset( $this->_req_data['STA_ID'] ) ? sanitize_text_field( $this->_req_data['STA_ID'] ) : FALSE; |
|
| 717 | - $STA_abbrev = isset( $this->_req_data['STA_abbrev'] ) ? sanitize_text_field( $this->_req_data['STA_abbrev'] ) : FALSE; |
|
| 718 | - if ( ! $STA_ID ) { |
|
| 719 | - EE_Error::add_error( __( 'No State ID or an invalid State ID was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 714 | + $CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : FALSE; |
|
| 715 | + $STA_ID = isset($this->_req_data['STA_ID']) ? sanitize_text_field($this->_req_data['STA_ID']) : FALSE; |
|
| 716 | + $STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : FALSE; |
|
| 717 | + if ( ! $STA_ID) { |
|
| 718 | + EE_Error::add_error(__('No State ID or an invalid State ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 720 | 719 | return FALSE; |
| 721 | 720 | } |
| 722 | - $success = EEM_State::instance()->delete_by_ID( $STA_ID ); |
|
| 723 | - if ( $success !== FALSE ) { |
|
| 724 | - do_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array( 'STA_abbrev' => $STA_abbrev )); |
|
| 725 | - EE_Error::add_success( __( 'The State was deleted successfully.', 'event_espresso' )); |
|
| 721 | + $success = EEM_State::instance()->delete_by_ID($STA_ID); |
|
| 722 | + if ($success !== FALSE) { |
|
| 723 | + do_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID, array('STA_abbrev' => $STA_abbrev)); |
|
| 724 | + EE_Error::add_success(__('The State was deleted successfully.', 'event_espresso')); |
|
| 726 | 725 | } |
| 727 | - if ( defined( 'DOING_AJAX' )) { |
|
| 728 | - $notices = EE_Error::get_notices( FALSE, FALSE ); |
|
| 726 | + if (defined('DOING_AJAX')) { |
|
| 727 | + $notices = EE_Error::get_notices(FALSE, FALSE); |
|
| 729 | 728 | $notices['return_data'] = TRUE; |
| 730 | - echo json_encode( $notices ); |
|
| 729 | + echo json_encode($notices); |
|
| 731 | 730 | die(); |
| 732 | 731 | } else { |
| 733 | - $this->_redirect_after_action( $success, 'State', 'deleted', array( 'action' => 'country_settings' ) ); |
|
| 732 | + $this->_redirect_after_action($success, 'State', 'deleted', array('action' => 'country_settings')); |
|
| 734 | 733 | } |
| 735 | 734 | } |
| 736 | 735 | |
@@ -746,63 +745,63 @@ discard block |
||
| 746 | 745 | protected function _update_country_settings() { |
| 747 | 746 | // EEH_Debug_Tools::printr( $this->_req_data, '$this->_req_data <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 748 | 747 | // grab the country ISO code |
| 749 | - $CNT_ISO = isset( $this->_req_data['country'] ) ? strtoupper( sanitize_text_field( $this->_req_data['country'] )) : FALSE; |
|
| 750 | - if ( ! $CNT_ISO ) { |
|
| 751 | - EE_Error::add_error( __( 'No Country ISO code or an invalid Country ISO code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 748 | + $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : FALSE; |
|
| 749 | + if ( ! $CNT_ISO) { |
|
| 750 | + EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 752 | 751 | return; |
| 753 | 752 | } |
| 754 | 753 | $cols_n_values = array(); |
| 755 | - $cols_n_values['CNT_ISO3'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'] )) : FALSE; |
|
| 756 | - $cols_n_values['RGN_ID'] = isset( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['RGN_ID'] ) : NULL; |
|
| 757 | - $cols_n_values['CNT_name'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_name'] ) : NULL; |
|
| 758 | - $cols_n_values['CNT_cur_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] ) ? strtoupper( sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'] )) : 'USD'; |
|
| 759 | - $cols_n_values['CNT_cur_single'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single'] ) : 'dollar'; |
|
| 760 | - $cols_n_values['CNT_cur_plural'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural'] ) : 'dollars'; |
|
| 761 | - $cols_n_values['CNT_cur_sign'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign'] ) : '$'; |
|
| 762 | - $cols_n_values['CNT_cur_sign_b4'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4'] ) : TRUE; |
|
| 763 | - $cols_n_values['CNT_cur_dec_plc'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc'] ) : 2; |
|
| 764 | - $cols_n_values['CNT_cur_dec_mrk'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk'] ) : '.'; |
|
| 765 | - $cols_n_values['CNT_cur_thsnds'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds'] ) : ','; |
|
| 766 | - $cols_n_values['CNT_tel_code'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) ? sanitize_text_field( $this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code'] ) : NULL; |
|
| 767 | - $cols_n_values['CNT_is_EU'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU'] ) : FALSE; |
|
| 768 | - $cols_n_values['CNT_active'] = isset( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) ? absint( $this->_req_data['cntry'][$CNT_ISO]['CNT_active'] ) : FALSE; |
|
| 754 | + $cols_n_values['CNT_ISO3'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'])) : FALSE; |
|
| 755 | + $cols_n_values['RGN_ID'] = isset($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) ? absint($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) : NULL; |
|
| 756 | + $cols_n_values['CNT_name'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) : NULL; |
|
| 757 | + $cols_n_values['CNT_cur_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'])) : 'USD'; |
|
| 758 | + $cols_n_values['CNT_cur_single'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) : 'dollar'; |
|
| 759 | + $cols_n_values['CNT_cur_plural'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) : 'dollars'; |
|
| 760 | + $cols_n_values['CNT_cur_sign'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) : '$'; |
|
| 761 | + $cols_n_values['CNT_cur_sign_b4'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) : TRUE; |
|
| 762 | + $cols_n_values['CNT_cur_dec_plc'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) : 2; |
|
| 763 | + $cols_n_values['CNT_cur_dec_mrk'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) : '.'; |
|
| 764 | + $cols_n_values['CNT_cur_thsnds'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) : ','; |
|
| 765 | + $cols_n_values['CNT_tel_code'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) : NULL; |
|
| 766 | + $cols_n_values['CNT_is_EU'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) : FALSE; |
|
| 767 | + $cols_n_values['CNT_active'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) : FALSE; |
|
| 769 | 768 | // allow filtering of country data |
| 770 | - $cols_n_values = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values ); |
|
| 769 | + $cols_n_values = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values', $cols_n_values); |
|
| 771 | 770 | //EEH_Debug_Tools::printr( $cols_n_values, '$cols_n_values <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 772 | 771 | // where values |
| 773 | - $where_cols_n_values = array( array( 'CNT_ISO' => $CNT_ISO )); |
|
| 772 | + $where_cols_n_values = array(array('CNT_ISO' => $CNT_ISO)); |
|
| 774 | 773 | // run the update |
| 775 | - $success = EEM_Country::instance()->update( $cols_n_values, $where_cols_n_values ); |
|
| 774 | + $success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values); |
|
| 776 | 775 | // global $wpdb; |
| 777 | 776 | // echo '<h4>' . $wpdb->last_query . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>'; |
| 778 | 777 | // echo '<h4>$success : ' . $success . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>'; |
| 779 | - if ( isset( $this->_req_data['states'] ) && is_array( $this->_req_data['states'] ) && $success !== FALSE ) { |
|
| 778 | + if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== FALSE) { |
|
| 780 | 779 | // allow filtering of states data |
| 781 | - $states = apply_filters( 'FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states'] ); |
|
| 780 | + $states = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__states', $this->_req_data['states']); |
|
| 782 | 781 | // EEH_Debug_Tools::printr( $states, '$states <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 783 | 782 | // loop thru state data ( looks like : states[75][STA_name] ) |
| 784 | - foreach( $states as $STA_ID => $state ) { |
|
| 783 | + foreach ($states as $STA_ID => $state) { |
|
| 785 | 784 | $cols_n_values = array( |
| 786 | 785 | 'CNT_ISO' => $CNT_ISO, |
| 787 | - 'STA_abbrev' => sanitize_text_field( $state['STA_abbrev'] ), |
|
| 788 | - 'STA_name' => sanitize_text_field( $state['STA_name'] ), |
|
| 789 | - 'STA_active' => (bool)absint( $state['STA_active'] ) |
|
| 786 | + 'STA_abbrev' => sanitize_text_field($state['STA_abbrev']), |
|
| 787 | + 'STA_name' => sanitize_text_field($state['STA_name']), |
|
| 788 | + 'STA_active' => (bool) absint($state['STA_active']) |
|
| 790 | 789 | ); |
| 791 | 790 | // where values |
| 792 | - $where_cols_n_values = array( array( 'STA_ID' => $STA_ID )); |
|
| 791 | + $where_cols_n_values = array(array('STA_ID' => $STA_ID)); |
|
| 793 | 792 | // run the update |
| 794 | - $success = EEM_State::instance()->update( $cols_n_values, $where_cols_n_values ); |
|
| 795 | - if ( $success !== FALSE ) { |
|
| 796 | - do_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values ); |
|
| 793 | + $success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values); |
|
| 794 | + if ($success !== FALSE) { |
|
| 795 | + do_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO, $STA_ID, $cols_n_values); |
|
| 797 | 796 | } |
| 798 | 797 | } |
| 799 | 798 | } |
| 800 | 799 | // check if country being edited matches org option country, and if so, then update EE_Config with new settings |
| 801 | - if ( isset( EE_Registry::instance()->CFG->organization->CNT_ISO ) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO ) { |
|
| 802 | - EE_Registry::instance()->CFG->currency = new EE_Currency_Config( $CNT_ISO ); |
|
| 800 | + if (isset(EE_Registry::instance()->CFG->organization->CNT_ISO) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO) { |
|
| 801 | + EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO); |
|
| 803 | 802 | EE_Registry::instance()->CFG->update_espresso_config(); |
| 804 | 803 | } |
| 805 | - $this->_redirect_after_action( $success, 'Countries', 'updated', array( 'action' => 'country_settings', 'country' => $CNT_ISO )); |
|
| 804 | + $this->_redirect_after_action($success, 'Countries', 'updated', array('action' => 'country_settings', 'country' => $CNT_ISO)); |
|
| 806 | 805 | } |
| 807 | 806 | |
| 808 | 807 | |
@@ -816,11 +815,11 @@ discard block |
||
| 816 | 815 | * @param string $label |
| 817 | 816 | * @return string |
| 818 | 817 | */ |
| 819 | - public function country_form_field_label_wrap( $label, $required_text ) { |
|
| 818 | + public function country_form_field_label_wrap($label, $required_text) { |
|
| 820 | 819 | return ' |
| 821 | 820 | <tr> |
| 822 | 821 | <th> |
| 823 | - ' . $label . ' |
|
| 822 | + ' . $label.' |
|
| 824 | 823 | </th>'; |
| 825 | 824 | } |
| 826 | 825 | |
@@ -834,10 +833,10 @@ discard block |
||
| 834 | 833 | * @param string $label |
| 835 | 834 | * @return string |
| 836 | 835 | */ |
| 837 | - public function country_form_field_input__wrap( $input, $label ) { |
|
| 836 | + public function country_form_field_input__wrap($input, $label) { |
|
| 838 | 837 | return ' |
| 839 | 838 | <td class="general-settings-country-input-td"> |
| 840 | - ' . $input . ' |
|
| 839 | + ' . $input.' |
|
| 841 | 840 | </td> |
| 842 | 841 | </tr>'; |
| 843 | 842 | } |
@@ -853,7 +852,7 @@ discard block |
||
| 853 | 852 | * @param string $required_text |
| 854 | 853 | * @return string |
| 855 | 854 | */ |
| 856 | - public function state_form_field_label_wrap( $label, $required_text ) { |
|
| 855 | + public function state_form_field_label_wrap($label, $required_text) { |
|
| 857 | 856 | return $required_text; |
| 858 | 857 | } |
| 859 | 858 | |
@@ -867,10 +866,10 @@ discard block |
||
| 867 | 866 | * @param string $label |
| 868 | 867 | * @return string |
| 869 | 868 | */ |
| 870 | - public function state_form_field_input__wrap( $input, $label ) { |
|
| 869 | + public function state_form_field_input__wrap($input, $label) { |
|
| 871 | 870 | return ' |
| 872 | 871 | <td class="general-settings-country-state-input-td"> |
| 873 | - ' . $input . ' |
|
| 872 | + ' . $input.' |
|
| 874 | 873 | </td>'; |
| 875 | 874 | |
| 876 | 875 | } |
@@ -893,10 +892,10 @@ discard block |
||
| 893 | 892 | * @param int $ee_page_id |
| 894 | 893 | * @return string |
| 895 | 894 | */ |
| 896 | - public static function edit_view_links( $ee_page_id ) { |
|
| 897 | - $links = '<a href="' . add_query_arg( array( 'post' => $ee_page_id, 'action' => 'edit' ), admin_url( 'post.php' )) . '" >' . __('Edit', 'event_espresso') . '</a>'; |
|
| 895 | + public static function edit_view_links($ee_page_id) { |
|
| 896 | + $links = '<a href="'.add_query_arg(array('post' => $ee_page_id, 'action' => 'edit'), admin_url('post.php')).'" >'.__('Edit', 'event_espresso').'</a>'; |
|
| 898 | 897 | $links .= ' | '; |
| 899 | - $links .= '<a href="' . get_permalink( $ee_page_id ) . '" >' . __('View', 'event_espresso') . '</a>'; |
|
| 898 | + $links .= '<a href="'.get_permalink($ee_page_id).'" >'.__('View', 'event_espresso').'</a>'; |
|
| 900 | 899 | return $links; |
| 901 | 900 | } |
| 902 | 901 | |
@@ -909,27 +908,27 @@ discard block |
||
| 909 | 908 | * @param WP page object $ee_page |
| 910 | 909 | * @return string |
| 911 | 910 | */ |
| 912 | - public static function page_and_shortcode_status( $ee_page, $shortcode ) { |
|
| 911 | + public static function page_and_shortcode_status($ee_page, $shortcode) { |
|
| 913 | 912 | |
| 914 | 913 | // page status |
| 915 | - if ( isset( $ee_page->post_status ) && $ee_page->post_status == 'publish') { |
|
| 914 | + if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') { |
|
| 916 | 915 | $pg_colour = 'green'; |
| 917 | - $pg_status = sprintf( __('Page%sStatus%sOK', 'event_espresso'), ' ' , ' ' ); |
|
| 916 | + $pg_status = sprintf(__('Page%sStatus%sOK', 'event_espresso'), ' ', ' '); |
|
| 918 | 917 | } else { |
| 919 | 918 | $pg_colour = 'red'; |
| 920 | - $pg_status = sprintf( __('Page%sVisibility%sProblem', 'event_espresso'), ' ', ' ' ); |
|
| 919 | + $pg_status = sprintf(__('Page%sVisibility%sProblem', 'event_espresso'), ' ', ' '); |
|
| 921 | 920 | } |
| 922 | 921 | |
| 923 | 922 | // shortcode status |
| 924 | - if ( isset( $ee_page->post_content ) && strpos( $ee_page->post_content, $shortcode ) !== FALSE ) { |
|
| 923 | + if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== FALSE) { |
|
| 925 | 924 | $sc_colour = 'green'; |
| 926 | - $sc_status = sprintf( __('Shortcode%sOK', 'event_espresso'), ' ' ); |
|
| 925 | + $sc_status = sprintf(__('Shortcode%sOK', 'event_espresso'), ' '); |
|
| 927 | 926 | } else { |
| 928 | 927 | $sc_colour = 'red'; |
| 929 | - $sc_status = sprintf( __('Shortcode%sProblem', 'event_espresso'), ' ' ); |
|
| 928 | + $sc_status = sprintf(__('Shortcode%sProblem', 'event_espresso'), ' '); |
|
| 930 | 929 | } |
| 931 | 930 | |
| 932 | - return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>' . $pg_status . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>'; |
|
| 931 | + return '<span style="color:'.$pg_colour.'; margin-right:2em;"><strong>'.$pg_status.'</strong></span><span style="color:'.$sc_colour.'"><strong>'.$sc_status.'</strong></span>'; |
|
| 933 | 932 | |
| 934 | 933 | } |
| 935 | 934 | |
@@ -944,20 +943,20 @@ discard block |
||
| 944 | 943 | * @param unknown_type $level |
| 945 | 944 | * @return unknown |
| 946 | 945 | */ |
| 947 | - public static function page_settings_dropdown( $default = 0, $parent = 0, $level = 0 ) { |
|
| 946 | + public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0) { |
|
| 948 | 947 | global $wpdb; |
| 949 | - $items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent) ); |
|
| 948 | + $items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order", $parent)); |
|
| 950 | 949 | |
| 951 | - if ( $items ) { |
|
| 952 | - foreach ( $items as $item ) { |
|
| 953 | - $pad = str_repeat( ' ', $level * 3 ); |
|
| 954 | - if ( $item->ID == $default) |
|
| 950 | + if ($items) { |
|
| 951 | + foreach ($items as $item) { |
|
| 952 | + $pad = str_repeat(' ', $level * 3); |
|
| 953 | + if ($item->ID == $default) |
|
| 955 | 954 | $current = ' selected="selected"'; |
| 956 | 955 | else |
| 957 | 956 | $current = ''; |
| 958 | 957 | |
| 959 | - echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>"; |
|
| 960 | - parent_dropdown( $default, $item->ID, $level +1 ); |
|
| 958 | + echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad ".esc_html($item->post_title)."</option>"; |
|
| 959 | + parent_dropdown($default, $item->ID, $level + 1); |
|
| 961 | 960 | } |
| 962 | 961 | } else { |
| 963 | 962 | return false; |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | <?php _e('As with most open source programs (and closed licensed programs), the possibility exists that you may find the occasional bug or discover that something is not working as expected. Please don\'t panic! We are here to help you.', 'event_espresso'); ?> |
| 10 | 10 | </p> |
| 11 | 11 | <p> |
| 12 | - <?php printf( __('If your problems are not urgent, please post in our %ssupport forums%s. If you need immediate help, please purchase a support token and you\'ll be able to schedule one-on-one time with a member of our team.', 'event_espresso'), '<a href="https://eventespresso.com/support/forums/" target="_blank">', '</a>' ); ?> |
|
| 12 | + <?php printf(__('If your problems are not urgent, please post in our %ssupport forums%s. If you need immediate help, please purchase a support token and you\'ll be able to schedule one-on-one time with a member of our team.', 'event_espresso'), '<a href="https://eventespresso.com/support/forums/" target="_blank">', '</a>'); ?> |
|
| 13 | 13 | </p> |
| 14 | 14 | <p class="ee-attention"> |
| 15 | 15 | <strong class="red_text"> |
@@ -30,6 +30,6 @@ discard block |
||
| 30 | 30 | <?php _e('A support token can be used towards receiving support for a single incident. Support is provided up to 30 minutes via phone call, instant message, or priority email support. Here are examples of how support tokens can be used: how-to questions, best practices questions, technical issues, advising on custom development.', 'event_espresso'); ?> |
| 31 | 31 | </p> |
| 32 | 32 | <p> |
| 33 | - <?php printf( __('You can learn more about support tokens and purchase one by %sclicking here%s.', 'event_espresso'),'<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">','</a>'); ?> |
|
| 33 | + <?php printf(__('You can learn more about support tokens and purchase one by %sclicking here%s.', 'event_espresso'), '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">', '</a>'); ?> |
|
| 34 | 34 | </p> |
| 35 | 35 | </div> |
| 36 | 36 | \ No newline at end of file |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <div class="padding"> |
| 2 | 2 | <p> |
| 3 | - <?php _e('Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.', 'event_espresso'); ?> <?php echo sprintf( __('For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?> |
|
| 3 | + <?php _e('Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.', 'event_espresso'); ?> <?php echo sprintf(__('For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?> |
|
| 4 | 4 | </p> |
| 5 | 5 | <ul> |
| 6 | 6 | <li><strong><?php _e('Show a list of all of your events', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS]</li> |
| 7 | 7 | <li><strong><?php _e('Set a custom title for the event list', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS title="My Super Event List"]</li> |
| 8 | 8 | <li><strong><?php _e('Limit (paginate) the number of events that are shown in the event list on a page or post', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS limit=5]</li> |
| 9 | 9 | <li><strong><?php _e('Add a custom CSS class to each event post/article', 'event_espresso'); ?></strong><br /> [ESPRESSO_EVENTS css_class=my-custom-class]</li> |
| 10 | - <li><strong><?php _e('Filter the event list by month and year', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS month="<?php echo date( 'F Y' ); ?>"]</li> |
|
| 10 | + <li><strong><?php _e('Filter the event list by month and year', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS month="<?php echo date('F Y'); ?>"]</li> |
|
| 11 | 11 | <li><strong><?php _e('Show expired events in the event list', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS show_expired=true]</li> |
| 12 | 12 | <li><strong><?php _e('Sorts the event list in ascending order', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS sort=ASC]</li> |
| 13 | 13 | <li><strong><?php _e('Sorts the event list in descending order', 'event_espresso'); ?></strong><br />[ESPRESSO_EVENTS sort=DESC]</li> |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | * @author Mike Nelson |
| 9 | 9 | * |
| 10 | 10 | */ |
| 11 | -class EEG_Mijireh extends EE_Offsite_Gateway{ |
|
| 11 | +class EEG_Mijireh extends EE_Offsite_Gateway { |
|
| 12 | 12 | |
| 13 | 13 | protected $_access_key; |
| 14 | 14 | |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | $primary_attendee = $primary_registrant->attendee(); |
| 38 | 38 | $items = array(); |
| 39 | 39 | //if we're are charging for the full amount, show the normal line items |
| 40 | - if( $this->_can_easily_itemize_transaction_for( $payment )){ |
|
| 40 | + if ($this->_can_easily_itemize_transaction_for($payment)) { |
|
| 41 | 41 | $total_line_item = $transaction->total_line_item(); |
| 42 | 42 | $tax_total = $total_line_item->get_total_tax(); |
| 43 | - foreach($total_line_item->get_items() as $line_item){ |
|
| 43 | + foreach ($total_line_item->get_items() as $line_item) { |
|
| 44 | 44 | $items[] = array( |
| 45 | 45 | 'name'=>apply_filters( |
| 46 | 46 | 'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name', |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | 'quantity'=>$line_item->quantity() |
| 55 | 55 | ); |
| 56 | 56 | } |
| 57 | - }else{//its a partial payment |
|
| 57 | + } else {//its a partial payment |
|
| 58 | 58 | $tax_total = 0; |
| 59 | 59 | //partial payment, so just add 1 item |
| 60 | 60 | $items[] = array( |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | 'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name', |
| 63 | 63 | sprintf( |
| 64 | 64 | __("Payment of %s for %s", 'event_espresso'), |
| 65 | - $payment->get_pretty( 'PAY_amount', 'no_currency_code' ), |
|
| 65 | + $payment->get_pretty('PAY_amount', 'no_currency_code'), |
|
| 66 | 66 | $primary_registrant->event_name() |
| 67 | 67 | ), |
| 68 | 68 | $payment, |
@@ -76,18 +76,18 @@ discard block |
||
| 76 | 76 | $order = array( |
| 77 | 77 | 'total'=>$this->format_currency($payment->amount()), |
| 78 | 78 | 'return_url'=>$return_url, |
| 79 | - 'items'=>$this->_prepare_for_mijireh( $items ), |
|
| 79 | + 'items'=>$this->_prepare_for_mijireh($items), |
|
| 80 | 80 | 'email'=>$primary_attendee->email(), |
| 81 | 81 | 'first_name'=>$primary_attendee->fname(), |
| 82 | 82 | 'last_name'=>$primary_attendee->lname(), |
| 83 | 83 | 'tax'=>$this->format_currency($tax_total), |
| 84 | 84 | 'partner_id'=>'ee'); |
| 85 | 85 | //setup address? |
| 86 | - if( $primary_attendee->address() && |
|
| 87 | - $primary_attendee->city() && |
|
| 88 | - $primary_attendee->state_ID() && |
|
| 89 | - $primary_attendee->country_ID() && |
|
| 90 | - $primary_attendee->zip() ){ |
|
| 86 | + if ($primary_attendee->address() && |
|
| 87 | + $primary_attendee->city() && |
|
| 88 | + $primary_attendee->state_ID() && |
|
| 89 | + $primary_attendee->country_ID() && |
|
| 90 | + $primary_attendee->zip()) { |
|
| 91 | 91 | $shipping_address = array( |
| 92 | 92 | 'first_name'=>$primary_attendee->fname(), |
| 93 | 93 | 'last_name'=>$primary_attendee->lname(), |
@@ -97,62 +97,62 @@ discard block |
||
| 97 | 97 | 'zip_code' => $primary_attendee->zip(), |
| 98 | 98 | 'country' => $primary_attendee->country_ID() |
| 99 | 99 | ); |
| 100 | - if( $primary_attendee->address2() ){ |
|
| 101 | - $shipping_address[ 'apt_suite' ] = $primary_attendee->address2(); |
|
| 100 | + if ($primary_attendee->address2()) { |
|
| 101 | + $shipping_address['apt_suite'] = $primary_attendee->address2(); |
|
| 102 | 102 | } |
| 103 | - if( $primary_attendee->phone() ){ |
|
| 104 | - $shipping_address[ 'phone' ] = $primary_attendee->phone(); |
|
| 103 | + if ($primary_attendee->phone()) { |
|
| 104 | + $shipping_address['phone'] = $primary_attendee->phone(); |
|
| 105 | 105 | } |
| 106 | - $order[ 'shipping_address' ] = $shipping_address; |
|
| 106 | + $order['shipping_address'] = $shipping_address; |
|
| 107 | 107 | } |
| 108 | - $order = apply_filters( 'FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant ); |
|
| 109 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) ); |
|
| 108 | + $order = apply_filters('FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant); |
|
| 109 | + do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this))); |
|
| 110 | 110 | $args = array( |
| 111 | 111 | 'headers' => array( |
| 112 | - 'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ), |
|
| 112 | + 'Authorization' => 'Basic '.base64_encode($this->_access_key.':'), |
|
| 113 | 113 | 'Accept'=>'application/json' |
| 114 | 114 | ), |
| 115 | 115 | 'body'=> json_encode($order) |
| 116 | 116 | ); |
| 117 | - $response = wp_remote_post( $this->_mijireh_api_orders_url, $args ); |
|
| 117 | + $response = wp_remote_post($this->_mijireh_api_orders_url, $args); |
|
| 118 | 118 | $problems_string = false; |
| 119 | - $this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment); |
|
| 120 | - if( ! $response instanceof WP_Error ){ |
|
| 119 | + $this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment); |
|
| 120 | + if ( ! $response instanceof WP_Error) { |
|
| 121 | 121 | $response_body = json_decode($response['body']); |
| 122 | - if($response_body && isset($response_body->checkout_url)){ |
|
| 122 | + if ($response_body && isset($response_body->checkout_url)) { |
|
| 123 | 123 | $payment->set_redirect_url($response_body->checkout_url); |
| 124 | 124 | $payment->set_txn_id_chq_nmbr($response_body->order_number); |
| 125 | 125 | $payment->set_details($response['body']); |
| 126 | 126 | } else { |
| 127 | - if( is_array( $response_body ) || is_object( $response_body)){ |
|
| 128 | - $response_body_as_array = (array)$response_body; |
|
| 129 | - foreach($response_body_as_array as $problem_parameter => $problems){ |
|
| 130 | - $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems)); |
|
| 127 | + if (is_array($response_body) || is_object($response_body)) { |
|
| 128 | + $response_body_as_array = (array) $response_body; |
|
| 129 | + foreach ($response_body_as_array as $problem_parameter => $problems) { |
|
| 130 | + $problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems)); |
|
| 131 | 131 | } |
| 132 | - }else{ |
|
| 132 | + } else { |
|
| 133 | 133 | $problems_string = $response['body']; |
| 134 | 134 | } |
| 135 | - if( ! $problems_string ) { |
|
| 135 | + if ( ! $problems_string) { |
|
| 136 | 136 | //no message to show? wack |
| 137 | - if( isset( $response[ 'headers' ][ 'status' ] ) ){ |
|
| 138 | - $problems_string = $response[ 'headers' ][ 'status' ]; |
|
| 139 | - }else{ |
|
| 140 | - $problems_string = __( 'No response from Mijireh', 'event_espresso' ); |
|
| 137 | + if (isset($response['headers']['status'])) { |
|
| 138 | + $problems_string = $response['headers']['status']; |
|
| 139 | + } else { |
|
| 140 | + $problems_string = __('No response from Mijireh', 'event_espresso'); |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | - }else{ |
|
| 145 | - $problems_string = implode( ",", $response->get_error_messages() ); |
|
| 144 | + } else { |
|
| 145 | + $problems_string = implode(",", $response->get_error_messages()); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - if( $problems_string ) { |
|
| 149 | - $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) ); |
|
| 150 | - $payment->set_details( $response ); |
|
| 151 | - $payment->set_redirect_url( null ); |
|
| 148 | + if ($problems_string) { |
|
| 149 | + $payment->set_gateway_response(sprintf(__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string)); |
|
| 150 | + $payment->set_details($response); |
|
| 151 | + $payment->set_redirect_url(null); |
|
| 152 | 152 | //even though the payment's status is failed at this point anyways, |
| 153 | 153 | //let's be explicit about it. The fact that the redirect url is null |
| 154 | 154 | //should be enough to client code that they can't redirect the user |
| 155 | - $payment->set_status( $this->_pay_model->failed_status() ); |
|
| 155 | + $payment->set_status($this->_pay_model->failed_status()); |
|
| 156 | 156 | } |
| 157 | 157 | return $payment; |
| 158 | 158 | } |
@@ -165,16 +165,16 @@ discard block |
||
| 165 | 165 | * @param mixed $data |
| 166 | 166 | * @return mixed same type as $data |
| 167 | 167 | */ |
| 168 | - private function _prepare_for_mijireh( $data ){ |
|
| 169 | - if( is_array( $data ) ){ |
|
| 168 | + private function _prepare_for_mijireh($data) { |
|
| 169 | + if (is_array($data)) { |
|
| 170 | 170 | $prepared_data = array(); |
| 171 | - foreach($data as $key => $datum ){ |
|
| 172 | - $prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum ); |
|
| 171 | + foreach ($data as $key => $datum) { |
|
| 172 | + $prepared_data[$key] = $this->_prepare_for_mijireh($datum); |
|
| 173 | 173 | } |
| 174 | 174 | return $prepared_data; |
| 175 | - }elseif(is_string( $data ) ){ |
|
| 176 | - return str_replace( '%', 'percent', $data ); |
|
| 177 | - }else{ |
|
| 175 | + }elseif (is_string($data)) { |
|
| 176 | + return str_replace('%', 'percent', $data); |
|
| 177 | + } else { |
|
| 178 | 178 | return $data; |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -195,30 +195,30 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | $payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL; |
| 197 | 197 | |
| 198 | - if ( ! $payment instanceof EEI_Payment ){ |
|
| 199 | - throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) ); |
|
| 198 | + if ( ! $payment instanceof EEI_Payment) { |
|
| 199 | + throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID())); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | $request_args = array( |
| 203 | 203 | 'headers' => array( |
| 204 | - 'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ), |
|
| 204 | + 'Authorization' => 'Basic '.base64_encode($this->_access_key.':'), |
|
| 205 | 205 | 'Accept'=>'application/json' |
| 206 | 206 | ) |
| 207 | 207 | ); |
| 208 | 208 | |
| 209 | 209 | $response = wp_remote_get( |
| 210 | - $this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(), |
|
| 210 | + $this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(), |
|
| 211 | 211 | $request_args |
| 212 | 212 | ); |
| 213 | 213 | |
| 214 | 214 | $this->log( |
| 215 | - array( 'get payment status request_args' => $request_args, 'response' => $response ), |
|
| 215 | + array('get payment status request_args' => $request_args, 'response' => $response), |
|
| 216 | 216 | $payment |
| 217 | 217 | ); |
| 218 | 218 | // validate response |
| 219 | - $response_body = isset( $response[ 'body' ] ) ? json_decode( $response[ 'body' ] ) : ''; |
|
| 220 | - if( $response && $response_body ){ |
|
| 221 | - switch( $response_body->status ){ |
|
| 219 | + $response_body = isset($response['body']) ? json_decode($response['body']) : ''; |
|
| 220 | + if ($response && $response_body) { |
|
| 221 | + switch ($response_body->status) { |
|
| 222 | 222 | case 'paid': |
| 223 | 223 | $payment->set_status($this->_pay_model->approved_status()); |
| 224 | 224 | break; |
@@ -230,9 +230,9 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | } else { |
| 233 | - $payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) ); |
|
| 234 | - $payment->set_details( $response ); |
|
| 235 | - $payment->set_status( $this->_pay_model->failed_status() ); |
|
| 233 | + $payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso')); |
|
| 234 | + $payment->set_details($response); |
|
| 235 | + $payment->set_status($this->_pay_model->failed_status()); |
|
| 236 | 236 | } |
| 237 | 237 | // the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage |
| 238 | 238 | // $payment->set_status( $this->_pay_model->pending_status() ); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public static function instance() { |
| 80 | 80 | // check if class object is instantiated |
| 81 | - if ( ! self::$_instance instanceof EE_CPT_Strategy ) { |
|
| 81 | + if ( ! self::$_instance instanceof EE_CPT_Strategy) { |
|
| 82 | 82 | self::$_instance = new self(); |
| 83 | 83 | } |
| 84 | 84 | return self::$_instance; |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | // d( $this->_CPT_endpoints ); |
| 102 | 102 | // d( $this->_CPT_taxonomies ); |
| 103 | 103 | |
| 104 | - add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 5 ); |
|
| 104 | + add_action('pre_get_posts', array($this, 'pre_get_posts'), 5); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | private function _set_CPT_endpoints() { |
| 116 | 116 | $_CPT_endpoints = array(); |
| 117 | - if ( is_array( $this->_CPTs )) { |
|
| 118 | - foreach ( $this->_CPTs as $CPT_type => $CPT ) { |
|
| 119 | - $_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type; |
|
| 117 | + if (is_array($this->_CPTs)) { |
|
| 118 | + foreach ($this->_CPTs as $CPT_type => $CPT) { |
|
| 119 | + $_CPT_endpoints [$CPT['plural_slug']] = $CPT_type; |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | return $_CPT_endpoints; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @param WP_Query $WP_Query |
| 132 | 132 | * @return void |
| 133 | 133 | */ |
| 134 | - private function _set_EE_tags_on_WP_Query( WP_Query $WP_Query) { |
|
| 134 | + private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query) { |
|
| 135 | 135 | $WP_Query->is_espresso_event_single = FALSE; |
| 136 | 136 | $WP_Query->is_espresso_event_archive = FALSE; |
| 137 | 137 | $WP_Query->is_espresso_event_taxonomy = FALSE; |
@@ -158,16 +158,16 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | private function _set_CPT_taxonomies() { |
| 160 | 160 | // check if taxonomies have already been set |
| 161 | - if ( empty( $this->_CPT_taxonomies )) { |
|
| 161 | + if (empty($this->_CPT_taxonomies)) { |
|
| 162 | 162 | // and that this CPT has taxonomies registered for it |
| 163 | - if ( isset( $this->CPT['args'] ) && isset( $this->CPT['args']['taxonomies'] )) { |
|
| 163 | + if (isset($this->CPT['args']) && isset($this->CPT['args']['taxonomies'])) { |
|
| 164 | 164 | // if so then grab them, but we want the taxonomy name as the key |
| 165 | - $taxonomies = array_flip( $this->CPT['args']['taxonomies'] ); |
|
| 165 | + $taxonomies = array_flip($this->CPT['args']['taxonomies']); |
|
| 166 | 166 | // then grab the list of ALL taxonomies |
| 167 | 167 | $all_taxonomies = EE_Register_CPTs::get_taxonomies(); |
| 168 | - foreach ( $taxonomies as $taxonomy => $details ) { |
|
| 168 | + foreach ($taxonomies as $taxonomy => $details) { |
|
| 169 | 169 | // add details to our taxonomies if they exist |
| 170 | - $taxonomies[ $taxonomy ] = isset( $all_taxonomies[ $taxonomy ] ) ? $all_taxonomies[ $taxonomy ] : NULL; |
|
| 170 | + $taxonomies[$taxonomy] = isset($all_taxonomies[$taxonomy]) ? $all_taxonomies[$taxonomy] : NULL; |
|
| 171 | 171 | } |
| 172 | 172 | $this->_CPT_taxonomies = $taxonomies; |
| 173 | 173 | } |
@@ -192,11 +192,11 @@ discard block |
||
| 192 | 192 | * @return void |
| 193 | 193 | */ |
| 194 | 194 | private function _set_CPT_terms() { |
| 195 | - if ( empty( $this->_CPT_terms )) { |
|
| 195 | + if (empty($this->_CPT_terms)) { |
|
| 196 | 196 | $terms = EEM_Term::instance()->get_all_CPT_post_tags(); |
| 197 | - foreach ( $terms as $term ) { |
|
| 198 | - if ( $term instanceof EE_Term ) { |
|
| 199 | - $this->_CPT_terms[ $term->slug() ] = $term; |
|
| 197 | + foreach ($terms as $term) { |
|
| 198 | + if ($term instanceof EE_Term) { |
|
| 199 | + $this->_CPT_terms[$term->slug()] = $term; |
|
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -211,24 +211,24 @@ discard block |
||
| 211 | 211 | * @param $WP_Query |
| 212 | 212 | * @return void |
| 213 | 213 | */ |
| 214 | - private function _set_post_type_for_terms( WP_Query $WP_Query ) { |
|
| 214 | + private function _set_post_type_for_terms(WP_Query $WP_Query) { |
|
| 215 | 215 | // is a tag set ? |
| 216 | - if ( isset( $WP_Query->query['tag'] )) { |
|
| 216 | + if (isset($WP_Query->query['tag'])) { |
|
| 217 | 217 | // set post_tags |
| 218 | 218 | $this->_set_CPT_terms(); |
| 219 | 219 | // is this tag archive term in the list of terms used by our CPTs ? |
| 220 | - $term = isset ( $this->_CPT_terms[ $WP_Query->query['tag'] ] ) ? $this->_CPT_terms[ $WP_Query->query['tag'] ] : NULL; |
|
| 220 | + $term = isset ($this->_CPT_terms[$WP_Query->query['tag']]) ? $this->_CPT_terms[$WP_Query->query['tag']] : NULL; |
|
| 221 | 221 | // verify the term |
| 222 | - if ( $term instanceof EE_Term ) { |
|
| 223 | - $term->post_type = array_merge( array( 'post', 'page' ), (array)$term->post_type ); |
|
| 224 | - $term->post_type = apply_filters( 'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term ); |
|
| 222 | + if ($term instanceof EE_Term) { |
|
| 223 | + $term->post_type = array_merge(array('post', 'page'), (array) $term->post_type); |
|
| 224 | + $term->post_type = apply_filters('FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term); |
|
| 225 | 225 | // if a post type is already set |
| 226 | - if ( isset( $WP_Query->query_vars['post_type'] )) { |
|
| 226 | + if (isset($WP_Query->query_vars['post_type'])) { |
|
| 227 | 227 | // add to existing array |
| 228 | - $term->post_type = array_merge ( (array)$WP_Query->query_vars['post_type'], $term->post_type ); |
|
| 228 | + $term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type); |
|
| 229 | 229 | } |
| 230 | 230 | // just set post_type to our CPT |
| 231 | - $WP_Query->set( 'post_type', $term->post_type ); |
|
| 231 | + $WP_Query->set('post_type', $term->post_type); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | } |
@@ -243,17 +243,17 @@ discard block |
||
| 243 | 243 | * in order for is_archive() and is_single() methods to work properly. |
| 244 | 244 | * @return void |
| 245 | 245 | */ |
| 246 | - public function _possibly_set_ee_request_var(){ |
|
| 246 | + public function _possibly_set_ee_request_var() { |
|
| 247 | 247 | // check if ee action var has been set |
| 248 | - if ( ! EE_Registry::instance()->REQ->is_set( 'ee' )) { |
|
| 248 | + if ( ! EE_Registry::instance()->REQ->is_set('ee')) { |
|
| 249 | 249 | // check that route exists for CPT archive slug |
| 250 | - if ( is_archive() && EE_Config::get_route( $this->CPT['plural_slug'] )) { |
|
| 250 | + if (is_archive() && EE_Config::get_route($this->CPT['plural_slug'])) { |
|
| 251 | 251 | // ie: set "ee" to "events" |
| 252 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['plural_slug'] ); |
|
| 252 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['plural_slug']); |
|
| 253 | 253 | // or does it match a single page CPT like /event/ |
| 254 | - } else if ( is_single() && EE_Config::get_route( $this->CPT['singular_slug'] )) { |
|
| 254 | + } else if (is_single() && EE_Config::get_route($this->CPT['singular_slug'])) { |
|
| 255 | 255 | // ie: set "ee" to "event" |
| 256 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] ); |
|
| 256 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']); |
|
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | * @param WP_Query $WP_Query |
| 268 | 268 | * @return void |
| 269 | 269 | */ |
| 270 | - public function _set_paging( $WP_Query ) { |
|
| 271 | - if ( $WP_Query->is_main_query() && apply_filters( 'FHEE__EE_CPT_Strategy___set_paging', TRUE )) { |
|
| 272 | - $page = ( get_query_var('page') ) ? get_query_var('page') : NULL; |
|
| 273 | - $paged = ( get_query_var('paged') ) ? get_query_var('paged') : $page; |
|
| 274 | - $WP_Query->set( 'paged', $paged ); |
|
| 270 | + public function _set_paging($WP_Query) { |
|
| 271 | + if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', TRUE)) { |
|
| 272 | + $page = (get_query_var('page')) ? get_query_var('page') : NULL; |
|
| 273 | + $paged = (get_query_var('paged')) ? get_query_var('paged') : $page; |
|
| 274 | + $WP_Query->set('paged', $paged); |
|
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | |
@@ -288,35 +288,35 @@ discard block |
||
| 288 | 288 | * @param WP_Query $WP_Query |
| 289 | 289 | * @return void |
| 290 | 290 | */ |
| 291 | - public function pre_get_posts( $WP_Query ) { |
|
| 291 | + public function pre_get_posts($WP_Query) { |
|
| 292 | 292 | // check that post-type is set |
| 293 | - if ( ! $WP_Query instanceof WP_Query ) { |
|
| 293 | + if ( ! $WP_Query instanceof WP_Query) { |
|
| 294 | 294 | return; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | // add our conditionals |
| 298 | - $this->_set_EE_tags_on_WP_Query( $WP_Query ); |
|
| 298 | + $this->_set_EE_tags_on_WP_Query($WP_Query); |
|
| 299 | 299 | // check for terms |
| 300 | - $this->_set_post_type_for_terms( $WP_Query ); |
|
| 300 | + $this->_set_post_type_for_terms($WP_Query); |
|
| 301 | 301 | // make sure paging is always set |
| 302 | - $this->_set_paging( $WP_Query ); |
|
| 302 | + $this->_set_paging($WP_Query); |
|
| 303 | 303 | |
| 304 | 304 | // is a taxonomy set ? |
| 305 | - if ( $WP_Query->is_tax ) { |
|
| 305 | + if ($WP_Query->is_tax) { |
|
| 306 | 306 | // loop thru our taxonomies |
| 307 | - foreach ( $this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details ) { |
|
| 307 | + foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) { |
|
| 308 | 308 | // check if one of our taxonomies is set as a query var |
| 309 | - if ( isset( $WP_Query->query[ $CPT_taxonomy ] )) { |
|
| 309 | + if (isset($WP_Query->query[$CPT_taxonomy])) { |
|
| 310 | 310 | // but which CPT does that correspond to??? hmmm... guess we gotta go looping |
| 311 | - foreach ( $this->_CPTs as $post_type => $CPT ) { |
|
| 311 | + foreach ($this->_CPTs as $post_type => $CPT) { |
|
| 312 | 312 | // verify our CPT has args, is public and has taxonomies set |
| 313 | - if ( isset( $CPT['args'] ) && $CPT['args']['public'] && ! empty( $CPT['args']['taxonomies'] )) { |
|
| 313 | + if (isset($CPT['args']) && $CPT['args']['public'] && ! empty($CPT['args']['taxonomies'])) { |
|
| 314 | 314 | // does the captured taxonomy belong to this CPT ? |
| 315 | - if ( in_array( $CPT_taxonomy, $CPT['args']['taxonomies'] )) { |
|
| 315 | + if (in_array($CPT_taxonomy, $CPT['args']['taxonomies'])) { |
|
| 316 | 316 | // if so, then add this CPT post_type to the current query's array of post_types' |
| 317 | - $WP_Query->query_vars['post_type'] = isset( $WP_Query->query_vars['post_type'] ) ? (array)$WP_Query->query_vars['post_type'] : array(); |
|
| 317 | + $WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type']) ? (array) $WP_Query->query_vars['post_type'] : array(); |
|
| 318 | 318 | $WP_Query->query_vars['post_type'][] = $post_type; |
| 319 | - switch( $post_type ) { |
|
| 319 | + switch ($post_type) { |
|
| 320 | 320 | case 'espresso_events' : |
| 321 | 321 | $WP_Query->is_espresso_event_taxonomy = TRUE; |
| 322 | 322 | break; |
@@ -337,24 +337,24 @@ discard block |
||
| 337 | 337 | // d( $CPT_taxonomy ); |
| 338 | 338 | // d( $WP_Query ); |
| 339 | 339 | |
| 340 | - if ( isset( $WP_Query->query_vars['post_type'] )) { |
|
| 340 | + if (isset($WP_Query->query_vars['post_type'])) { |
|
| 341 | 341 | // loop thru post_types as array |
| 342 | - foreach ( (array)$WP_Query->query_vars['post_type'] as $post_type ) { |
|
| 342 | + foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) { |
|
| 343 | 343 | |
| 344 | 344 | // is current query for an EE CPT ? |
| 345 | - if ( isset( $this->_CPTs[ $post_type ] )) { |
|
| 345 | + if (isset($this->_CPTs[$post_type])) { |
|
| 346 | 346 | // is EE on or off ? |
| 347 | - if ( EE_Maintenance_Mode::instance()->level() ) { |
|
| 347 | + if (EE_Maintenance_Mode::instance()->level()) { |
|
| 348 | 348 | // reroute CPT template view to maintenance_mode.template.php |
| 349 | - if( ! has_filter( 'template_include',array( 'EE_Maintenance_Mode', 'template_include' ))){ |
|
| 350 | - add_filter( 'template_include', array( 'EE_Maintenance_Mode', 'template_include' ), 99999 ); |
|
| 349 | + if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) { |
|
| 350 | + add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999); |
|
| 351 | 351 | } |
| 352 | 352 | return; |
| 353 | 353 | } |
| 354 | 354 | // load EE_Request_Handler (this was added as a result of https://events.codebasehq.com/projects/event-espresso/tickets/9037 |
| 355 | - EE_Registry::instance()->load_core( 'Request_Handler' ); |
|
| 355 | + EE_Registry::instance()->load_core('Request_Handler'); |
|
| 356 | 356 | // grab details for the CPT the current query is for |
| 357 | - $this->CPT = $this->_CPTs[ $post_type ]; |
|
| 357 | + $this->CPT = $this->_CPTs[$post_type]; |
|
| 358 | 358 | // set post type |
| 359 | 359 | $this->CPT['post_type'] = $post_type; |
| 360 | 360 | // set taxonomies |
@@ -362,27 +362,27 @@ discard block |
||
| 362 | 362 | // the post or category or term that is triggering EE |
| 363 | 363 | $this->CPT['espresso_page'] = EE_Registry::instance()->REQ->is_espresso_page(); |
| 364 | 364 | // requested post name |
| 365 | - $this->CPT['post_name'] = EE_Registry::instance()->REQ->get( 'post_name' ); |
|
| 365 | + $this->CPT['post_name'] = EE_Registry::instance()->REQ->get('post_name'); |
|
| 366 | 366 | //d( $this->CPT ); |
| 367 | 367 | // add support for viewing 'private', 'draft', or 'pending' posts |
| 368 | - if ( is_user_logged_in() && isset( $WP_Query->query_vars['p'] ) && $WP_Query->query_vars['p'] != 0 && current_user_can( 'edit_post', $WP_Query->query_vars['p'] )) { |
|
| 368 | + if (is_user_logged_in() && isset($WP_Query->query_vars['p']) && $WP_Query->query_vars['p'] != 0 && current_user_can('edit_post', $WP_Query->query_vars['p'])) { |
|
| 369 | 369 | // we can just inject directly into the WP_Query object |
| 370 | - $WP_Query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' ); |
|
| 370 | + $WP_Query->query['post_status'] = array('publish', 'private', 'draft', 'pending'); |
|
| 371 | 371 | // now set the main 'ee' request var so that the appropriate module can load the appropriate template(s) |
| 372 | - EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] ); |
|
| 372 | + EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']); |
|
| 373 | 373 | } |
| 374 | 374 | $this->_possibly_set_ee_request_var(); |
| 375 | 375 | // convert post_type to model name |
| 376 | - $model_name = str_replace( 'EE_', '', $this->CPT['class_name'] ); |
|
| 376 | + $model_name = str_replace('EE_', '', $this->CPT['class_name']); |
|
| 377 | 377 | // get CPT table data via CPT Model |
| 378 | - $this->CPT_model = EE_Registry::instance()->load_model( $model_name ); |
|
| 378 | + $this->CPT_model = EE_Registry::instance()->load_model($model_name); |
|
| 379 | 379 | $this->CPT['tables'] = $this->CPT_model->get_tables(); |
| 380 | 380 | // is there a Meta Table for this CPT? |
| 381 | - $this->CPT['meta_table'] = isset( $this->CPT['tables'][ $model_name . '_Meta' ] ) ? $this->CPT['tables'][ $model_name . '_Meta' ] : FALSE; |
|
| 381 | + $this->CPT['meta_table'] = isset($this->CPT['tables'][$model_name.'_Meta']) ? $this->CPT['tables'][$model_name.'_Meta'] : FALSE; |
|
| 382 | 382 | // creates classname like: CPT_Event_Strategy |
| 383 | - $CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy'; |
|
| 383 | + $CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy'; |
|
| 384 | 384 | // load and instantiate |
| 385 | - $CPT_Strategy = EE_Registry::instance()->load_core ( $CPT_Strategy_class_name, array( 'WP_Query' => $WP_Query, 'CPT' => $this->CPT )); |
|
| 385 | + $CPT_Strategy = EE_Registry::instance()->load_core($CPT_Strategy_class_name, array('WP_Query' => $WP_Query, 'CPT' => $this->CPT)); |
|
| 386 | 386 | |
| 387 | 387 | // !!!!!!!!!! IMPORTANT !!!!!!!!!!!! |
| 388 | 388 | // here's the list of available filters in the WP_Query object |
@@ -394,13 +394,13 @@ discard block |
||
| 394 | 394 | // 'post_limits' |
| 395 | 395 | // 'posts_fields' |
| 396 | 396 | // 'posts_join' |
| 397 | - add_filter( 'posts_fields', array( $this, 'posts_fields' )); |
|
| 398 | - add_filter( 'posts_join', array( $this, 'posts_join' )); |
|
| 399 | - add_filter( 'get_' . $this->CPT['post_type'] . '_metadata', array( $CPT_Strategy, 'get_EE_post_type_metadata' ), 1, 4 ); |
|
| 400 | - add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 1 ); |
|
| 401 | - add_filter( 'get_edit_post_link', array( $this, 'get_edit_post_link' ), 10, 2 ); |
|
| 397 | + add_filter('posts_fields', array($this, 'posts_fields')); |
|
| 398 | + add_filter('posts_join', array($this, 'posts_join')); |
|
| 399 | + add_filter('get_'.$this->CPT['post_type'].'_metadata', array($CPT_Strategy, 'get_EE_post_type_metadata'), 1, 4); |
|
| 400 | + add_filter('the_posts', array($this, 'the_posts'), 1, 1); |
|
| 401 | + add_filter('get_edit_post_link', array($this, 'get_edit_post_link'), 10, 2); |
|
| 402 | 402 | |
| 403 | - $this->_do_template_filters( $WP_Query ); |
|
| 403 | + $this->_do_template_filters($WP_Query); |
|
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | } |
@@ -415,13 +415,13 @@ discard block |
||
| 415 | 415 | * @param $SQL |
| 416 | 416 | * @return string |
| 417 | 417 | */ |
| 418 | - public function posts_fields( $SQL ) { |
|
| 418 | + public function posts_fields($SQL) { |
|
| 419 | 419 | // does this CPT have a meta table ? |
| 420 | - if ( ! empty( $this->CPT['meta_table'] )) { |
|
| 420 | + if ( ! empty($this->CPT['meta_table'])) { |
|
| 421 | 421 | // adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement |
| 422 | - $SQL .= ', ' . $this->CPT['meta_table']->get_table_name() . '.* ' ; |
|
| 422 | + $SQL .= ', '.$this->CPT['meta_table']->get_table_name().'.* '; |
|
| 423 | 423 | } |
| 424 | - remove_filter( 'posts_fields', array( $this, 'posts_fields' )); |
|
| 424 | + remove_filter('posts_fields', array($this, 'posts_fields')); |
|
| 425 | 425 | return $SQL; |
| 426 | 426 | } |
| 427 | 427 | |
@@ -434,14 +434,14 @@ discard block |
||
| 434 | 434 | * @param $SQL |
| 435 | 435 | * @return string |
| 436 | 436 | */ |
| 437 | - public function posts_join( $SQL ) { |
|
| 437 | + public function posts_join($SQL) { |
|
| 438 | 438 | // does this CPT have a meta table ? |
| 439 | - if ( ! empty( $this->CPT['meta_table'] )) { |
|
| 439 | + if ( ! empty($this->CPT['meta_table'])) { |
|
| 440 | 440 | global $wpdb; |
| 441 | 441 | // adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement |
| 442 | - $SQL .= ' LEFT JOIN ' . $this->CPT['meta_table']->get_table_name() . ' ON ( ' . $this->CPT['meta_table']->get_table_name() . '.' . $this->CPT['meta_table']->get_fk_on_table() . ' = ' . $wpdb->posts . '.ID ) '; |
|
| 442 | + $SQL .= ' LEFT JOIN '.$this->CPT['meta_table']->get_table_name().' ON ( '.$this->CPT['meta_table']->get_table_name().'.'.$this->CPT['meta_table']->get_fk_on_table().' = '.$wpdb->posts.'.ID ) '; |
|
| 443 | 443 | } |
| 444 | - remove_filter( 'posts_join', array( $this, 'posts_join' )); |
|
| 444 | + remove_filter('posts_join', array($this, 'posts_join')); |
|
| 445 | 445 | return $SQL; |
| 446 | 446 | } |
| 447 | 447 | |
@@ -454,18 +454,18 @@ discard block |
||
| 454 | 454 | * @param \WP_Post[] $posts |
| 455 | 455 | * @return \WP_Post[] |
| 456 | 456 | */ |
| 457 | - public function the_posts( $posts ) { |
|
| 457 | + public function the_posts($posts) { |
|
| 458 | 458 | // d( $posts ); |
| 459 | 459 | $CPT_class = $this->CPT['class_name']; |
| 460 | 460 | // loop thru posts |
| 461 | - if ( is_array( $posts )) { |
|
| 462 | - foreach( $posts as $key => $post ) { |
|
| 463 | - if ( isset( $this->_CPTs[ $post->post_type ] )) { |
|
| 464 | - $post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object( $post ); |
|
| 461 | + if (is_array($posts)) { |
|
| 462 | + foreach ($posts as $key => $post) { |
|
| 463 | + if (isset($this->_CPTs[$post->post_type])) { |
|
| 464 | + $post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object($post); |
|
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | - remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 ); |
|
| 468 | + remove_filter('the_posts', array($this, 'the_posts'), 1); |
|
| 469 | 469 | return $posts; |
| 470 | 470 | } |
| 471 | 471 | |
@@ -476,17 +476,17 @@ discard block |
||
| 476 | 476 | * @param $ID |
| 477 | 477 | * @return string |
| 478 | 478 | */ |
| 479 | - function get_edit_post_link( $url, $ID ) { |
|
| 479 | + function get_edit_post_link($url, $ID) { |
|
| 480 | 480 | //need to make sure we only edit links if our cpt |
| 481 | 481 | global $post; |
| 482 | - if ( ! isset( $this->_CPTs[ $post->post_type ] )) { |
|
| 482 | + if ( ! isset($this->_CPTs[$post->post_type])) { |
|
| 483 | 483 | return $url; |
| 484 | 484 | } |
| 485 | 485 | //k made it here so all is good. |
| 486 | 486 | $scheme = is_ssl() ? 'https' : 'http'; |
| 487 | - $url = get_admin_url( EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme ); |
|
| 487 | + $url = get_admin_url(EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme); |
|
| 488 | 488 | // http://example.com/wp-admin/admin.php?page=espresso_events&action=edit&post=205&edit_nonce=0d403530d6 |
| 489 | - return wp_nonce_url( add_query_arg( array( 'page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit' ), $url ), 'edit', 'edit_nonce' ); |
|
| 489 | + return wp_nonce_url(add_query_arg(array('page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit'), $url), 'edit', 'edit_nonce'); |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | |
@@ -500,11 +500,11 @@ discard block |
||
| 500 | 500 | * @param WP_Query $WP_Query |
| 501 | 501 | * @return void |
| 502 | 502 | */ |
| 503 | - protected function _do_template_filters( WP_Query $WP_Query ) { |
|
| 503 | + protected function _do_template_filters(WP_Query $WP_Query) { |
|
| 504 | 504 | // if it's the main query and requested cpt supports page_templates, |
| 505 | - if ( $WP_Query->is_main_query() && ! empty( $this->CPT['args']['page_templates'] ) ) { |
|
| 505 | + if ($WP_Query->is_main_query() && ! empty($this->CPT['args']['page_templates'])) { |
|
| 506 | 506 | // then let's hook into the appropriate query_template hook |
| 507 | - add_filter( 'single_template', array( $this, 'single_cpt_template' ) ); |
|
| 507 | + add_filter('single_template', array($this, 'single_cpt_template')); |
|
| 508 | 508 | } |
| 509 | 509 | } |
| 510 | 510 | |
@@ -518,17 +518,17 @@ discard block |
||
| 518 | 518 | * @param string $current_template Existing default template path derived for this page call. |
| 519 | 519 | * @return string the path to the full template file. |
| 520 | 520 | */ |
| 521 | - public function single_cpt_template( $current_template ) { |
|
| 521 | + public function single_cpt_template($current_template) { |
|
| 522 | 522 | $object = get_queried_object(); |
| 523 | 523 | //does this called object HAVE a page template set that is something other than the default. |
| 524 | - $template = get_post_meta( $object->ID, '_wp_page_template', true ); |
|
| 524 | + $template = get_post_meta($object->ID, '_wp_page_template', true); |
|
| 525 | 525 | |
| 526 | 526 | //exit early if default or not set or invalid path (accounts for theme changes) |
| 527 | - if ( $template == 'default' || empty( $template ) || ! is_readable( get_stylesheet_directory() . '/' . $template ) ) { |
|
| 527 | + if ($template == 'default' || empty($template) || ! is_readable(get_stylesheet_directory().'/'.$template)) { |
|
| 528 | 528 | return $current_template; |
| 529 | 529 | } |
| 530 | 530 | //made it here so we SHOULD be able to just locate the template and then return it. |
| 531 | - $template = locate_template( array($template) ); |
|
| 531 | + $template = locate_template(array($template)); |
|
| 532 | 532 | |
| 533 | 533 | return $template; |
| 534 | 534 | } |
@@ -576,9 +576,9 @@ discard block |
||
| 576 | 576 | * @param array $arguments |
| 577 | 577 | * @return \EE_CPT_Default_Strategy |
| 578 | 578 | */ |
| 579 | - public function __construct( $arguments = array() ) { |
|
| 580 | - $this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL; |
|
| 581 | - $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL; |
|
| 579 | + public function __construct($arguments = array()) { |
|
| 580 | + $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL; |
|
| 581 | + $WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL; |
|
| 582 | 582 | //EEH_Debug_Tools::printr( $this->CPT, '$this->CPT <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 583 | 583 | // add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 ); |
| 584 | 584 | // add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 ); |
@@ -593,9 +593,9 @@ discard block |
||
| 593 | 593 | * @param \WP_Query $WP_Query |
| 594 | 594 | * @return \WP_Query |
| 595 | 595 | */ |
| 596 | - public function pre_get_posts( WP_Query $WP_Query ) { |
|
| 596 | + public function pre_get_posts(WP_Query $WP_Query) { |
|
| 597 | 597 | //EEH_Debug_Tools::printr( $WP_Query, '$WP_Query <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
| 598 | - if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) { |
|
| 598 | + if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) { |
|
| 599 | 599 | return $WP_Query; |
| 600 | 600 | } |
| 601 | 601 | // $WP_Query->set( 'post_type', array( $this->CPT['post_type'] )); |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | * @param \WP_Query $WP_Query |
| 614 | 614 | * @return \WP_Post[] |
| 615 | 615 | */ |
| 616 | - public function the_posts( $posts, WP_Query $WP_Query ) { |
|
| 616 | + public function the_posts($posts, WP_Query $WP_Query) { |
|
| 617 | 617 | return $posts; |
| 618 | 618 | } |
| 619 | 619 | |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | * @param string $single |
| 630 | 630 | * @return mixed |
| 631 | 631 | */ |
| 632 | - public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) { |
|
| 632 | + public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) { |
|
| 633 | 633 | return $meta_value; |
| 634 | 634 | } |
| 635 | 635 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param WP $WP |
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | - public abstract function run( WP $WP ); |
|
| 45 | + public abstract function run(WP $WP); |
|
| 46 | 46 | |
| 47 | 47 | |
| 48 | 48 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param array $attributes |
| 55 | 55 | * @return mixed |
| 56 | 56 | */ |
| 57 | - public abstract function process_shortcode( $attributes = array() ); |
|
| 57 | + public abstract function process_shortcode($attributes = array()); |
|
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @param string $shortcode_class |
| 66 | 66 | * @return \EES_Shortcode |
| 67 | 67 | */ |
| 68 | - final public static function instance( $shortcode_class = NULL ) { |
|
| 69 | - $shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class(); |
|
| 70 | - if ( $shortcode_class == 'EES_Shortcode' || empty( $shortcode_class )) { |
|
| 68 | + final public static function instance($shortcode_class = NULL) { |
|
| 69 | + $shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class(); |
|
| 70 | + if ($shortcode_class == 'EES_Shortcode' || empty($shortcode_class)) { |
|
| 71 | 71 | return NULL; |
| 72 | 72 | } |
| 73 | - $shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class )); |
|
| 74 | - $shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL; |
|
| 73 | + $shortcode = str_replace('EES_', '', strtoupper($shortcode_class)); |
|
| 74 | + $shortcode_obj = isset(EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL; |
|
| 75 | 75 | return $shortcode_obj instanceof $shortcode_class || $shortcode_class == 'self' ? $shortcode_obj : new $shortcode_class(); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -86,20 +86,20 @@ discard block |
||
| 86 | 86 | * @param $attributes |
| 87 | 87 | * @return mixed |
| 88 | 88 | */ |
| 89 | - final public static function fallback_shortcode_processor( $attributes ) { |
|
| 89 | + final public static function fallback_shortcode_processor($attributes) { |
|
| 90 | 90 | // what shortcode was actually parsed ? |
| 91 | 91 | $shortcode_class = get_called_class(); |
| 92 | 92 | // notify rest of system that fallback processor was triggered |
| 93 | - add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' ); |
|
| 93 | + add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true'); |
|
| 94 | 94 | // get instance of actual shortcode |
| 95 | - $shortcode_obj = self::instance( $shortcode_class ); |
|
| 95 | + $shortcode_obj = self::instance($shortcode_class); |
|
| 96 | 96 | // verify class |
| 97 | - if ( $shortcode_obj instanceof EES_Shortcode ) { |
|
| 97 | + if ($shortcode_obj instanceof EES_Shortcode) { |
|
| 98 | 98 | global $wp; |
| 99 | - $shortcode_obj->run( $wp ); |
|
| 99 | + $shortcode_obj->run($wp); |
|
| 100 | 100 | // set attributes and run the shortcode |
| 101 | - $shortcode_obj->_attributes = (array)$attributes; |
|
| 102 | - return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes ); |
|
| 101 | + $shortcode_obj->_attributes = (array) $attributes; |
|
| 102 | + return $shortcode_obj->process_shortcode($shortcode_obj->_attributes); |
|
| 103 | 103 | } else { |
| 104 | 104 | return NULL; |
| 105 | 105 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | * @param $attributes |
| 116 | 116 | * @return string |
| 117 | 117 | */ |
| 118 | - final public static function invalid_shortcode_processor( $attributes ) { |
|
| 118 | + final public static function invalid_shortcode_processor($attributes) { |
|
| 119 | 119 | return ''; |
| 120 | 120 | } |
| 121 | 121 | |
@@ -129,11 +129,11 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | final public function __construct() { |
| 131 | 131 | // get classname, remove EES_prefix, and convert to UPPERCASE |
| 132 | - $shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this ))); |
|
| 132 | + $shortcode = strtoupper(str_replace('EES_', '', get_class($this))); |
|
| 133 | 133 | // assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier |
| 134 | - add_shortcode( $shortcode, array( $this, 'process_shortcode' )); |
|
| 134 | + add_shortcode($shortcode, array($this, 'process_shortcode')); |
|
| 135 | 135 | // make sure system knows this is an EE page |
| 136 | - EE_Registry::instance()->REQ->set_espresso_page( TRUE ); |
|
| 136 | + EE_Registry::instance()->REQ->set_espresso_page(TRUE); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public static function instance() { |
| 63 | 63 | // check if class object is instantiated, and instantiated properly |
| 64 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Front_Controller )) { |
|
| 64 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Front_Controller)) { |
|
| 65 | 65 | self::$_instance = new self(); |
| 66 | 66 | } |
| 67 | 67 | return self::$_instance; |
@@ -79,37 +79,37 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | private function __construct() { |
| 81 | 81 | // make sure template tags are loaded immediately so that themes don't break |
| 82 | - add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'load_espresso_template_tags' ), 10 ); |
|
| 82 | + add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10); |
|
| 83 | 83 | // determine how to integrate WP_Query with the EE models |
| 84 | - add_action( 'AHEE__EE_System__initialize', array( $this, 'employ_CPT_Strategy' )); |
|
| 84 | + add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy')); |
|
| 85 | 85 | // load other resources and begin to actually run shortcodes and modules |
| 86 | - add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 5 ); |
|
| 86 | + add_action('wp_loaded', array($this, 'wp_loaded'), 5); |
|
| 87 | 87 | // analyse the incoming WP request |
| 88 | - add_action( 'parse_request', array( $this, 'get_request' ), 1, 1 ); |
|
| 88 | + add_action('parse_request', array($this, 'get_request'), 1, 1); |
|
| 89 | 89 | // process any content shortcodes |
| 90 | - add_action( 'parse_request', array( $this, '_initialize_shortcodes' ), 5 ); |
|
| 90 | + add_action('parse_request', array($this, '_initialize_shortcodes'), 5); |
|
| 91 | 91 | // process request with module factory |
| 92 | - add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 ); |
|
| 92 | + add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1); |
|
| 93 | 93 | // before headers sent |
| 94 | - add_action( 'wp', array( $this, 'wp' ), 5 ); |
|
| 94 | + add_action('wp', array($this, 'wp'), 5); |
|
| 95 | 95 | // load css and js |
| 96 | - add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 1 ); |
|
| 96 | + add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1); |
|
| 97 | 97 | // header |
| 98 | - add_action('wp_head', array( $this, 'header_meta_tag' ), 5 ); |
|
| 99 | - add_filter( 'template_include', array( $this, 'template_include' ), 1 ); |
|
| 98 | + add_action('wp_head', array($this, 'header_meta_tag'), 5); |
|
| 99 | + add_filter('template_include', array($this, 'template_include'), 1); |
|
| 100 | 100 | // display errors |
| 101 | - add_action('loop_start', array( $this, 'display_errors' ), 2 ); |
|
| 101 | + add_action('loop_start', array($this, 'display_errors'), 2); |
|
| 102 | 102 | // the content |
| 103 | - add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 ); |
|
| 103 | + add_filter('the_content', array($this, 'the_content'), 5, 1); |
|
| 104 | 104 | //exclude our private cpt comments |
| 105 | - add_filter( 'comments_clauses', array( $this, 'filter_wp_comments'), 10, 1 ); |
|
| 105 | + add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1); |
|
| 106 | 106 | //make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://) |
| 107 | - add_filter( 'admin_url', array( $this, 'maybe_force_admin_ajax_ssl' ), 200, 1 ); |
|
| 107 | + add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1); |
|
| 108 | 108 | // action hook EE |
| 109 | - do_action( 'AHEE__EE_Front_Controller__construct__done',$this ); |
|
| 109 | + do_action('AHEE__EE_Front_Controller__construct__done', $this); |
|
| 110 | 110 | // for checking that browser cookies are enabled |
| 111 | - if ( apply_filters( 'FHEE__EE_Front_Controller____construct__set_test_cookie', true )) { |
|
| 112 | - setcookie( 'ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/' ); |
|
| 111 | + if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) { |
|
| 112 | + setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/'); |
|
| 113 | 113 | } |
| 114 | 114 | } |
| 115 | 115 | |
@@ -129,8 +129,8 @@ discard block |
||
| 129 | 129 | * @return void |
| 130 | 130 | */ |
| 131 | 131 | public function load_espresso_template_tags() { |
| 132 | - if ( is_readable( EE_PUBLIC . 'template_tags.php' )) { |
|
| 133 | - require_once( EE_PUBLIC . 'template_tags.php' ); |
|
| 132 | + if (is_readable(EE_PUBLIC.'template_tags.php')) { |
|
| 133 | + require_once(EE_PUBLIC.'template_tags.php'); |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | |
@@ -145,12 +145,12 @@ discard block |
||
| 145 | 145 | * @param array $clauses array of comment clauses setup by WP_Comment_Query |
| 146 | 146 | * @return array array of comment clauses with modifications. |
| 147 | 147 | */ |
| 148 | - public function filter_wp_comments( $clauses ) { |
|
| 148 | + public function filter_wp_comments($clauses) { |
|
| 149 | 149 | global $wpdb; |
| 150 | - if ( strpos( $clauses['join'], $wpdb->posts ) !== FALSE ) { |
|
| 150 | + if (strpos($clauses['join'], $wpdb->posts) !== FALSE) { |
|
| 151 | 151 | $cpts = EE_Register_CPTs::get_private_CPTs(); |
| 152 | - foreach ( $cpts as $cpt => $details ) { |
|
| 153 | - $clauses['where'] .= $wpdb->prepare( " AND $wpdb->posts.post_type != %s", $cpt ); |
|
| 152 | + foreach ($cpts as $cpt => $details) { |
|
| 153 | + $clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt); |
|
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | return $clauses; |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | * @return void |
| 168 | 168 | */ |
| 169 | 169 | public function employ_CPT_Strategy() { |
| 170 | - if ( apply_filters( 'FHEE__EE_Front_Controller__employ_CPT_Strategy',true) ){ |
|
| 171 | - EE_Registry::instance()->load_core( 'CPT_Strategy' ); |
|
| 170 | + if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) { |
|
| 171 | + EE_Registry::instance()->load_core('CPT_Strategy'); |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -180,9 +180,9 @@ discard block |
||
| 180 | 180 | * @param string $url incoming url |
| 181 | 181 | * @return string final assembled url |
| 182 | 182 | */ |
| 183 | - public function maybe_force_admin_ajax_ssl( $url ) { |
|
| 184 | - if ( is_ssl() && preg_match( '/admin-ajax.php/', $url )) { |
|
| 185 | - $url = str_replace( 'http://', 'https://', $url ); |
|
| 183 | + public function maybe_force_admin_ajax_ssl($url) { |
|
| 184 | + if (is_ssl() && preg_match('/admin-ajax.php/', $url)) { |
|
| 185 | + $url = str_replace('http://', 'https://', $url); |
|
| 186 | 186 | } |
| 187 | 187 | return $url; |
| 188 | 188 | } |
@@ -219,12 +219,12 @@ discard block |
||
| 219 | 219 | * @param WP $WP |
| 220 | 220 | * @return void |
| 221 | 221 | */ |
| 222 | - public function get_request( WP $WP ) { |
|
| 223 | - do_action( 'AHEE__EE_Front_Controller__get_request__start' ); |
|
| 222 | + public function get_request(WP $WP) { |
|
| 223 | + do_action('AHEE__EE_Front_Controller__get_request__start'); |
|
| 224 | 224 | /** @var EE_Request_Handler $Request_Handler */ |
| 225 | - $Request_Handler = EE_Registry::instance()->load_core( 'Request_Handler' ); |
|
| 226 | - $Request_Handler->parse_request( $WP ); |
|
| 227 | - do_action( 'AHEE__EE_Front_Controller__get_request__complete' ); |
|
| 225 | + $Request_Handler = EE_Registry::instance()->load_core('Request_Handler'); |
|
| 226 | + $Request_Handler->parse_request($WP); |
|
| 227 | + do_action('AHEE__EE_Front_Controller__get_request__complete'); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | |
@@ -236,22 +236,22 @@ discard block |
||
| 236 | 236 | * @param WP $WP |
| 237 | 237 | * @return void |
| 238 | 238 | */ |
| 239 | - public function _initialize_shortcodes( WP $WP ) { |
|
| 240 | - do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this ); |
|
| 239 | + public function _initialize_shortcodes(WP $WP) { |
|
| 240 | + do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this); |
|
| 241 | 241 | // grab post_name from request |
| 242 | - $current_post = apply_filters( 'FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get( 'post_name' )); |
|
| 242 | + $current_post = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get('post_name')); |
|
| 243 | 243 | // if it's not set, then check if frontpage is blog |
| 244 | - if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'posts' ) { |
|
| 244 | + if (empty($current_post) && get_option('show_on_front') == 'posts') { |
|
| 245 | 245 | // yup.. this is the posts page, prepare to load all shortcode modules |
| 246 | 246 | $current_post = 'posts'; |
| 247 | - } else if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'page' ) { |
|
| 247 | + } else if (empty($current_post) && get_option('show_on_front') == 'page') { |
|
| 248 | 248 | // some other page is set as the homepage |
| 249 | - $page_on_front = get_option( 'page_on_front' ); |
|
| 250 | - if ( $page_on_front ) { |
|
| 249 | + $page_on_front = get_option('page_on_front'); |
|
| 250 | + if ($page_on_front) { |
|
| 251 | 251 | // k now we need to find the post_name for this page |
| 252 | 252 | global $wpdb; |
| 253 | 253 | $SQL = "SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d"; |
| 254 | - $page_on_front = $wpdb->get_var( $wpdb->prepare( $SQL, $page_on_front )); |
|
| 254 | + $page_on_front = $wpdb->get_var($wpdb->prepare($SQL, $page_on_front)); |
|
| 255 | 255 | // set the current post slug to what it actually is |
| 256 | 256 | $current_post = $page_on_front ? $page_on_front : $current_post; |
| 257 | 257 | } |
@@ -259,58 +259,58 @@ discard block |
||
| 259 | 259 | // where are posts being displayed ? |
| 260 | 260 | $page_for_posts = EE_Config::get_page_for_posts(); |
| 261 | 261 | // in case $current_post is hierarchical like: /parent-page/current-page |
| 262 | - $current_post = basename( $current_post ); |
|
| 262 | + $current_post = basename($current_post); |
|
| 263 | 263 | // are we on a category page? |
| 264 | - $term_exists = is_array( term_exists( $current_post, 'category' )) || array_key_exists( 'category_name', $WP->query_vars ); |
|
| 264 | + $term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name', $WP->query_vars); |
|
| 265 | 265 | // make sure shortcodes are set |
| 266 | - if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes )) { |
|
| 266 | + if (isset(EE_Registry::instance()->CFG->core->post_shortcodes)) { |
|
| 267 | 267 | // d( EE_Registry::instance()->CFG->core->post_shortcodes ); |
| 268 | 268 | // cycle thru all posts with shortcodes set |
| 269 | - foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes ) { |
|
| 269 | + foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes) { |
|
| 270 | 270 | // filter shortcodes so |
| 271 | - $post_shortcodes = apply_filters( 'FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes ); |
|
| 271 | + $post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes); |
|
| 272 | 272 | // now cycle thru shortcodes |
| 273 | - foreach ( $post_shortcodes as $shortcode_class => $post_id ) { |
|
| 273 | + foreach ($post_shortcodes as $shortcode_class => $post_id) { |
|
| 274 | 274 | // are we on this page, or on the blog page, or an EE CPT category page ? |
| 275 | - if ( $current_post == $post_name || $term_exists ) { |
|
| 275 | + if ($current_post == $post_name || $term_exists) { |
|
| 276 | 276 | // verify shortcode is in list of registered shortcodes |
| 277 | - if ( ! isset( EE_Registry::instance()->shortcodes->{$shortcode_class} )) { |
|
| 278 | - if ( $current_post != $page_for_posts && current_user_can( 'edit_post', $post_id )) { |
|
| 279 | - $msg = sprintf( __( 'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso' ), $shortcode_class ); |
|
| 280 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 281 | - add_filter( 'FHEE_run_EE_the_content', '__return_true' ); |
|
| 277 | + if ( ! isset(EE_Registry::instance()->shortcodes->{$shortcode_class} )) { |
|
| 278 | + if ($current_post != $page_for_posts && current_user_can('edit_post', $post_id)) { |
|
| 279 | + $msg = sprintf(__('The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso'), $shortcode_class); |
|
| 280 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 281 | + add_filter('FHEE_run_EE_the_content', '__return_true'); |
|
| 282 | 282 | } |
| 283 | - add_shortcode( $shortcode_class, array( 'EES_Shortcode', 'invalid_shortcode_processor' )); |
|
| 283 | + add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor')); |
|
| 284 | 284 | continue; |
| 285 | 285 | } |
| 286 | 286 | // is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ? |
| 287 | - if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $current_post ] ) || $term_exists || $current_post == $page_for_posts ) { |
|
| 287 | + if (isset(EE_Registry::instance()->CFG->core->post_shortcodes[$current_post]) || $term_exists || $current_post == $page_for_posts) { |
|
| 288 | 288 | // let's pause to reflect on this... |
| 289 | - $sc_reflector = new ReflectionClass( 'EES_' . $shortcode_class ); |
|
| 289 | + $sc_reflector = new ReflectionClass('EES_'.$shortcode_class); |
|
| 290 | 290 | // ensure that class is actually a shortcode |
| 291 | - if ( ! $sc_reflector->isSubclassOf( 'EES_Shortcode' ) && defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE ) { |
|
| 292 | - $msg = sprintf( __( 'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso' ), $shortcode_class ); |
|
| 293 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 294 | - add_filter( 'FHEE_run_EE_the_content', '__return_true' ); |
|
| 291 | + if ( ! $sc_reflector->isSubclassOf('EES_Shortcode') && defined('WP_DEBUG') && WP_DEBUG === TRUE) { |
|
| 292 | + $msg = sprintf(__('The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso'), $shortcode_class); |
|
| 293 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 294 | + add_filter('FHEE_run_EE_the_content', '__return_true'); |
|
| 295 | 295 | continue; |
| 296 | 296 | } |
| 297 | 297 | // and pass the request object to the run method |
| 298 | 298 | EE_Registry::instance()->shortcodes->{$shortcode_class} = $sc_reflector->newInstance(); |
| 299 | 299 | // fire the shortcode class's run method, so that it can activate resources |
| 300 | - EE_Registry::instance()->shortcodes->{$shortcode_class}->run( $WP ); |
|
| 300 | + EE_Registry::instance()->shortcodes->{$shortcode_class}->run($WP); |
|
| 301 | 301 | } |
| 302 | 302 | // if this is NOT the "Posts page" and we have a valid entry for the "Posts page" in our tracked post_shortcodes array |
| 303 | - } else if ( $post_name != $page_for_posts && isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] )) { |
|
| 303 | + } else if ($post_name != $page_for_posts && isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) { |
|
| 304 | 304 | // and the shortcode is not being tracked for this page |
| 305 | - if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] )) { |
|
| 305 | + if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])) { |
|
| 306 | 306 | // then remove the "fallback" shortcode processor |
| 307 | - remove_shortcode( $shortcode_class ); |
|
| 307 | + remove_shortcode($shortcode_class); |
|
| 308 | 308 | } |
| 309 | 309 | } |
| 310 | 310 | } |
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | - do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__end', $this ); |
|
| 313 | + do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | |
@@ -322,20 +322,20 @@ discard block |
||
| 322 | 322 | * @param WP_Query $WP_Query |
| 323 | 323 | * @return void |
| 324 | 324 | */ |
| 325 | - public function pre_get_posts( $WP_Query ) { |
|
| 325 | + public function pre_get_posts($WP_Query) { |
|
| 326 | 326 | // only load Module_Request_Router if this is the main query |
| 327 | - if ( $WP_Query->is_main_query() ) { |
|
| 327 | + if ($WP_Query->is_main_query()) { |
|
| 328 | 328 | // load module request router |
| 329 | - $Module_Request_Router = EE_Registry::instance()->load_core( 'Module_Request_Router' ); |
|
| 329 | + $Module_Request_Router = EE_Registry::instance()->load_core('Module_Request_Router'); |
|
| 330 | 330 | // verify object |
| 331 | - if ( $Module_Request_Router instanceof EE_Module_Request_Router ) { |
|
| 331 | + if ($Module_Request_Router instanceof EE_Module_Request_Router) { |
|
| 332 | 332 | // cycle thru module routes |
| 333 | - while ( $route = $Module_Request_Router->get_route( $WP_Query )) { |
|
| 333 | + while ($route = $Module_Request_Router->get_route($WP_Query)) { |
|
| 334 | 334 | // determine module and method for route |
| 335 | - $module = $Module_Request_Router->resolve_route( $route[0], $route[1] ); |
|
| 336 | - if( $module instanceof EED_Module ) { |
|
| 335 | + $module = $Module_Request_Router->resolve_route($route[0], $route[1]); |
|
| 336 | + if ($module instanceof EED_Module) { |
|
| 337 | 337 | // get registered view for route |
| 338 | - $this->_template_path = $Module_Request_Router->get_view( $route ); |
|
| 338 | + $this->_template_path = $Module_Request_Router->get_view($route); |
|
| 339 | 339 | // grab module name |
| 340 | 340 | $module_name = $module->module_name(); |
| 341 | 341 | // map the module to the module objects |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | * @return void |
| 363 | 363 | */ |
| 364 | 364 | public function wp() { |
| 365 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
| 365 | + EE_Registry::instance()->load_helper('Template'); |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | |
@@ -380,30 +380,30 @@ discard block |
||
| 380 | 380 | public function wp_enqueue_scripts() { |
| 381 | 381 | |
| 382 | 382 | // css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF via: add_filter( 'FHEE_load_css', '__return_false' ); |
| 383 | - if ( apply_filters( 'FHEE_load_css', TRUE ) ) { |
|
| 383 | + if (apply_filters('FHEE_load_css', TRUE)) { |
|
| 384 | 384 | |
| 385 | 385 | EE_Registry::instance()->CFG->template_settings->enable_default_style = TRUE; |
| 386 | 386 | //Load the ThemeRoller styles if enabled |
| 387 | - if ( isset( EE_Registry::instance()->CFG->template_settings->enable_default_style ) && EE_Registry::instance()->CFG->template_settings->enable_default_style ) { |
|
| 387 | + if (isset(EE_Registry::instance()->CFG->template_settings->enable_default_style) && EE_Registry::instance()->CFG->template_settings->enable_default_style) { |
|
| 388 | 388 | |
| 389 | 389 | //Load custom style sheet if available |
| 390 | - if ( isset( EE_Registry::instance()->CFG->template_settings->custom_style_sheet )) { |
|
| 391 | - wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL . 'css/' . EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION ); |
|
| 390 | + if (isset(EE_Registry::instance()->CFG->template_settings->custom_style_sheet)) { |
|
| 391 | + wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL.'css/'.EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION); |
|
| 392 | 392 | wp_enqueue_style('espresso_custom_css'); |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - EE_Registry::instance()->load_helper( 'File' ); |
|
| 396 | - if ( is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )) { |
|
| 397 | - wp_register_style( 'espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION ); |
|
| 395 | + EE_Registry::instance()->load_helper('File'); |
|
| 396 | + if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) { |
|
| 397 | + wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION); |
|
| 398 | 398 | } else { |
| 399 | - wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION ); |
|
| 399 | + wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION); |
|
| 400 | 400 | } |
| 401 | 401 | wp_enqueue_style('espresso_default'); |
| 402 | 402 | |
| 403 | - if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css' )) { |
|
| 404 | - wp_register_style( 'espresso_style', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) ); |
|
| 403 | + if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) { |
|
| 404 | + wp_register_style('espresso_style', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default')); |
|
| 405 | 405 | } else { |
| 406 | - wp_register_style( 'espresso_style', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) ); |
|
| 406 | + wp_register_style('espresso_style', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default')); |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | } |
@@ -411,29 +411,29 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | // js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF via: add_filter( 'FHEE_load_js', '__return_false' ); |
| 414 | - if ( apply_filters( 'FHEE_load_js', TRUE ) ) { |
|
| 414 | + if (apply_filters('FHEE_load_js', TRUE)) { |
|
| 415 | 415 | |
| 416 | - wp_enqueue_script( 'jquery' ); |
|
| 416 | + wp_enqueue_script('jquery'); |
|
| 417 | 417 | //let's make sure that all required scripts have been setup |
| 418 | - if ( function_exists( 'wp_script_is' )) { |
|
| 419 | - if ( ! wp_script_is( 'jquery' )) { |
|
| 418 | + if (function_exists('wp_script_is')) { |
|
| 419 | + if ( ! wp_script_is('jquery')) { |
|
| 420 | 420 | $msg = sprintf( |
| 421 | - __( '%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso' ), |
|
| 421 | + __('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso'), |
|
| 422 | 422 | '<em><br />', |
| 423 | 423 | '</em>' |
| 424 | 424 | ); |
| 425 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 425 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 426 | 426 | } |
| 427 | 427 | } |
| 428 | 428 | // load core js |
| 429 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 430 | - wp_enqueue_script( 'espresso_core' ); |
|
| 431 | - wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings ); |
|
| 429 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 430 | + wp_enqueue_script('espresso_core'); |
|
| 431 | + wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings); |
|
| 432 | 432 | |
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | //qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' ); |
| 436 | - if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) { |
|
| 436 | + if (apply_filters('FHEE_load_qtip', FALSE)) { |
|
| 437 | 437 | EE_Registry::instance()->load_helper('Qtip_Loader'); |
| 438 | 438 | EEH_Qtip_Loader::instance()->register_and_enqueue(); |
| 439 | 439 | } |
@@ -441,11 +441,11 @@ discard block |
||
| 441 | 441 | |
| 442 | 442 | //accounting.js library |
| 443 | 443 | // @link http://josscrowcroft.github.io/accounting.js/ |
| 444 | - if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) { |
|
| 445 | - $acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js'; |
|
| 446 | - wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
| 447 | - wp_register_script( 'ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE ); |
|
| 448 | - wp_enqueue_script( 'ee-accounting' ); |
|
| 444 | + if (apply_filters('FHEE_load_accounting_js', FALSE)) { |
|
| 445 | + $acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js'; |
|
| 446 | + wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 447 | + wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE); |
|
| 448 | + wp_enqueue_script('ee-accounting'); |
|
| 449 | 449 | |
| 450 | 450 | $currency_config = array( |
| 451 | 451 | 'currency' => array( |
@@ -468,21 +468,21 @@ discard block |
||
| 468 | 468 | wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config); |
| 469 | 469 | } |
| 470 | 470 | |
| 471 | - if ( ! function_exists( 'wp_head' )) { |
|
| 471 | + if ( ! function_exists('wp_head')) { |
|
| 472 | 472 | $msg = sprintf( |
| 473 | - __( '%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ), |
|
| 473 | + __('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'), |
|
| 474 | 474 | '<em><br />', |
| 475 | 475 | '</em>' |
| 476 | 476 | ); |
| 477 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 477 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 478 | 478 | } |
| 479 | - if ( ! function_exists( 'wp_footer' )) { |
|
| 479 | + if ( ! function_exists('wp_footer')) { |
|
| 480 | 480 | $msg = sprintf( |
| 481 | - __( '%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ), |
|
| 481 | + __('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'), |
|
| 482 | 482 | '<em><br />', |
| 483 | 483 | '</em>' |
| 484 | 484 | ); |
| 485 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 485 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | } |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | * @return void |
| 497 | 497 | */ |
| 498 | 498 | public function header_meta_tag() { |
| 499 | - print( apply_filters("FHEE__EE_Front_Controller__header_meta_tag","<meta name='generator' content='Event Espresso Version " . EVENT_ESPRESSO_VERSION . "' />")); |
|
| 499 | + print(apply_filters("FHEE__EE_Front_Controller__header_meta_tag", "<meta name='generator' content='Event Espresso Version ".EVENT_ESPRESSO_VERSION."' />")); |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | |
@@ -510,9 +510,9 @@ discard block |
||
| 510 | 510 | * @param $the_content |
| 511 | 511 | * @return string |
| 512 | 512 | */ |
| 513 | - public function the_content( $the_content ) { |
|
| 513 | + public function the_content($the_content) { |
|
| 514 | 514 | // nothing gets loaded at this point unless other systems turn this hookpoint on by using: add_filter( 'FHEE_run_EE_the_content', '__return_true' ); |
| 515 | - if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) { |
|
| 515 | + if (apply_filters('FHEE_run_EE_the_content', FALSE)) { |
|
| 516 | 516 | } |
| 517 | 517 | return $the_content; |
| 518 | 518 | } |
@@ -537,9 +537,9 @@ discard block |
||
| 537 | 537 | */ |
| 538 | 538 | public function display_errors() { |
| 539 | 539 | static $shown_already = FALSE; |
| 540 | - do_action( 'AHEE__EE_Front_Controller__display_errors__begin' ); |
|
| 540 | + do_action('AHEE__EE_Front_Controller__display_errors__begin'); |
|
| 541 | 541 | if ( |
| 542 | - apply_filters( 'FHEE__EE_Front_Controller__display_errors', TRUE ) |
|
| 542 | + apply_filters('FHEE__EE_Front_Controller__display_errors', TRUE) |
|
| 543 | 543 | && ! $shown_already |
| 544 | 544 | && is_main_query() |
| 545 | 545 | && ! is_feed() |
@@ -548,10 +548,10 @@ discard block |
||
| 548 | 548 | ) { |
| 549 | 549 | echo EE_Error::get_notices(); |
| 550 | 550 | $shown_already = TRUE; |
| 551 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
| 552 | - EEH_Template::display_template( EE_TEMPLATES . 'espresso-ajax-notices.template.php' ); |
|
| 551 | + EE_Registry::instance()->load_helper('Template'); |
|
| 552 | + EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php'); |
|
| 553 | 553 | } |
| 554 | - do_action( 'AHEE__EE_Front_Controller__display_errors__end' ); |
|
| 554 | + do_action('AHEE__EE_Front_Controller__display_errors__end'); |
|
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | |
@@ -566,12 +566,12 @@ discard block |
||
| 566 | 566 | * @param string $template_include_path |
| 567 | 567 | * @return string |
| 568 | 568 | */ |
| 569 | - public function template_include( $template_include_path = NULL ) { |
|
| 570 | - if ( EE_Registry::instance()->REQ->is_espresso_page() ) { |
|
| 571 | - $this->_template_path = ! empty( $this->_template_path ) ? basename( $this->_template_path ) : basename( $template_include_path ); |
|
| 572 | - $template_path = EEH_Template::locate_template( $this->_template_path, array(), false ); |
|
| 573 | - $this->_template_path = ! empty( $template_path ) ? $template_path : $template_include_path; |
|
| 574 | - $this->_template = basename( $this->_template_path ); |
|
| 569 | + public function template_include($template_include_path = NULL) { |
|
| 570 | + if (EE_Registry::instance()->REQ->is_espresso_page()) { |
|
| 571 | + $this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path); |
|
| 572 | + $template_path = EEH_Template::locate_template($this->_template_path, array(), false); |
|
| 573 | + $this->_template_path = ! empty($template_path) ? $template_path : $template_include_path; |
|
| 574 | + $this->_template = basename($this->_template_path); |
|
| 575 | 575 | return $this->_template_path; |
| 576 | 576 | } |
| 577 | 577 | return $template_include_path; |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | * @param bool $with_path |
| 587 | 587 | * @return string |
| 588 | 588 | */ |
| 589 | - public function get_selected_template( $with_path = FALSE ) { |
|
| 589 | + public function get_selected_template($with_path = FALSE) { |
|
| 590 | 590 | return $with_path ? $this->_template_path : $this->_template; |
| 591 | 591 | } |
| 592 | 592 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * @param EE_Response $response |
| 51 | 51 | * @return EE_Response |
| 52 | 52 | */ |
| 53 | - public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 53 | + public function handle_request(EE_Request $request, EE_Response $response) { |
|
| 54 | 54 | $this->request = $request; |
| 55 | 55 | $this->response = $response; |
| 56 | 56 | // central repository for classes |
@@ -58,15 +58,15 @@ discard block |
||
| 58 | 58 | // workarounds for PHP < 5.3 |
| 59 | 59 | $this->_load_class_tools(); |
| 60 | 60 | // PSR4 Autoloaders |
| 61 | - EE_Registry::instance()->load_core( 'EE_Psr4AutoloaderInit' ); |
|
| 61 | + EE_Registry::instance()->load_core('EE_Psr4AutoloaderInit'); |
|
| 62 | 62 | // deprecated functions |
| 63 | - espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' ); |
|
| 63 | + espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php'); |
|
| 64 | 64 | // load interfaces |
| 65 | - espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' ); |
|
| 65 | + espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php'); |
|
| 66 | 66 | //// WP cron jobs |
| 67 | - EE_Registry::instance()->load_core( 'Cron_Tasks' ); |
|
| 68 | - EE_Registry::instance()->load_core( 'Request_Handler' ); |
|
| 69 | - EE_Registry::instance()->load_core( 'EE_System' ); |
|
| 67 | + EE_Registry::instance()->load_core('Cron_Tasks'); |
|
| 68 | + EE_Registry::instance()->load_core('Request_Handler'); |
|
| 69 | + EE_Registry::instance()->load_core('EE_System'); |
|
| 70 | 70 | |
| 71 | 71 | return $this->response; |
| 72 | 72 | } |
@@ -80,12 +80,12 @@ discard block |
||
| 80 | 80 | * @return void |
| 81 | 81 | */ |
| 82 | 82 | private function _load_registry() { |
| 83 | - if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) { |
|
| 84 | - require_once( EE_CORE . 'EE_Registry.core.php' ); |
|
| 83 | + if (is_readable(EE_CORE.'EE_Registry.core.php')) { |
|
| 84 | + require_once(EE_CORE.'EE_Registry.core.php'); |
|
| 85 | 85 | } else { |
| 86 | - $msg = __( 'The EE_Registry core class could not be loaded.', 'event_espresso' ); |
|
| 87 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 88 | - wp_die( EE_Error::get_notices() ); |
|
| 86 | + $msg = __('The EE_Registry core class could not be loaded.', 'event_espresso'); |
|
| 87 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 88 | + wp_die(EE_Error::get_notices()); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | * @return void |
| 98 | 98 | */ |
| 99 | 99 | private function _load_class_tools() { |
| 100 | - if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) { |
|
| 101 | - require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' ); |
|
| 100 | + if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) { |
|
| 101 | + require_once(EE_HELPERS.'EEH_Class_Tools.helper.php'); |
|
| 102 | 102 | } else { |
| 103 | - $msg = __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' ); |
|
| 104 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 103 | + $msg = __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'); |
|
| 104 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * @param \EE_Request $request |
| 117 | 117 | * @param \EE_Response $response |
| 118 | 118 | */ |
| 119 | - public function handle_response( EE_Request $request, EE_Response $response ) { |
|
| 119 | + public function handle_response(EE_Request $request, EE_Response $response) { |
|
| 120 | 120 | //EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ ); |
| 121 | 121 | //EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ ); |
| 122 | 122 | //die(); |
