eventespresso / event-espresso-core

caffeinated/admin/new/pricing/Pricing_Admin_Page.core.php

Spacing +184 added lines, -184 removed lines

@@ -31,8 +31,8 @@ 
 	 * @param bool $routing
 	 * @return Pricing_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -49,7 +49,7 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_update_prices_order', array( $this, 'update_price_order' ));
+		add_action('wp_ajax_espresso_update_prices_order', array($this, 'update_price_order'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$prc_id = ! empty( $this->_req_data['PRC_ID'] ) && ! is_array( $this->_req_data['PRC_ID'] ) ? $this->_req_data['PRC_ID'] : 0;
-		$prt_id =  ! empty( $this->_req_data['PRT_ID'] ) && ! is_array( $this->_req_data['PRT_ID'] ) ? $this->_req_data['PRT_ID'] : 0;
+		$prc_id = ! empty($this->_req_data['PRC_ID']) && ! is_array($this->_req_data['PRC_ID']) ? $this->_req_data['PRC_ID'] : 0;
+		$prt_id = ! empty($this->_req_data['PRT_ID']) && ! is_array($this->_req_data['PRT_ID']) ? $this->_req_data['PRT_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 					'func' => '_price_overview_list_table',
@@ -91,38 +91,38 @@ 
 				),
 			'add_new_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'capability' => 'ee_edit_default_prices'
 				),
 			'edit_price'	=> array(
 					'func' => '_edit_price_details',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'insert_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => TRUE ),
+					'args' => array('new_price' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_prices',
 				),
 			'update_price'	=> array(
 					'func' => '_insert_or_update_price',
-					'args' => array( 'new_price' => FALSE ),
+					'args' => array('new_price' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price',
 					'obj_id' => $prc_id
 				),
 			'trash_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
 				),
 			'restore_price'	=> array(
 					'func' => '_trash_or_restore_price',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price',
 					'obj_id' => $prc_id
@@ -154,27 +154,27 @@ 
 				),
 			'insert_price_type'	=> array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => TRUE ),
+					'args' => array('new_price_type' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_types'
 				),
 			'update_price_type' => array(
 					'func' => '_insert_or_update_price_type',
-					'args' => array( 'new_price_type' => FALSE ),
+					'args' => array('new_price_type' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_edit_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'trash_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => TRUE ),
+					'args' => array('trash' => TRUE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
 				),
 			'restore_price_type'	=> array(
 					'func' => '_trash_or_restore_price_type',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_default_price_type',
 					'obj_id' => $prt_id
@@ -214,7 +214,7 @@ 
 							'filename' => 'pricing_default_pricing_views_bulk_actions_search'
 							)
 						),
-					'help_tour' => array( 'Pricing_Default_Prices_Help_Tour'),
+					'help_tour' => array('Pricing_Default_Prices_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'add_new_price' => array(
@@ -230,24 +230,24 @@ 
 							)
 						),
                     'help_tour' => array('Pricing_Add_New_Default_Price_Help_Tour'),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price' => array(
 					'nav' => array(
 							'label' => __('Edit Default Price', 'event_espresso'),
 							'order' => 20,
-							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+							'url' => isset($this->_req_data['id']) ? add_query_arg(array('id' => $this->_req_data['id']), $this->_current_page_view_url) : $this->_admin_base_url,
 							'persistent' => FALSE
 						),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes' ),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_details_meta_boxes'),
                     'help_tabs' => array(
 						'edit_default_price_help_tab' => array(
 							'title' => __('Edit Default Price', 'event_espresso'),
 							'filename' => 'pricing_edit_default_price'
 							)
 						),
-					'help_tour' => array( 'Pricing_Edit_Default_Price_Help_Tour' ),
+					'help_tour' => array('Pricing_Edit_Default_Price_Help_Tour'),
 					'require_nonce' => FALSE
 				),
 			'price_types' => array(
@@ -270,7 +270,7 @@ 
 							'filename' => 'pricing_price_types_views_bulk_actions_search'
 							),
 						),
-					'help_tour' => array( 'Pricing_Price_Types_Default_Help_Tour' ),
+					'help_tour' => array('Pricing_Price_Types_Default_Help_Tour'),
 					'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 					'require_nonce' => FALSE
 				),
@@ -286,8 +286,8 @@ 
 							'filename' => 'pricing_add_new_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Add_New_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Add_New_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 					'require_nonce' => FALSE
 				),
 			'edit_price_type' => array(
@@ -302,8 +302,8 @@ 
 							'filename' => 'pricing_edit_price_type'
 							)
 						),
-                    'help_tour' => array( 'Pricing_Edit_Price_Type_Help_Tour' ),
-					'metaboxes' => array( '_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes' ),
+                    'help_tour' => array('Pricing_Edit_Price_Type_Help_Tour'),
+					'metaboxes' => array('_publish_post_box', '_espresso_news_post_box', '_price_type_details_meta_boxes'),
 
 					'require_nonce' => FALSE
 				)
@@ -340,7 +340,7 @@ 
 	public function load_scripts_styles() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_PRICING');
 
 		//scripts
@@ -350,8 +350,8 @@ 
 		//wp_enqueue_script('jquery-ui-dialog');
 		//wp_enqueue_script('jquery-ui-draggable');
 		//wp_enqueue_script('jquery-ui-datepicker');
-		wp_register_script( 'espresso_PRICING', PRICING_ASSETS_URL . 'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_PRICING' );
+		wp_register_script('espresso_PRICING', PRICING_ASSETS_URL.'espresso_pricing_admin.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_PRICING');
 	}
 
 
@@ -359,7 +359,7 @@ 
 
 
 	public function load_scripts_styles_default() {
-		wp_enqueue_script( 'espresso_ajax_table_sorting' );
+		wp_enqueue_script('espresso_ajax_table_sorting');
 	}
 
 
@@ -387,7 +387,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_prices', 'pricing_trash_price' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_prices', 'pricing_trash_price')) {
 			$this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -417,7 +417,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_default_price_types', 'pricing_trash_price_type' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_default_price_types', 'pricing_trash_price_type')) {
 			 $this->_views['trashed'] = array(
 					'slug' => 'trashed',
 					'label' => __('Trash', 'event_espresso'),
@@ -456,18 +456,18 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_prices_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_prices_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 		$event_pricing = array();
 
-		require_once( PRICING_ADMIN . 'Prices_List_Table.class.php' );
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(PRICING_ADMIN.'Prices_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		//$PRC = EEM_Price::instance();
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
 		switch ($this->_req_data['orderby']) {
 			case 'name':
@@ -480,27 +480,27 @@ 
 				$orderby = array('PRC_amount'=>$order);
 				break;
 			default:
-				$orderby = array( 'PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
+				$orderby = array('PRC_order'=>$order, 'Price_Type.PRT_order'=>$order, 'PRC_ID'=>$order);
 		}
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array(
 				'PRC_is_default' => 1,
 				'PRC_deleted' => $trashed
 				);
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRC_name' => array('LIKE',$sstr ),
-				'PRC_desc' => array('LIKE',$sstr ),
-				'PRC_amount' => array( 'LIKE',$sstr ),
-				'Price_Type.PRT_name' => array( 'LIKE', $sstr )
+				'PRC_name' => array('LIKE', $sstr),
+				'PRC_desc' => array('LIKE', $sstr),
+				'PRC_amount' => array('LIKE', $sstr),
+				'Price_Type.PRT_name' => array('LIKE', $sstr)
 				);
 		}
 
@@ -511,9 +511,9 @@ 
 			'group_by'=>'PRC_ID'
 			);
 
-		if($count){
-			return $trashed ? EEM_Price::instance()->count( array( $_where ) ) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
-		}else{
+		if ($count) {
+			return $trashed ? EEM_Price::instance()->count(array($_where)) : EEM_Price::instance()->count_deleted_and_undeleted(array($_where));
+		} else {
 			return EEM_Price::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 	}
@@ -529,40 +529,40 @@ 
 	*		@return void
 	*/
 	protected function _edit_price_details() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// grab price ID
-		$PRC_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRC_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title . ' # ' . $PRC_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRC_ID ? $this->_admin_page_title.' # '.$PRC_ID : $this->_admin_page_title;
 
 		// get prices
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
-		if ( $PRC_ID ) {
-			$price = $PRC->get_one_by_ID( $PRC_ID );
+		if ($PRC_ID) {
+			$price = $PRC->get_one_by_ID($PRC_ID);
 			$additional_hidden_fields = array(
-					'PRC_ID' => array( 'type' => 'hidden', 'value' => $PRC_ID )
+					'PRC_ID' => array('type' => 'hidden', 'value' => $PRC_ID)
 				);
-			$this->_set_add_edit_form_tags( 'update_price', $additional_hidden_fields );
+			$this->_set_add_edit_form_tags('update_price', $additional_hidden_fields);
 		} else {
 			$price = $PRC->get_new_price();
-			$this->_set_add_edit_form_tags( 'insert_price' );
+			$this->_set_add_edit_form_tags('insert_price');
 		}
 
 		$this->_template_args['PRC_ID'] = $PRC_ID;
 		$this->_template_args['price'] = $price;
 
 		// get price types
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
-		$price_types = $PRT->get_all( array( array('PBT_ID' => array('!=', 1 ) ) ) );
+		$price_types = $PRT->get_all(array(array('PBT_ID' => array('!=', 1))));
 		$price_type_names = array();
 		if (empty($price_types)) {
-			$msg = __( 'You have no price types defined. Please add a price type before adding a price.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('You have no price types defined. Please add a price type before adding a price.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			exit();
 		} else {
 			foreach ($price_types as $type) {
@@ -575,7 +575,7 @@ 
 		$this->_template_args['price_types'] = $price_type_names;
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
 
-		$this->_set_publish_post_box_vars( 'id', $PRC_ID );
+		$this->_set_publish_post_box_vars('id', $PRC_ID);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 	}
@@ -591,7 +591,7 @@ 
 	*		@return void
 	*/
 	protected function _price_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Default Price Details', 'event_espresso' ), array( $this, '_edit_price_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Default Price Details', 'event_espresso'), array($this, '_edit_price_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -605,7 +605,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -619,7 +619,7 @@ 
 	*/
 	protected function set_price_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$set_column_values = array(
 				'PRT_ID' => absint($this->_req_data['PRT_ID']),
@@ -647,12 +647,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price( $insert = FALSE ) {
+	protected function _insert_or_update_price($insert = FALSE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		// why be so pessimistic ???  : (
@@ -660,14 +660,14 @@ 
 
 		$set_column_values = $this->set_price_column_values();
 		// is this a new Price ?
-		if ( $insert ) {
+		if ($insert) {
 			// run the insert
-			if ( $PRC_ID = $PRC->insert( $set_column_values )) {
+			if ($PRC_ID = $PRC->insert($set_column_values)) {
 				//make sure this new price modifier is attached to the ticket but ONLY if it is not a tax type
 				$PR = EEM_price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PR, 'Price' );
+					$ticket->_add_relation_to($PR, 'Price');
 					$ticket->save();
 				}
 				$success = 1;
@@ -677,29 +677,29 @@ 
 			}
 			$action_desc = 'created';
 		} else {
-			$PRC_ID = absint( $this->_req_data['PRC_ID'] );
+			$PRC_ID = absint($this->_req_data['PRC_ID']);
 			// run the update
-			$where_cols_n_values = array( 'PRC_ID' => $PRC_ID );
-			if ( $PRC->update( $set_column_values, array($where_cols_n_values))) {
+			$where_cols_n_values = array('PRC_ID' => $PRC_ID);
+			if ($PRC->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 
 			$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-			if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+			if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 
 				//if this is $PRC_ID == 1, then we need to update the default ticket attached to this price so the TKT_price value is updated.
-				if ( $PRC_ID === 1 ) {
+				if ($PRC_ID === 1) {
 					$ticket = $PR->get_first_related('Ticket');
-					if ( $ticket ) {
-						$ticket->set('TKT_price', $PR->get('PRC_amount') );
-						$ticket->set('TKT_name', $PR->get('PRC_name') );
+					if ($ticket) {
+						$ticket->set('TKT_price', $PR->get('PRC_amount'));
+						$ticket->set('TKT_name', $PR->get('PRC_name'));
 						$ticket->set('TKT_description', $PR->get('PRC_desc'));
 						$ticket->save();
 					}
 				} else {
 					//we make sure this price is attached to base ticket. but ONLY if its not a tax ticket type.
 					$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
-					$ticket->_add_relation_to( $PRC_ID, 'Price' );
+					$ticket->_add_relation_to($PRC_ID, 'Price');
 					$ticket->save();
 				}
 			}
@@ -707,9 +707,9 @@ 
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action' => 'edit_price', 'id' => $PRC_ID );
+		$query_args = array('action' => 'edit_price', 'id' => $PRC_ID);
 
-		$this->_redirect_after_action( $success, 'Prices', $action_desc, $query_args );
+		$this->_redirect_after_action($success, 'Prices', $action_desc, $query_args);
 
 	}
 
@@ -723,12 +723,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price( $trash = TRUE ) {
+	protected function _trash_or_restore_price($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
@@ -737,18 +737,18 @@ 
 		//get base ticket for updating
 		$ticket = EEM_Ticket::instance()->get_one_by_ID(1);
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID) ) ) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), absint($PRC_ID))) {
 					$success = 0;
 				} else {
 					$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-					if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+					if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 						//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-						if ( $PRC_deleted ) {
+						if ($PRC_deleted) {
 							$ticket->_remove_relation_to($PRC_ID, 'Price');
 						} else {
 							$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -760,14 +760,14 @@ 
 
 		} else {
 			// grab single id and delete
-			$PRC_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRC_ID ) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID) ) {
+			$PRC_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRC_ID) || ! $PRC->update_by_ID(array('PRC_deleted' => $PRC_deleted), $PRC_ID)) {
 				$success = 0;
 			} else {
 				$PR = EEM_Price::instance()->get_one_by_ID($PRC_ID);
-				if ( $PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax ) {
+				if ($PR->type_obj()->base_type() !== EEM_Price_Type::base_type_tax) {
 					//if trashing then remove relations to base default ticket.  If restoring then add back to base default ticket
-					if ( $PRC_deleted ) {
+					if ($PRC_deleted) {
 						$ticket->_remove_relation_to($PRC_ID, 'Price');
 					} else {
 						$ticket->_add_relation_to($PRC_ID, 'Price');
@@ -781,17 +781,17 @@ 
 			'action' => 'default'
 			);
 
-		if ( $success ) {
-			if ( $trash ) {
+		if ($success) {
+			if ($trash) {
 				$msg = $success == 2 ? __('The Prices have been trashed.', 'event_espresso') : __('The Price has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success == 2 ? __('The Prices have been restored.', 'event_espresso') : __('The Price has been restored.', 'event_espresso');
 			}
 
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -808,19 +808,19 @@ 
 	protected function _delete_price() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price.model.php');
+		require_once(EE_MODELS.'EEM_Price.model.php');
 		$PRC = EEM_Price::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru bulk action checkboxes
-			while (list( $PRC_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRC->delete_permanently_by_ID(absint($PRC_ID))) {
+			while (list($PRC_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRC->delete_permanently_by_ID(absint($PRC_ID))) {
 					$success = 0;
 				}
 			}
@@ -834,7 +834,7 @@ 
 
 		}
 
-		$this->_redirect_after_action( $success, 'Prices', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Prices', 'deleted', array());
 
 	}
 
@@ -842,16 +842,16 @@ 
 
 
 	public function update_price_order() {
-		$success = __( 'Price order was updated successfully.', 'event_espresso' );
+		$success = __('Price order was updated successfully.', 'event_espresso');
 
 		// grab our row IDs
-		$row_ids = isset( $this->_req_data['row_ids'] ) && ! empty( $this->_req_data['row_ids'] ) ? explode( ',', rtrim( $this->_req_data['row_ids'], ',' )) : FALSE;
+		$row_ids = isset($this->_req_data['row_ids']) && ! empty($this->_req_data['row_ids']) ? explode(',', rtrim($this->_req_data['row_ids'], ',')) : FALSE;
 
-		if ( is_array( $row_ids )) {
-			for ( $i = 0; $i < count( $row_ids ); $i++ ) {
+		if (is_array($row_ids)) {
+			for ($i = 0; $i < count($row_ids); $i++) {
 				//Update the prices when re-ordering
 				$id = absint($row_ids[$i]);
-				if ( EEM_Price::instance()->update ( array( 'PRC_order' => $i+1 ), array(array( 'PRC_ID' => $id ) )) === FALSE ) {
+				if (EEM_Price::instance()->update(array('PRC_order' => $i + 1), array(array('PRC_ID' => $id))) === FALSE) {
 					$success = FALSE;
 				}
 			}
@@ -859,9 +859,9 @@ 
 			$success = FALSE;
 		}
 
-		$errors = ! $success ? __( 'An error occurred. The price order was not updated.', 'event_espresso' ) : FALSE;
+		$errors = ! $success ? __('An error occurred. The price order was not updated.', 'event_espresso') : FALSE;
 
-		echo json_encode( array( 'return_data' => FALSE, 'success' => $success, 'errors' => $errors ));
+		echo json_encode(array('return_data' => FALSE, 'success' => $success, 'errors' => $errors));
 		die();
 	}
 
@@ -904,46 +904,46 @@ 
 	* 	@param  boolean $trashed   whether the current view is of the trash can - eww yuck!
 	* 	@return mixed (int|array)  int = count || array of price objects
 	*/
-	public function get_price_types_overview_data( $per_page = 10, $count = FALSE, $trashed = FALSE ) {
+	public function get_price_types_overview_data($per_page = 10, $count = FALSE, $trashed = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		// start with an empty array
 
-		require_once( PRICING_ADMIN . 'Price_Types_List_Table.class.php' );
-		require_once( EE_MODELS . 'EEM_Price_Type.model.php' );
+		require_once(PRICING_ADMIN.'Price_Types_List_Table.class.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? '' : $this->_req_data['orderby'];
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		switch ($this->_req_data['orderby']) {
 			case 'name':
-				$orderby = array( 'PRT_name' => $order);
+				$orderby = array('PRT_name' => $order);
 				break;
 			default:
-				$orderby = array( 'PRT_order' => $order);
+				$orderby = array('PRT_order' => $order);
 		}
 
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
-		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1 ) );
+		$_where = array('PRT_deleted'=>$trashed, 'PBT_ID' => array('!=', 1));
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'PRT_name' => array( 'LIKE', $sstr )
+				'PRT_name' => array('LIKE', $sstr)
 				);
 		}
 		$query_params = array(
 			$_where,
 			'order_by'=>$orderby,
 			'limit'=>$limit);
-		if($count){
+		if ($count) {
 			return EEM_Price_Type::instance()->count_deleted_and_undeleted($query_params);
-		}else{
+		} else {
 			return EEM_Price_Type::instance()->get_all_deleted_and_undeleted($query_params);
 		}
 
@@ -963,25 +963,25 @@ 
 	*/
 	protected function _edit_price_type_details() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// grab price type ID
-		$PRT_ID = isset( $this->_req_data['id'] ) && ! empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : FALSE;
+		$PRT_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : FALSE;
 		// change page title based on request action
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRT_ID to title if editing
-		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title . ' # ' . $PRT_ID : $this->_admin_page_title;
+		$this->_admin_page_title = $PRT_ID ? $this->_admin_page_title.' # '.$PRT_ID : $this->_admin_page_title;
 
 //		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
 
-		if ( $PRT_ID ) {
-			$price_type = EEM_Price_Type::instance()->get_one_by_ID( $PRT_ID );
-			$additional_hidden_fields = array( 'PRT_ID' => array( 'type' => 'hidden', 'value' => $PRT_ID ));
-			$this->_set_add_edit_form_tags( 'update_price_type', $additional_hidden_fields );
+		if ($PRT_ID) {
+			$price_type = EEM_Price_Type::instance()->get_one_by_ID($PRT_ID);
+			$additional_hidden_fields = array('PRT_ID' => array('type' => 'hidden', 'value' => $PRT_ID));
+			$this->_set_add_edit_form_tags('update_price_type', $additional_hidden_fields);
 		} else {
 			$price_type = EEM_Price_Type::instance()->get_new_price_type();
-			$this->_set_add_edit_form_tags( 'insert_price_type' );
+			$this->_set_add_edit_form_tags('insert_price_type');
 		}
 
 		$this->_template_args['PRT_ID'] = $PRT_ID;
@@ -990,19 +990,19 @@ 
 
 		$base_types = EEM_Price_Type::instance()->get_base_types();
 		$select_values = array();
-		foreach ( $base_types as $ref => $text ) {
-			if ( $ref == EEM_Price_Type::base_type_base_price ) {
+		foreach ($base_types as $ref => $text) {
+			if ($ref == EEM_Price_Type::base_type_base_price) {
 				//do not allow creation of base_type_base_prices because that's a system only base type.
 				continue;
 			}
-			$values[] = array( 'id' => $ref, 'text' => $text );
+			$values[] = array('id' => $ref, 'text' => $text);
 		}
 
 
 		$this->_template_args['base_type_select'] = EEH_Form_Fields::select_input('base_type', $values, $price_type->base_type(), 'id="price-type-base-type-slct"');
 		$this->_template_args['learn_more_about_pricing_link'] = $this->_learn_more_about_pricing_link();
-		$redirect_URL = add_query_arg( array( 'action' => 'price_types'), $this->_admin_base_url );
-		$this->_set_publish_post_box_vars( 'id', $PRT_ID, FALSE, $redirect_URL );
+		$redirect_URL = add_query_arg(array('action' => 'price_types'), $this->_admin_base_url);
+		$this->_set_publish_post_box_vars('id', $PRT_ID, FALSE, $redirect_URL);
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 
@@ -1019,7 +1019,7 @@ 
 	*		@return void
 	*/
 	protected function _price_type_details_meta_boxes() {
-		add_meta_box( 'edit-price-details-mbox', __( 'Price Type Details', 'event_espresso' ), array( $this, '_edit_price_type_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-price-details-mbox', __('Price Type Details', 'event_espresso'), array($this, '_edit_price_type_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
 	}
 
 
@@ -1032,7 +1032,7 @@ 
 	*		@return void
 	*/
 	public function _edit_price_type_details_meta_box() {
-		echo EEH_Template::display_template( PRICING_TEMPLATE_PATH . 'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE );
+		echo EEH_Template::display_template(PRICING_TEMPLATE_PATH.'pricing_type_details_main_meta_box.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -1045,9 +1045,9 @@ 
 	*/
 	protected function set_price_type_column_values() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		$base_type = !empty( $this->_req_data['base_type'] ) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
+		$base_type = ! empty($this->_req_data['base_type']) ? $this->_req_data['base_type'] : EEM_Price_Type::base_type_base_price;
 
 		switch ($base_type) {
 
@@ -1094,12 +1094,12 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _insert_or_update_price_type( $new_price_type = FALSE ) {
+	protected function _insert_or_update_price_type($new_price_type = FALSE) {
 
 //		echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		// why be so pessimistic ???  : (
@@ -1107,24 +1107,24 @@ 
 
 		$set_column_values = $this->set_price_type_column_values();
 		// is this a new Price ?
-		if ( $new_price_type ) {
+		if ($new_price_type) {
 			// run the insert
-			if ( $PRT_ID = $PRT->insert( $set_column_values )) {
+			if ($PRT_ID = $PRT->insert($set_column_values)) {
 				$success = 1;
 			}
 			$action_desc = 'created';
 		} else {
 			$PRT_ID = absint($this->_req_data['PRT_ID']);
 			// run the update
-			$where_cols_n_values = array('PRT_ID' => $PRT_ID );
-			if ( $PRT->update( $set_column_values, array( $where_cols_n_values ))) {
+			$where_cols_n_values = array('PRT_ID' => $PRT_ID);
+			if ($PRT->update($set_column_values, array($where_cols_n_values))) {
 				$success = 1;
 			}
 			$action_desc = 'updated';
 		}
 
-		$query_args = array( 'action'=> 'edit_price_type', 'id' => $PRT_ID );
-		$this->_redirect_after_action( $success, 'Price Type', $action_desc, $query_args );
+		$query_args = array('action'=> 'edit_price_type', 'id' => $PRT_ID);
+		$this->_redirect_after_action($success, 'Price Type', $action_desc, $query_args);
 
 	}
 
@@ -1138,49 +1138,49 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_price_type( $trash = TRUE ) {
+	protected function _trash_or_restore_price_type($trash = TRUE) {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		require_once(EE_MODELS . 'EEM_Price_Type.model.php');
+		require_once(EE_MODELS.'EEM_Price_Type.model.php');
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		$PRT_deleted = $trash ? TRUE : FALSE;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
-			$what = count( $this->_req_data['checkbox'] ) > 1 ? 'Price Types' : 'Price Type';
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			$what = count($this->_req_data['checkbox']) > 1 ? 'Price Types' : 'Price Type';
 			// cycle thru checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID ) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 					$success = 0;
 				}
 			}
 
 		} else {
 			// grab single id and delete
-			$PRT_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-			if ( empty( $PRT_ID ) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID )) {
+			$PRT_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+			if (empty($PRT_ID) || ! $PRT->update_by_ID(array('PRT_deleted' => $PRT_deleted), $PRT_ID)) {
 				$success = 0;
 			}
 			$what = 'Price Type';
 
 		}
 
-		$query_args = array( 'action' => 'price_types' );
-		if ( $success ) {
-			if ( $trash ) {
+		$query_args = array('action' => 'price_types');
+		if ($success) {
+			if ($trash) {
 				$msg = $success > 1 ? __('The Price Types have been trashed.', 'event_espresso') : __('The Price Type has been trashed.', 'event_espresso');
 			} else {
 				$msg = $success > 1 ? __('The Price Types have been restored.', 'event_espresso') : __('The Price Type has been restored.', 'event_espresso');
 			}
-			EE_Error::add_success( $msg );
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 
 	}
 
@@ -1197,19 +1197,19 @@ 
 	protected function _delete_price_type() {
 
 		//echo '<h3>'. __CLASS__ . '->' . __FUNCTION__ . ' <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h3>';
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$PRT = EEM_Price_Type::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			$what = $PRT->item_name($success);
 			// cycle thru bulk action checkboxes
-			while (list( $PRT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				if (!$PRT->delete_permanently_by_ID($PRT_ID) ) {
+			while (list($PRT_ID, $value) = each($this->_req_data['checkbox'])) {
+				if ( ! $PRT->delete_permanently_by_ID($PRT_ID)) {
 					$success = 0;
 				}
 			}
@@ -1217,8 +1217,8 @@ 
 		}
 
 
-		$query_args = array( 'action'=> 'price_types' );
-		$this->_redirect_after_action( $success, $what, 'deleted', $query_args );
+		$query_args = array('action'=> 'price_types');
+		$this->_redirect_after_action($success, $what, 'deleted', $query_args);
 
 	}
 
@@ -1234,7 +1234,7 @@ 
 	*		@return string
 	*/
 	protected function _learn_more_about_pricing_link() {
-		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how pricing works', 'event_espresso') . '</a>';
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__('learn more about how pricing works', 'event_espresso').'</a>';
 	}
 
 

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,21 +88,21 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	public function do_direct_payment($payment, $billing_info = null) {
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
-		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
+		$order_description  = sprintf(__("Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$item_num = 1;
 			$total_line_item = $transaction->total_line_item();
 			$order_items = array();
 			foreach ($total_line_item->get_items() as $line_item) {
 				$item = array(
 						// Item Name.  127 char max.
-						'l_name' => substr($line_item->name(),0,127),
+						'l_name' => substr($line_item->name(), 0, 127),
 						// Item description.  127 char max.
-						'l_desc' => substr($line_item->desc(),0,127),
+						'l_desc' => substr($line_item->desc(), 0, 127),
 						// Cost of individual item.
 						'l_amt' => $line_item->unit_price(),
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
 				// Item description.  127 char max.
 				'l_desc' => $single_item_desc,
 				// Cost of individual item.
@@ -177,11 +177,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'firstname' => substr($billing_info['first_name'], 0, 25),
 			// Payer's middle name.  25 char max.
 			'middlename' => '',
 			// Payer's last name.  25 char max.
-			'lastname' => substr($billing_info['last_name'],0,25),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -194,13 +194,13 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
 			'zip' => $billing_info['zip'],
 			// Phone Number of payer.  20 char max.
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
 		);
 
 
@@ -210,7 +210,7 @@ 
 			// Required.  Three-letter currency code.  Default is USD.
 			'currencycode' => $payment->currency_code(),
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
-			'itemamt' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($item_amount), //
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
 			'shippingamt' => '',
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -222,10 +222,10 @@ 
 			// Free-form field for your own use.  256 char max.
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
 			// Your own invoice or tracking number
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
 			'notifyurl' => '',
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
 		);
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
 		$PayPalRequestData = array(
@@ -238,32 +238,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		try {
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
 			//remove PCI-sensitive data so it doesn't get stored
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else {
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
 				$payment->set_gateway_response($message);
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
 
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -280,7 +280,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -296,13 +296,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	private function _log_clean_response($response, $payment) {
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
 		unset($response['REQUESTDATA']['ACCT']);
 		unset($response['REQUESTDATA']['EXPDATE']);
 		unset($response['REQUESTDATA']['CVV2']);
 		unset($response['RAWREQUEST']);
-		$this->log(array('Paypal Response'=>$response),$payment);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -327,32 +327,32 @@ 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -360,22 +360,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -399,7 +399,7 @@ 
 	private function _CURLRequest($Request) {
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -449,9 +449,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -467,11 +467,11 @@ 
 
 		$Errors = array();
 		$n = 0;
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
 
 			$CurrentItem = array(
 					'L_ERRORCODE' => $LErrorCode,
@@ -511,7 +511,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

core/db_models/fields/EE_Post_Content_Field.php

Spacing +3 added lines, -3 removed lines

@@ -3,18 +3,18 @@
  * Field to only allow tags that are normally allowed on post_content:
  * address,a,abbr,acronym,area,article,aside,b,big,blockquote,br,button,caption,cite,code,col,del,dd,dfn,details,div,dl,dt,em,fieldset,figure,figcaption,font,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,i,img,ins,kbd,label,legend,li,map,mark,menu,nav,p,pre,q,s,samp,span,section,small,strike,strong,sub,summary,sup,table,tbody,td,textarea,tfoot,th,thead,title,tr,tt,u,ul,ol,var
  */
-class EE_Post_Content_Field extends EE_Full_HTML_Field{
+class EE_Post_Content_Field extends EE_Full_HTML_Field {
 	/**
 	 * removes all tags which a WP Post wouldn't allow in its content normally
 	 * @param string $value_inputted_for_field_on_model_object
 	 * @return string
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		$value_with_select_tags =  wp_kses("$value_inputted_for_field_on_model_object",wp_kses_allowed_html( 'post' ));
+		$value_with_select_tags = wp_kses("$value_inputted_for_field_on_model_object", wp_kses_allowed_html('post'));
 		return parent::prepare_for_set($value_with_select_tags);
 	}
 	
-	function prepare_for_set_from_db($value_found_in_db_for_model_object){
+	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
 		return $value_found_in_db_for_model_object;
 	}
 }
\ No newline at end of file

core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php

Spacing +23 added lines, -23 removed lines

@@ -16,8 +16,8 @@ 
 
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -39,8 +39,8 @@ 
 	 *
 	 * @param \EEHI_File|null $file_helper
 	 */
-	public function __construct( \EEHI_File $file_helper = null ) {
-		if( ! $file_helper ) {
+	public function __construct(\EEHI_File $file_helper = null) {
+		if ( ! $file_helper) {
 			$this->_file_helper = new \EEH_File();
 		}
 	}
@@ -56,39 +56,39 @@ 
 	 * @return string
 	 * @throws \EventEspressoBatchRequest\Helpers\BatchRequestException
 	 */
-	public function create_file_from_job_with_name( $job_id, $filename, $filetype = 'application/ms-excel' ) {
+	public function create_file_from_job_with_name($job_id, $filename, $filetype = 'application/ms-excel') {
 		$filepath = '';
-		try{
+		try {
 			$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-				EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name
+				EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name
 			);
-			if ( $success ) {
+			if ($success) {
 				$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id
 				);
 			}
-			if( $success ) {
-				$filepath = EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS. $filename;
-				$success = $this->_file_helper->ensure_file_exists_and_is_writable( $filepath );
+			if ($success) {
+				$filepath = EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.$filename;
+				$success = $this->_file_helper->ensure_file_exists_and_is_writable($filepath);
 			}
 			//let's add the .htaccess file so safari will open the file properly
-			if( $success ) {
-				$extension = \EEH_File::get_file_extension( $filepath );
+			if ($success) {
+				$extension = \EEH_File::get_file_extension($filepath);
 				\EEH_File::write_to_file(
-					EVENT_ESPRESSO_UPLOAD_DIR . JobHandlerFile::temp_folder_name . DS . $job_id . DS . '.htaccess',
-					'AddType ' . $filetype . ' ' . $extension,
+					EVENT_ESPRESSO_UPLOAD_DIR.JobHandlerFile::temp_folder_name.DS.$job_id.DS.'.htaccess',
+					'AddType '.$filetype.' '.$extension,
 					'.htaccess'
 				);
 			}
 			//those methods normally fail with an exception, but if not, let's do it
-			if( ! $success ) {
-				throw new \EE_Error( 'could_not_create_temp_file',
-				__( 'An unknown error occurred', 'event_espresso' ));
+			if ( ! $success) {
+				throw new \EE_Error('could_not_create_temp_file',
+				__('An unknown error occurred', 'event_espresso'));
 			}
-		} catch( \EE_Error $e ) {
+		} catch (\EE_Error $e) {
 			throw new BatchRequestException(
 				sprintf(
-					__( 'Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso' ),
+					__('Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso'),
 					$job_id,
 					$e->getMessage()
 				),
@@ -104,8 +104,8 @@ 
 	 * @param string $filepath
 	 * @return string url to file
 	 */
-	public function get_url_to_file( $filepath ) {
-		return str_replace( EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath );
+	public function get_url_to_file($filepath) {
+		return str_replace(EVENT_ESPRESSO_UPLOAD_DIR, EVENT_ESPRESSO_UPLOAD_URL, $filepath);
 	}
 }
 

core/libraries/rest_api/controllers/model/Meta.php

Spacing +37 added lines, -37 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\model;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -18,75 +18,75 @@ 
 class Meta extends Base {
 
 
-	public static function handle_request_models_meta( \WP_REST_Request $request ) {
+	public static function handle_request_models_meta(\WP_REST_Request $request) {
 		$controller = new Meta();
 		$matches = $controller->parse_route( 
 			$request->get_route(), 
-			'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . 'resources~', 
-			array( 'version' ) ); 
-		if( $matches instanceof \WP_REST_Response ) {
+			'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'resources~', 
+			array('version') ); 
+		if ($matches instanceof \WP_REST_Response) {
 			return $matches;
 		}
-		$controller->set_requested_version( $matches[ 'version' ] );
-		return $controller->send_response( $controller->_get_models_metadata_entity() );
+		$controller->set_requested_version($matches['version']);
+		return $controller->send_response($controller->_get_models_metadata_entity());
 	}
 
 	/*
 	 * Gets the model metadata resource entity
 	 * @return array for JSON response, describing all the models available in teh requested version
 	 */
-	protected function _get_models_metadata_entity(){
+	protected function _get_models_metadata_entity() {
 		$response = array();
-		foreach( $this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname ){
-			$model = $this->get_model_version_info()->load_model( $model_name );
+		foreach ($this->get_model_version_info()->models_for_requested_version() as $model_name => $model_classname) {
+			$model = $this->get_model_version_info()->load_model($model_name);
 			$fields_json = array();
-			foreach( $this->get_model_version_info()->fields_on_model_in_this_version( $model ) as $field_name => $field_obj ) {
-				if( $this->get_model_version_info()->field_is_ignored( $field_obj ) ) {
+			foreach ($this->get_model_version_info()->fields_on_model_in_this_version($model) as $field_name => $field_obj) {
+				if ($this->get_model_version_info()->field_is_ignored($field_obj)) {
 					continue;
 				}
-				if( $field_obj instanceof \EE_Boolean_Field ) {
+				if ($field_obj instanceof \EE_Boolean_Field) {
 					$datatype = 'Boolean';
-				}elseif( $field_obj->get_wpdb_data_type() == '%d' ) {
+				}elseif ($field_obj->get_wpdb_data_type() == '%d') {
 					$datatype = 'Number';
-				}elseif( $field_name instanceof \EE_Serialized_Text_Field ) {
+				}elseif ($field_name instanceof \EE_Serialized_Text_Field) {
 					$datatype = 'Object';
-				}else{
+				} else {
 					$datatype = 'String';
 				}
 				$default_value = $field_obj->get_default_value();
-				if( $default_value === EE_INF ) {
+				if ($default_value === EE_INF) {
 					$default_value = EE_INF_IN_DB;
-				} elseif( $field_obj instanceof \EE_Datetime_Field &&
-					$default_value instanceof \DateTime ) {
-					$default_value = $default_value->format( 'c' );
+				} elseif ($field_obj instanceof \EE_Datetime_Field &&
+					$default_value instanceof \DateTime) {
+					$default_value = $default_value->format('c');
 				}
 				$field_json = array(
 					'name' => $field_name,
 					'nicename' => $field_obj->get_nicename(),
-					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format( $field_obj ),
-					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format( $field_obj ),
-					'type' => str_replace('EE_', '', get_class( $field_obj ) ),
+					'has_rendered_format' => $this->get_model_version_info()->field_has_rendered_format($field_obj),
+					'has_pretty_format' => $this->get_model_version_info()->field_has_pretty_format($field_obj),
+					'type' => str_replace('EE_', '', get_class($field_obj)),
 					'datatype' => $datatype,
 					'nullable' => $field_obj->is_nullable(),
 					'default' => $default_value,
 					'table_alias' => $field_obj->get_table_alias(),
 					'table_column' => $field_obj->get_table_column(),
 				);
-				$fields_json[ $field_json[ 'name' ] ] = $field_json;
+				$fields_json[$field_json['name']] = $field_json;
 
 			}
-			$fields_json = array_merge( $fields_json, $this->get_model_version_info()->extra_resource_properties_for_model( $model ) );
-			$response[ $model_name ]['fields'] = apply_filters( 'FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model );
+			$fields_json = array_merge($fields_json, $this->get_model_version_info()->extra_resource_properties_for_model($model));
+			$response[$model_name]['fields'] = apply_filters('FHEE__Meta__handle_request_models_meta__fields', $fields_json, $model);
 			$relations_json = array();
-			foreach( $model->relation_settings()  as $relation_name => $relation_obj ) {
+			foreach ($model->relation_settings()  as $relation_name => $relation_obj) {
 				$relation_json = array(
 					'name' => $relation_name,
-					'type' => str_replace( 'EE_', '', get_class( $relation_obj ) ),
+					'type' => str_replace('EE_', '', get_class($relation_obj)),
 					'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false,
 				);
-				$relations_json[ $relation_name ] = $relation_json;
+				$relations_json[$relation_name] = $relation_json;
 			}
-			$response[ $model_name ][ 'relations' ] = apply_filters( 'FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model );
+			$response[$model_name]['relations'] = apply_filters('FHEE__Meta__handle_request_models_meta__relations', $relations_json, $model);
 		}
 		return $response;
 	}
@@ -96,23 +96,23 @@ 
 	 * @param WP_REST_Response $rest_response_obj
 	 * @return WP_REST_Response
 	 */
-	public static function filter_ee_metadata_into_index( $rest_response_obj ) {
+	public static function filter_ee_metadata_into_index($rest_response_obj) {
 		$response_data = $rest_response_obj->get_data();
 		$addons = array();
-		foreach( \EE_Registry::instance()->addons as $addon){
+		foreach (\EE_Registry::instance()->addons as $addon) {
 			$addon_json = array(
 				'name' => $addon->name(),
 				'version' => $addon->version()
 			);
-			$addons[ $addon_json[ 'name' ] ] = $addon_json;
+			$addons[$addon_json['name']] = $addon_json;
 		}
-		$response_data[ 'ee' ] = array(
+		$response_data['ee'] = array(
 			'version' => \EEM_System_Status::instance()->get_ee_version(),
 			'addons' => $addons,
 			'maintenance_mode' => \EE_Maintenance_Mode::instance()->real_level(),
-			'served_core_versions' => array_keys( \EED_Core_Rest_Api::versions_served() )
+			'served_core_versions' => array_keys(\EED_Core_Rest_Api::versions_served())
 		);
-		$rest_response_obj->set_data( $response_data );
+		$rest_response_obj->set_data($response_data);
 		return $rest_response_obj;
 	}
 }

core/EE_Capabilities.core.php

Spacing +127 added lines, -127 removed lines

@@ -7,8 +7,8 @@ 
  * @package Event Espresso
  * @subpackage core, capabilities
  */
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -69,7 +69,7 @@ 
 	 */
 	public static function instance() {
 		//check if instantiated, and if not do so.
-		if ( ! self::$_instance instanceof EE_Capabilities ) {
+		if ( ! self::$_instance instanceof EE_Capabilities) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -98,10 +98,10 @@ 
 	 * @since 4.5.0
 	 * @return void
 	 */
-	public function init_caps( $reset = false ) {
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+	public function init_caps($reset = false) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			$this->_caps_map = $this->_init_caps_map();
-			$this->init_role_caps( $reset );
+			$this->init_role_caps($reset);
 			$this->_set_meta_caps();
 		}
 	}
@@ -120,11 +120,11 @@ 
 		//make sure we're only ever initializing the default _meta_caps array once if it's empty.
 		$this->_meta_caps = $this->_get_default_meta_caps_array();
 
-		$this->_meta_caps = apply_filters( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps );
+		$this->_meta_caps = apply_filters('FHEE__EE_Capabilities___set_meta_caps__meta_caps', $this->_meta_caps);
 
 		//add filter for map_meta_caps but only if models can query.
-		if ( EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ) ) ) {
-			add_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10, 4 );
+		if (EE_Maintenance_Mode::instance()->models_can_query() && ! has_filter('map_meta_cap', array($this, 'map_meta_caps'))) {
+			add_filter('map_meta_cap', array($this, 'map_meta_caps'), 10, 4);
 		}
 	}
 
@@ -137,37 +137,37 @@ 
 	 */
 	private function _get_default_meta_caps_array() {
 		static $default_meta_caps = array();
-		if ( empty( $default_meta_caps ) ) {
+		if (empty($default_meta_caps)) {
 			$default_meta_caps = array(
 				//edits
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_event', array( 'Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_venue', array( 'Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_registration', array( 'Registration', '', 'ee_edit_others_registrations', '' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_checkin', array( 'Registration', '', 'ee_edit_others_checkins', '' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_edit_message', array( 'Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_default_ticket', array( 'Ticket', '', 'ee_edit_others_default_tickets', '' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question', array( 'Question', '', '', 'ee_edit_system_questions' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_edit_question_group', array( 'Question_Group', '', '', 'ee_edit_system_question_groups' ) ),
-				new EE_Meta_Capability_Map_Edit( 'ee_edit_payment_method', array( 'Payment_Method', '', 'ee_edit_others_payment_methods', '' ) ),
+				new EE_Meta_Capability_Map_Edit('ee_edit_event', array('Event', 'ee_edit_published_events', 'ee_edit_others_events', 'ee_edit_private_events')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_venue', array('Venue', 'ee_edit_published_venues', 'ee_edit_others_venues', 'ee_edit_private_venues')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_registration', array('Registration', '', 'ee_edit_others_registrations', '')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_checkin', array('Registration', '', 'ee_edit_others_checkins', '')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_edit_message', array('Message_Template_Group', '', 'ee_edit_others_messages', 'ee_edit_global_messages')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_default_ticket', array('Ticket', '', 'ee_edit_others_default_tickets', '')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question', array('Question', '', '', 'ee_edit_system_questions')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_edit_question_group', array('Question_Group', '', '', 'ee_edit_system_question_groups')),
+				new EE_Meta_Capability_Map_Edit('ee_edit_payment_method', array('Payment_Method', '', 'ee_edit_others_payment_methods', '')),
 				//reads
-				new EE_Meta_Capability_Map_Read( 'ee_read_event', array( 'Event', '', 'ee_read_others_events', 'ee_read_private_events' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_venue', array( 'Venue', '', 'ee_read_others_venues', 'ee_read_private_venues' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_registration', array( 'Registration', '', '', 'ee_edit_others_registrations' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_checkin', array( 'Registration', '', '', 'ee_read_others_checkins' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_read_message', array( 'Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_default_ticket', array( 'Ticket', '', '', 'ee_read_others_default_tickets' ) ),
-				new EE_Meta_Capability_Map_Read( 'ee_read_payment_method', array( 'Payment_Method', '', '', 'ee_read_others_payment_methods' ) ),
+				new EE_Meta_Capability_Map_Read('ee_read_event', array('Event', '', 'ee_read_others_events', 'ee_read_private_events')),
+				new EE_Meta_Capability_Map_Read('ee_read_venue', array('Venue', '', 'ee_read_others_venues', 'ee_read_private_venues')),
+				new EE_Meta_Capability_Map_Read('ee_read_registration', array('Registration', '', '', 'ee_edit_others_registrations')),
+				new EE_Meta_Capability_Map_Read('ee_read_checkin', array('Registration', '', '', 'ee_read_others_checkins')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_read_message', array('Message_Template_Group', '', 'ee_read_others_messages', 'ee_read_global_messages')),
+				new EE_Meta_Capability_Map_Read('ee_read_default_ticket', array('Ticket', '', '', 'ee_read_others_default_tickets')),
+				new EE_Meta_Capability_Map_Read('ee_read_payment_method', array('Payment_Method', '', '', 'ee_read_others_payment_methods')),
 
 				//deletes
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_event', array( 'Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_venue', array( 'Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_registration', array( 'Registration', '', 'ee_delete_others_registrations', '' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_checkin', array( 'Registration', '', 'ee_delete_others_checkins', '' ) ),
-				new EE_Meta_Capability_Map_Messages_Cap( 'ee_delete_message', array( 'Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_default_ticket', array( 'Ticket', '', 'ee_delete_others_default_tickets', '' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question', array( 'Question', '', '', 'delete_system_questions' ) ),
-				new EE_Meta_Capability_Map_Registration_Form_Cap( 'ee_delete_question_group', array( 'Question_Group', '', '', 'delete_system_question_groups' ) ),
-				new EE_Meta_Capability_Map_Delete( 'ee_delete_payment_method', array( 'Payment_Method', '', 'ee_delete_others_payment_methods', '' ) ),
+				new EE_Meta_Capability_Map_Delete('ee_delete_event', array('Event', 'ee_delete_published_events', 'ee_delete_others_events', 'ee_delete_private_events')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_venue', array('Venue', 'ee_delete_published_venues', 'ee_delete_others_venues', 'ee_delete_private_venues')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_registration', array('Registration', '', 'ee_delete_others_registrations', '')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_checkin', array('Registration', '', 'ee_delete_others_checkins', '')),
+				new EE_Meta_Capability_Map_Messages_Cap('ee_delete_message', array('Message_Template_Group', '', 'ee_delete_others_messages', 'ee_delete_global_messages')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_default_ticket', array('Ticket', '', 'ee_delete_others_default_tickets', '')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question', array('Question', '', '', 'delete_system_questions')),
+				new EE_Meta_Capability_Map_Registration_Form_Cap('ee_delete_question_group', array('Question_Group', '', '', 'delete_system_question_groups')),
+				new EE_Meta_Capability_Map_Delete('ee_delete_payment_method', array('Payment_Method', '', 'ee_delete_others_payment_methods', '')),
 			);
 		}
 		return $default_meta_caps;
@@ -191,15 +191,15 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
 		//loop through our _meta_caps array
-		foreach ( $this->_meta_caps as $meta_map ) {
-			if ( ! $meta_map instanceof EE_Meta_Capability_Map ) {
+		foreach ($this->_meta_caps as $meta_map) {
+			if ( ! $meta_map instanceof EE_Meta_Capability_Map) {
 				continue;
 			}
 			$meta_map->ensure_is_model();
 
-			$caps = $meta_map->map_meta_caps( $caps, $cap, $user_id, $args );
+			$caps = $meta_map->map_meta_caps($caps, $cap, $user_id, $args);
 		}
 		return $caps;
 	}
@@ -364,7 +364,7 @@ 
 				)
 			);
 
-		$caps = apply_filters( 'FHEE__EE_Capabilities__init_caps_map__caps', $caps );
+		$caps = apply_filters('FHEE__EE_Capabilities__init_caps_map__caps', $caps);
 		return $caps;
 	}
 
@@ -381,26 +381,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function init_role_caps( $reset = false, $custom_map = array() ) {
+	public function init_role_caps($reset = false, $custom_map = array()) {
 
-		$caps_map = empty( $custom_map ) ? $this->_caps_map : $custom_map;
+		$caps_map = empty($custom_map) ? $this->_caps_map : $custom_map;
 
 		//first let's determine if these caps have already been set.
-		$caps_set_before = get_option( self::option_name, array() );
+		$caps_set_before = get_option(self::option_name, array());
 		//if not reset, see what caps are new for each role. if they're new, add them.
-		foreach ( $caps_map as $role => $caps_for_role ) {
-			foreach ( $caps_for_role as $cap ) {
+		foreach ($caps_map as $role => $caps_for_role) {
+			foreach ($caps_for_role as $cap) {
 				//first check we haven't already added this cap before, or it's a reset
-				if ( $reset || ! isset( $caps_set_before[ $role ] ) || ! in_array( $cap, $caps_set_before[ $role ] ) ) {
-					$this->add_cap_to_role( $role, $cap );
-					$caps_set_before[ $role ][] = $cap;
+				if ($reset || ! isset($caps_set_before[$role]) || ! in_array($cap, $caps_set_before[$role])) {
+					$this->add_cap_to_role($role, $cap);
+					$caps_set_before[$role][] = $cap;
 				}
 			}
 		}
 
 		//now let's just save the cap that has been set.
-		update_option( self::option_name, $caps_set_before );
-		do_action( 'AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before );
+		update_option(self::option_name, $caps_set_before);
+		do_action('AHEE__EE_Capabilities__init_role_caps__complete', $caps_set_before);
 	}
 
 
@@ -419,10 +419,10 @@ 
 	 * @param bool $grant  Whether to grant access to this cap on this role.
 	 * @return void
 	 */
-	public function add_cap_to_role( $role, $cap, $grant = true ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->add_cap( $cap, $grant );
+	public function add_cap_to_role($role, $cap, $grant = true) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->add_cap($cap, $grant);
 		}
 	}
 
@@ -442,10 +442,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function remove_cap_from_role( $role, $cap ) {
-		$role = get_role( $role );
-		if ( $role instanceof WP_Role ) {
-			$role->remove_cap( $cap );
+	public function remove_cap_from_role($role, $cap) {
+		$role = get_role($role);
+		if ($role instanceof WP_Role) {
+			$role->remove_cap($cap);
 		}
 	}
 
@@ -466,11 +466,11 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can( $cap, $context, $id = 0 ) {
+	public function current_user_can($cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap__' . $context,  $cap, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id );
-		return ! empty( $id ) ? current_user_can( $filtered_cap, $id ) : current_user_can( $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap__'.$context, $cap, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__current_user_can__cap', $filtered_cap, $context, $cap, $id);
+		return ! empty($id) ? current_user_can($filtered_cap, $id) : current_user_can($filtered_cap);
 	}
 
 
@@ -487,11 +487,11 @@ 
 	 *
 	 * @return bool Whether user can or not.
 	 */
-	public function user_can( $user, $cap, $context, $id = 0 ) {
+	public function user_can($user, $cap, $context, $id = 0) {
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap__' . $context, $cap, $user, $id );
-		$filtered_cap = apply_filters( 'FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user,  $id );
-		return ! empty( $id ) ? user_can( $user, $filtered_cap, $id ) : user_can( $user, $filtered_cap );
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap__'.$context, $cap, $user, $id);
+		$filtered_cap = apply_filters('FHEE__EE_Capabilities__user_can__cap', $filtered_cap, $context, $cap, $user, $id);
+		return ! empty($id) ? user_can($user, $filtered_cap, $id) : user_can($user, $filtered_cap);
 	}
 
 
@@ -511,12 +511,12 @@ 
 	 *
 	 * @return bool  Whether user can or not.
 	 */
-	public function current_user_can_for_blog( $blog_id, $cap, $context, $id = 0 ) {
-		$user_can = ! empty( $id ) ? current_user_can_for_blog( $blog_id, $cap, $id ) : current_user_can( $blog_id, $cap );
+	public function current_user_can_for_blog($blog_id, $cap, $context, $id = 0) {
+		$user_can = ! empty($id) ? current_user_can_for_blog($blog_id, $cap, $id) : current_user_can($blog_id, $cap);
 
 		//apply filters (both a global on just the cap, and context specific.  Global overrides context specific)
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can__' . $context, $user_can, $blog_id, $cap, $id );
-		$user_can = apply_filters( 'FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id );
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can__'.$context, $user_can, $blog_id, $cap, $id);
+		$user_can = apply_filters('FHEE__EE_Capabilities__current_user_can_for_blog__user_can', $user_can, $context, $blog_id, $cap, $id);
 		return $user_can;
 	}
 
@@ -532,12 +532,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_ee_capabilities( $role = 'administrator' ) {
+	public function get_ee_capabilities($role = 'administrator') {
 		$capabilities = $this->_init_caps_map();
-		if ( empty( $role ) ) {
+		if (empty($role)) {
 			return $capabilities;
 		}
-		return isset( $capabilities[ $role ] ) ? $capabilities[ $role ] : array();
+		return isset($capabilities[$role]) ? $capabilities[$role] : array();
 	}
 }
 
@@ -585,11 +585,11 @@ 
 	 * 	}
 	 * @throws EE_Error
 	 */
-	public function __construct( $meta_cap, $map_values ) {
+	public function __construct($meta_cap, $map_values) {
 		$this->meta_cap = $meta_cap;
 		//verify there are four args in the $map_values array;
-		if ( count( $map_values ) !== 4 ) {
-			throw new EE_Error( sprintf( __( 'Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso' ), '<br>' . print_r( $map_values, true ) ) );
+		if (count($map_values) !== 4) {
+			throw new EE_Error(sprintf(__('Incoming $map_values array should have a count of four values in it.  This is what was given: %s', 'event_espresso'), '<br>'.print_r($map_values, true)));
 		}
 
 		//set properties
@@ -603,8 +603,8 @@ 
 	/**
 	 * Makes it so this object stops filtering caps
 	 */
-	public function remove_filters(){
-		remove_filter( 'map_meta_cap', array( $this, 'map_meta_caps' ), 10 );
+	public function remove_filters() {
+		remove_filter('map_meta_cap', array($this, 'map_meta_caps'), 10);
 	}
 
 
@@ -619,19 +619,19 @@ 
 	 */
 	public function ensure_is_model() {
 		//is it already instantiated?
-		if ( $this->_model instanceof EEM_Base ) {
+		if ($this->_model instanceof EEM_Base) {
 			return;
 		}
 
 		//ensure model name is string
 		$this->_model_name = (string) $this->_model_name;
 		//error proof if the name has EEM in it
-		$this->_model_name = str_replace( 'EEM', '', $this->_model_name );
+		$this->_model_name = str_replace('EEM', '', $this->_model_name);
 
-		$this->_model = EE_Registry::instance()->load_model( $this->_model_name );
+		$this->_model = EE_Registry::instance()->load_model($this->_model_name);
 
-		if ( ! $this->_model instanceof EEM_Base ) {
-			throw new EE_Error( sprintf( __( 'This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso' ), get_class( $this ), $this->_model ) );
+		if ( ! $this->_model instanceof EEM_Base) {
+			throw new EE_Error(sprintf(__('This string passed in to %s to represent a EEM_Base model class was not able to be used to instantiate the class.   Please ensure that the string is a match for the EEM_Base model name (not including the EEM_ part). This was given: %s', 'event_espresso'), get_class($this), $this->_model));
 		}
 	}
 
@@ -647,8 +647,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return $this->_map_meta_caps( $caps, $cap, $user_id, $args );
+	public function map_meta_caps($caps, $cap, $user_id, $args) {
+		return $this->_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 
 
@@ -666,7 +666,7 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	abstract protected function _map_meta_caps( $caps, $cap, $user_id, $args );
+	abstract protected function _map_meta_caps($caps, $cap, $user_id, $args);
 }
 
 
@@ -698,28 +698,28 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
+		if ($obj instanceof EE_CPT_Base) {
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-				if ( empty( $this->published_cap ) ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+				if (empty($this->published_cap)) {
 					$caps[] = $cap;
 				} else {
 					//if obj is published...
-					if ( $obj->status() == 'publish' ) {
+					if ($obj->status() == 'publish') {
 						$caps[] = $this->published_cap;
 					} else {
 						$caps[] = $cap;
@@ -727,21 +727,21 @@ 
 				}
 			} else {
 				//the user is trying to edit someone else's obj
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
-				if ( ! empty( $this->published_cap ) && $obj->status() == 'publish' ) {
+				if ( ! empty($this->published_cap) && $obj->status() == 'publish') {
 					$caps[] = $this->published_cap;
-				} elseif ( ! empty( $this->private_cap ) && $obj->status() == 'private' ) {
+				} elseif ( ! empty($this->private_cap) && $obj->status() == 'private') {
 					$caps[] = $this->private_cap;
 				}
 			}
 		} else {
 			//not a cpt object so handled differently
-			if ( method_exists( $obj, 'wp_user' ) && $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if (method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
 			} else {
-				if ( ! empty( $this->others_cap ) ) {
+				if ( ! empty($this->others_cap)) {
 					$caps[] = $this->others_cap;
 				}
 			}
@@ -778,8 +778,8 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
-		return parent::_map_meta_caps( $caps, $cap, $user_id, $args );
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
+		return parent::_map_meta_caps($caps, $cap, $user_id, $args);
 	}
 }
 
@@ -811,45 +811,45 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped cap;
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
-		if ( $obj instanceof EE_CPT_Base ) {
-			$status_obj = get_post_status_object( $obj->status() );
-			if ( $status_obj->public ) {
+		if ($obj instanceof EE_CPT_Base) {
+			$status_obj = get_post_status_object($obj->status());
+			if ($status_obj->public) {
 				$caps[] = $cap;
 				return $caps;
 			}
 
 			//if the item author is set and the user is the author...
-			if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if ($obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
-			} elseif ( $status_obj->private && ! empty( $this->private_cap ) ) {
+			} elseif ($status_obj->private && ! empty($this->private_cap)) {
 				//the user is trying to view someone else's obj
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
 			}
 		} else {
 			//not a cpt object so handled differently
-			if ( method_exists( $obj, 'wp_user' ) && $obj->wp_user() && $user_id == $obj->wp_user() ) {
+			if (method_exists($obj, 'wp_user') && $obj->wp_user() && $user_id == $obj->wp_user()) {
 				$caps[] = $cap;
-			} elseif ( ! empty( $this->private_cap ) ) {
+			} elseif ( ! empty($this->private_cap)) {
 				$caps[] = $this->private_cap;
-			} elseif ( ! empty( $this->others_cap ) ) {
+			} elseif ( ! empty($this->others_cap)) {
 				$caps[] = $this->others_cap;
 			} else {
 				$caps[] = $cap;
@@ -886,30 +886,30 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Message_Template_Group ) {
+		if ( ! $obj instanceof EE_Message_Template_Group) {
 			$caps[] = $cap;
 			return $caps;
 		}
 
 		$is_global = $obj->is_global();
 
-		if ( $obj->wp_user() && $user_id == $obj->wp_user() ) {
-			if ( $is_global ) {
-				$caps[]  = $this->private_cap;
+		if ($obj->wp_user() && $user_id == $obj->wp_user()) {
+			if ($is_global) {
+				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $cap;
 			}
 		} else {
-			if ( $is_global ) {
+			if ($is_global) {
 				$caps[] = $this->private_cap;
 			} else {
 				$caps[] = $this->others_cap;
@@ -947,16 +947,16 @@ 
 	 *
 	 * @return array   actual users capabilities
 	 */
-	protected function _map_meta_caps( $caps, $cap, $user_id, $args ) {
+	protected function _map_meta_caps($caps, $cap, $user_id, $args) {
 		//only process if we're checking our mapped_cap
-		if ( $cap !== $this->meta_cap ) {
+		if ($cap !== $this->meta_cap) {
 			return $caps;
 		}
 
-		$obj = ! empty( $args[0] ) ? $this->_model->get_one_by_ID( $args[0] ) : null;
+		$obj = ! empty($args[0]) ? $this->_model->get_one_by_ID($args[0]) : null;
 
 		//if no obj then let's just do cap
-		if ( ! $obj instanceof EE_Base_Class ) {
+		if ( ! $obj instanceof EE_Base_Class) {
 			$caps[] = $cap;
 			return $caps;
 		}
@@ -964,7 +964,7 @@ 
 		$is_system = $obj instanceof EE_Question_Group ? $obj->system_group() : false;
 		$is_system = $obj instanceof EE_Question ? $obj->is_system_question() : $is_system;
 
-		if ( $is_system ) {
+		if ($is_system) {
 			$caps[] = $this->private_cap;
 		} else {
 			$caps[] = $cap;

core/EE_System.core.php

Spacing +255 added lines, -255 removed lines

@@ -102,7 +102,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_System ) {
+		if ( ! self::$_instance instanceof EE_System) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -113,12 +113,12 @@ 
 	 * resets the instance and returns it
 	 * @return EE_System
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance->_req_type = NULL;
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		EE_Data_Migration_Manager::reset();
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations');
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 		self::instance()->detect_activations_or_upgrades();
 		self::instance()->perform_activations_upgrades_and_migrations();
 		return self::instance();
@@ -134,26 +134,26 @@ 
 	 * @access    private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_System__construct__begin', $this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-		add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'load_espresso_addons' ) );
+		add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'load_espresso_addons'));
 		// when an ee addon is activated, we want to call the core hook(s) again
 		// because the newly-activated addon didn't get a chance to run at all
-		add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 );
+		add_action('activate_plugin', array($this, 'load_espresso_addons'), 1);
 		// detect whether install or upgrade
-		add_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades', array( $this, 'detect_activations_or_upgrades' ), 3 );
+		add_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades', array($this, 'detect_activations_or_upgrades'), 3);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 5 );
+		add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 5);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 );
+		add_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_modules_and_widgets'), 7);
 		// you wanna get going? I wanna get going... let's get going!
-		add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 9 );
+		add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 9);
 		//other housekeeping
 		//exclude EE critical pages from wp_list_pages
-		add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+		add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 		// ALL EE Addons should use the following hook point to attach their initial setup too
 		// it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads
-		do_action( 'AHEE__EE_System__construct__complete', $this );
+		do_action('AHEE__EE_System__construct__complete', $this);
 	}
 
 
@@ -173,13 +173,13 @@ 
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
 		//load and setup EE_Capabilities
-		EE_Registry::instance()->load_core( 'Capabilities' );
+		EE_Registry::instance()->load_core('Capabilities');
 		//caps need to be initialized on every request so that capability maps are set.
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/8674
 		EE_Registry::instance()->CAP->init_caps();
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		do_action('AHEE__EE_System__load_espresso_addons');
 	}
 
 
@@ -194,10 +194,10 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function detect_activations_or_upgrades(){
+	public function detect_activations_or_upgrades() {
 		//first off: let's make sure to handle core
 		$this->detect_if_activation_or_upgrade();
-		foreach(EE_Registry::instance()->addons as $addon){
+		foreach (EE_Registry::instance()->addons as $addon) {
 			//detect teh request type for that addon
 			$addon->detect_activation_or_upgrade();
 		}
@@ -218,44 +218,44 @@ 
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
 		// load M-Mode class
-		EE_Registry::instance()->load_core( 'Maintenance_Mode' );
+		EE_Registry::instance()->load_core('Maintenance_Mode');
 		// check if db has been updated, or if its a brand-new installation
 
 		$espresso_db_update = $this->fix_espresso_db_upgrade_option();
-		$request_type =  $this->detect_req_type($espresso_db_update);
+		$request_type = $this->detect_req_type($espresso_db_update);
 		//EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ );
-		if( $request_type != EE_System::req_type_normal){
+		if ($request_type != EE_System::req_type_normal) {
 			EE_Registry::instance()->load_helper('Activation');
 		}
 
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade');
 				//migrations may be required now that we've upgraded
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 //				echo "done upgrade";die;
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade');
 				//its possible migrations are no longer required
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_normal:
 			default:
 //				$this->_maybe_redirect_to_ee_about();
 				break;
 		}
-		do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' );
+		do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete');
 	}
 
 	/**
@@ -263,10 +263,10 @@ 
 	 * initializing the database later during the request
 	 * @param array $espresso_db_update
 	 */
-	protected function _handle_core_version_change( $espresso_db_update ){
-		$this->update_list_of_installed_versions( $espresso_db_update );
+	protected function _handle_core_version_change($espresso_db_update) {
+		$this->update_list_of_installed_versions($espresso_db_update);
 		//get ready to verify the DB is ok (provided we aren't in maintenance mode, of course)
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ));
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -281,44 +281,44 @@ 
 	 * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table
 	 * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction
 	 */
-	private function fix_espresso_db_upgrade_option($espresso_db_update = null){
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update );
-		if( ! $espresso_db_update){
-			$espresso_db_update = get_option( 'espresso_db_update' );
+	private function fix_espresso_db_upgrade_option($espresso_db_update = null) {
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update);
+		if ( ! $espresso_db_update) {
+			$espresso_db_update = get_option('espresso_db_update');
 		}
 		// check that option is an array
-		if( ! is_array( $espresso_db_update )) {
+		if ( ! is_array($espresso_db_update)) {
 			// if option is FALSE, then it never existed
-			if ( $espresso_db_update === FALSE ) {
+			if ($espresso_db_update === FALSE) {
 				// make $espresso_db_update an array and save option with autoload OFF
-				$espresso_db_update =  array();
-				add_option( 'espresso_db_update', $espresso_db_update, '', 'no' );
+				$espresso_db_update = array();
+				add_option('espresso_db_update', $espresso_db_update, '', 'no');
 			} else {
 				// option is NOT FALSE but also is NOT an array, so make it an array and save it
-				$espresso_db_update =  array( $espresso_db_update=>array() );
-				update_option( 'espresso_db_update', $espresso_db_update );
+				$espresso_db_update = array($espresso_db_update=>array());
+				update_option('espresso_db_update', $espresso_db_update);
 			}
-		}else{
+		} else {
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
-			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
-				if(is_int($should_be_version_string) && ! is_array($should_be_array)){
+			foreach ($espresso_db_update as $should_be_version_string => $should_be_array) {
+				if (is_int($should_be_version_string) && ! is_array($should_be_array)) {
 					//the key is an int, and the value IS NOT an array
 					//so it must be numerically-indexed, where values are versions installed...
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else {
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
 			}
 			$espresso_db_update = $corrected_db_update;
-			update_option( 'espresso_db_update', $espresso_db_update );
+			update_option('espresso_db_update', $espresso_db_update);
 
 		}
 
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update );
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update);
 		return $espresso_db_update;
 	}
 
@@ -337,33 +337,33 @@ 
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){
+	public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) {
 		$request_type = $this->detect_req_type();
 		//only initialize system if we're not in maintenance mode.
-		if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			update_option('ee_flush_rewrite_rules', TRUE);
 			EEH_Activation::system_initialization();
-			if( $verify_schema ) {
+			if ($verify_schema) {
 				EEH_Activation::initialize_db_and_folders();
 			}
 			EEH_Activation::initialize_db_content();
-			if( $initialize_addons_too ) {
+			if ($initialize_addons_too) {
 				$this->initialize_addons();
 			}
-		}else{
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
+		} else {
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core');
 		}
-		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
-			add_action( 'AHEE__EE_System__load_CPTs_and_session__start', array( $this, 'redirect_to_about_ee' ), 9 );
+		if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) {
+			add_action('AHEE__EE_System__load_CPTs_and_session__start', array($this, 'redirect_to_about_ee'), 9);
 		}
 	}
 
 	/**
 	 * Initializes the db for all registered addons
 	 */
-	public function initialize_addons(){
+	public function initialize_addons() {
 		//foreach registered addon, make sure its db is up-to-date too
-		foreach(EE_Registry::instance()->addons as $addon){
+		foreach (EE_Registry::instance()->addons as $addon) {
 			$addon->initialize_db_if_no_migrations_required();
 		}
 	}
@@ -375,16 +375,16 @@ 
 	 * @param 	string 	$current_version_to_add 	version to be added to the version history
 	 * @return 	boolean success as to whether or not this option was changed
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->fix_espresso_db_upgrade_option($version_history);
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = espresso_version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// re-save
-		return update_option( 'espresso_db_update', $version_history );
+		return update_option('espresso_db_update', $version_history);
 	}
 
 
@@ -401,10 +401,10 @@ 
 	 *                            but still know if this is a new install or not
 	 * @return int one of the constants on EE_System::req_type_
 	 */
-	public function detect_req_type( $espresso_db_update = NULL ){
-		if ( $this->_req_type === NULL ){
-			$espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
-			$this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() );
+	public function detect_req_type($espresso_db_update = NULL) {
+		if ($this->_req_type === NULL) {
+			$espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
+			$this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version());
 		}
 		return $this->_req_type;
 	}
@@ -420,39 +420,39 @@ 
 	 * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version())
 	 * @return int one of the constants on EE_System::req_type_*
 	 */
-	public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){
-		$version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to );
-		if( $activation_history_for_addon ){
+	public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) {
+		$version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to);
+		if ($activation_history_for_addon) {
 			//it exists, so this isn't a completely new install
 			//check if this version already in that list of previously installed versions
-			if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) {
+			if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) {
 				//it a version we haven't seen before
-				if( $version_is_higher === 1 ){
+				if ($version_is_higher === 1) {
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else {
 					$req_type = EE_System::req_type_downgrade;
 				}
-				delete_option( $activation_indicator_option_name );
+				delete_option($activation_indicator_option_name);
 			} else {
 				// its not an update. maybe a reactivation?
-				if( get_option( $activation_indicator_option_name, FALSE ) ){
-					if ( $version_is_higher === -1 ){
+				if (get_option($activation_indicator_option_name, FALSE)) {
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
-					delete_option( $activation_indicator_option_name );
+					delete_option($activation_indicator_option_name);
 				} else {
 					//we've seen this version before and the activation indicate doesn't show it was just activated
-					if ( $version_is_higher === -1 ){
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}
@@ -460,7 +460,7 @@ 
 		} else {
 			//brand new install
 			$req_type = EE_System::req_type_new_activation;
-			delete_option( $activation_indicator_option_name );
+			delete_option($activation_indicator_option_name);
 		}
 		return $req_type;
 	}
@@ -478,30 +478,30 @@ 
 	 *		0 if $version_to_upgrade_to MATCHES (reactivation or normal request);
 	 *		1 if $version_to_upgrade_to is HIGHER (upgrade) ;
 	 */
-	protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){
+	protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) {
 		//find the most recently-activated version
 		$most_recently_active_version_activation = '1970-01-01 00:00:00';
 		$most_recently_active_version = '0.0.0.dev.000';
-		if( is_array( $activation_history_for_addon ) ){
-			foreach( $activation_history_for_addon as $version => $times_activated ){
+		if (is_array($activation_history_for_addon)) {
+			foreach ($activation_history_for_addon as $version => $times_activated) {
 				//check there is a record of when this version was activated. Otherwise,
 				//mark it as unknown
-				if( ! $times_activated ){
-					$times_activated = array( 'unknown-date');
+				if ( ! $times_activated) {
+					$times_activated = array('unknown-date');
 				}
-				if( is_string( $times_activated ) ){
-					$times_activated = array( $times_activated );
+				if (is_string($times_activated)) {
+					$times_activated = array($times_activated);
 				}
-				foreach( $times_activated as $an_activation ){
-					if( $an_activation != 'unknown-date' &&
-							$an_activation > $most_recently_active_version_activation  ){
+				foreach ($times_activated as $an_activation) {
+					if ($an_activation != 'unknown-date' &&
+							$an_activation > $most_recently_active_version_activation) {
 						$most_recently_active_version = $version;
 						$most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation;
 					}
 				}
 			}
 		}
-		return version_compare( $version_to_upgrade_to, $most_recently_active_version );
+		return version_compare($version_to_upgrade_to, $most_recently_active_version);
 	}
 
 
@@ -511,20 +511,20 @@ 
 	 * @return void
 	 */
 	public function redirect_to_about_ee() {
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		//if current user is an admin and it's not an ajax request
-		if(EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'espresso_about_default' ) && ! ( defined('DOING_AJAX') && DOING_AJAX  ) && ! isset( $notices[ 'errors' ] ) ){
-			$query_params =  array( 'page' => 'espresso_about' );
+		if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'espresso_about_default') && ! (defined('DOING_AJAX') && DOING_AJAX) && ! isset($notices['errors'])) {
+			$query_params = array('page' => 'espresso_about');
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) {
 			    $query_params['new_activation'] = TRUE;
 			}
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) {
 			    $query_params['reactivation'] = TRUE;
 			}
-			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
-			wp_safe_redirect( $url );
+			$url = add_query_arg($query_params, admin_url('admin.php'));
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -538,31 +538,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
-		EE_Registry::instance()->load_core( 'EE_Load_Textdomain' );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
+		EE_Registry::instance()->load_core('EE_Load_Textdomain');
 		//load textdomain
 		EE_Load_Textdomain::load_textdomain();
 		// load and setup EE_Config and EE_Network_Config
-		EE_Registry::instance()->load_core( 'Config' );
-		EE_Registry::instance()->load_core( 'Network_Config' );
+		EE_Registry::instance()->load_core('Config');
+		EE_Registry::instance()->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			EE_Registry::instance()->load_core( 'Log' );
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			EE_Registry::instance()->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -571,23 +571,23 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$shortname = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$shortname = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
 				$non_abstract_db_models[$shortname] = $classname;
 			}
-			$model_names[ $shortname ] = $classname;
+			$model_names[$shortname] = $classname;
 		}
-		EE_Registry::instance()->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
-		EE_Registry::instance()->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models );
+		EE_Registry::instance()->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
+		EE_Registry::instance()->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models);
 	}
 
 
@@ -597,8 +597,8 @@ 
 	 * @return void
 	 */
 	private function _maybe_brew_regular() {
-		if (( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+		if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) {
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 		}
 	}
 
@@ -615,9 +615,9 @@ 
 	 * @return void
 	 */
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -631,19 +631,19 @@ 
 	*/
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
-		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
-		if ( ! empty( $class_names )) {
-			$msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' );
+		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons');
+		if ( ! empty($class_names)) {
+			$msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso');
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>';
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>';
 			}
 			$msg .= '</ul>';
-			$msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' );
+			$msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso');
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -660,25 +660,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
-		do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+	public function brew_espresso() {
+		do_action('AHEE__EE_System__brew_espresso__begin', $this);
 		// load some final core systems
-		add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-		add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 );
-		add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-		add_action( 'init', array( $this, 'load_controllers' ), 7 );
-		add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-		add_action( 'init', array( $this, 'initialize' ), 10 );
-		add_action( 'init', array( $this, 'initialize_last' ), 100 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 );
-
-		if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE )  ) {
+		add_action('init', array($this, 'set_hooks_for_core'), 1);
+		add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3);
+		add_action('init', array($this, 'load_CPTs_and_session'), 5);
+		add_action('init', array($this, 'load_controllers'), 7);
+		add_action('init', array($this, 'core_loaded_and_ready'), 9);
+		add_action('init', array($this, 'initialize'), 10);
+		add_action('init', array($this, 'initialize_last'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100);
+
+		if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) {
 			// pew pew pew
-			EE_Registry::instance()->load_core( 'PUE' );
-			do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+			EE_Registry::instance()->load_core('PUE');
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 		}
-		do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+		do_action('AHEE__EE_System__brew_espresso__complete', $this);
 	}
 
 
@@ -692,7 +692,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -701,15 +701,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== FALSE ) {
-						unset( $_GET['activate'] );
-						espresso_deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== FALSE) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -726,10 +726,10 @@ 
 	 */
 	public function perform_activations_upgrades_and_migrations() {
 		//first check if we had previously attempted to setup EE's directories but failed
-		if( EEH_Activation::upload_directories_incomplete() ) {
+		if (EEH_Activation::upload_directories_incomplete()) {
 			EEH_Activation::create_upload_directories();
 		}
-		do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 	}
 
 
@@ -741,10 +741,10 @@ 
 	 *  	@return 	void
 	 */
 	public function load_CPTs_and_session() {
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		EE_Registry::instance()->load_core('Register_CPTs');
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -759,16 +759,16 @@ 
 	* @return void
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && !  EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			EE_Registry::instance()->load_core( 'Front_Controller' );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			EE_Registry::instance()->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			EE_Registry::instance()->load_core('Front_Controller');
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			EE_Registry::instance()->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -782,10 +782,10 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
 //		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
-		EE_Registry::instance()->load_core( 'Session' );
+		EE_Registry::instance()->load_core('Session');
 	}
 
 
@@ -799,7 +799,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 	}
 
 
@@ -813,7 +813,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -845,21 +845,21 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx
-		add_filter( 'nocache_headers', array( 'EE_System', 'nocache_headers_nginx' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'nocache_headers_nginx'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -871,7 +871,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function nocache_headers_nginx ( $headers ) {
+	public static function nocache_headers_nginx($headers) {
 		$headers['X-Accel-Expires'] = 0;
 		return $headers;
 	}
@@ -897,15 +897,15 @@ 
 	 * @param $admin_bar
 	 * @return    void
 	 */
-	public function espresso_toolbar_items( $admin_bar ) {
+	public function espresso_toolbar_items($admin_bar) {
 
 		// if in full M-Mode, or its an AJAX request, or user is NOT an admin
-		if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) {
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) {
 			return;
 		}
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		EE_Registry::instance()->load_helper( 'URL' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		EE_Registry::instance()->load_helper('URL');
 		$menu_class = 'espresso_menu_item_class';
 		//we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
 		//because they're only defined in each of their respective constructors
@@ -917,20 +917,20 @@ 
 		//Top Level
 		$admin_bar->add_menu(array(
 				'id' => 'espresso-toolbar',
-				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>',
+				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>',
 				'href' => $events_admin_url,
 				'meta' => array(
 						'title' => __('Event Espresso', 'event_espresso'),
-						'class' => $menu_class . 'first'
+						'class' => $menu_class.'first'
 				),
 		));
 
 		//Events
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Events', 'event_espresso' ),
+					'title' => __('Events', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('Events', 'event_espresso'),
@@ -941,13 +941,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) {
 			//Events Add New
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-new',
 					'parent' => 'espresso-toolbar-events',
 					'title' => __('Add New', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Add New', 'event_espresso'),
 							'target' => '',
@@ -956,18 +956,18 @@ 
 			));
 		}
 
-		if ( is_single() && ( get_post_type() == 'espresso_events' ) ) {
+		if (is_single() && (get_post_type() == 'espresso_events')) {
 
 			//Current post
 			global $post;		
     	
-	    	if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+	    	if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID)) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',
 						'parent' => 'espresso-toolbar-events',
 						'title' => __('Edit Event', 'event_espresso'),
-						'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$post->ID ), $events_admin_url ),
+						'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$post->ID), $events_admin_url),
 						'meta' => array(
 								'title' => __('Edit Event', 'event_espresso'),
 								'target' => '',
@@ -979,11 +979,11 @@ 
 		}
 
 		//Events View
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-view',
 					'parent' => 'espresso-toolbar-events',
-					'title' => __( 'View', 'event_espresso' ),
+					'title' => __('View', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('View', 'event_espresso'),
@@ -993,12 +993,12 @@ 
 			));
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) {
 			//Events View All
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-all',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'All', 'event_espresso' ),
+					'title' => __('All', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('All', 'event_espresso'),
@@ -1009,13 +1009,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) {
 			//Events View Today
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-today',
 					'parent' => 'espresso-toolbar-events-view',
 					'title' => __('Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1025,13 +1025,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) {
 			//Events View This Month
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-month',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'This Month', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1041,11 +1041,11 @@ 
 		}
 
 		//Registration Overview
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Registrations', 'event_espresso' ),
+					'title' => __('Registrations', 'event_espresso'),
 					'href' => $reg_admin_url,
 					'meta' => array(
 							'title' => __('Registrations', 'event_espresso'),
@@ -1056,12 +1056,12 @@ 
 		}
 
 		//Registration Overview Today
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ),
+					'title' => __('Today', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1071,14 +1071,14 @@ 
 		}
 
 		//Registration Overview Today Completed
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Approved', 'event_espresso' ),
+							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1086,14 +1086,14 @@ 
 		}
 
 		//Registration Overview Today Pending\
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-pending',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Pending', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Pending Payment', 'event_espresso' ),
+							'title' => __('Pending Payment', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1101,14 +1101,14 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-not-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Not Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1116,12 +1116,12 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-cancelled',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'title' => __('Cancelled', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1131,12 +1131,12 @@ 
 		}
 
 		//Registration Overview This Month
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'This Month', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1146,12 +1146,12 @@ 
 		}
 
 		//Registration Overview This Month Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
@@ -1161,12 +1161,12 @@ 
 		}
 
 		//Registration Overview This Month Pending
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-pending',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Pending', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Pending', 'event_espresso'),
 							'target' => '',
@@ -1176,14 +1176,14 @@ 
 		}
 
 		//Registration Overview This Month Not Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-not-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Not Approved', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1192,12 +1192,12 @@ 
 
 
 		//Registration Overview This Month Cancelled
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-cancelled',
 					'parent' => 'espresso-toolbar-registrations-month',
 					'title' => __('Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1207,11 +1207,11 @@ 
 		}
 
 		//Extensions & Services
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-extensions-and-services',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Extensions & Services', 'event_espresso' ),
+					'title' => __('Extensions & Services', 'event_espresso'),
 					'href' => $extensions_admin_url,
 					'meta' => array(
 							'title' => __('Extensions & Services', 'event_espresso'),
@@ -1233,8 +1233,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -1254,11 +1254,11 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// jquery_validate loading is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-			if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+			if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 				// register jQuery Validate
-				wp_register_script( 'jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE );
+				wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
 			}
 		}
 	}

core/helpers/EEH_Template.helper.php

Spacing +196 added lines, -196 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,80 +210,80 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			EE_Registry::instance()->load_helper('File');
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_template_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_template_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -296,21 +296,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -322,9 +322,9 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 		//require the template validator for verifying variables are set according to how the template requires
-		EE_Registry::instance()->load_helper( 'Template_Validator' );
+		EE_Registry::instance()->load_helper('Template_Validator');
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -335,26 +335,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -372,27 +372,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -408,50 +408,50 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
 		$amount = (float) $amount;
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -466,11 +466,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -483,9 +483,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -502,21 +502,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -528,31 +528,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -560,7 +560,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -581,31 +581,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h4>' . __('Status Legend', 'event_espresso') . '</h4>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h4>'.__('Status Legend', 'event_espresso').'</h4>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -618,8 +618,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	EE_Registry::instance()->load_helper('Array');
 	ob_start();
@@ -633,10 +633,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -650,7 +650,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -680,8 +680,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -705,13 +705,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -719,68 +719,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -789,29 +789,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 

core/db_classes/EE_Datetime.class.php

Spacing +126 added lines, -126 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -74,9 +74,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Datetime
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -87,8 +87,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Datetime
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'DTT_name', $name );
+	public function set_name($name) {
+		$this->set('DTT_name', $name);
 	}
 
 
@@ -105,8 +105,8 @@ 
 	/**
 	 * @param $description
 	 */
-	public function set_description( $description ) {
-		$this->set( 'DTT_description', $description );
+	public function set_description($description) {
+		$this->set('DTT_description', $description);
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_start_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
+	public function set_start_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_start');
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_start_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
+	public function set_start_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_start');
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @access        public
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_end_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
+	public function set_end_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_end');
 	}
 
 
@@ -161,8 +161,8 @@ 
 	 * @access        public
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_end');
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param        int $reg_limit
 	 */
-	public function set_reg_limit( $reg_limit ) {
-		$this->set( 'DTT_reg_limit', $reg_limit );
+	public function set_reg_limit($reg_limit) {
+		$this->set('DTT_reg_limit', $reg_limit);
 	}
 
 
@@ -187,10 +187,10 @@ 
 	 * @access        public
 	 * @param        int $sold
 	 */
-	public function set_sold( $sold ) {
+	public function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'DTT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('DTT_sold', $sold);
 	}
 
 
@@ -199,9 +199,9 @@ 
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
 	 */
-	function increase_sold( $qty = 1 ) {
+	function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -210,9 +210,9 @@ 
 	 * decrements (subtracts) sold amount passed by $qty
 	 * @param int $qty
 	 */
-	function decrease_sold( $qty = 1 ) {
+	function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'DTT_name' );
+		return $this->get('DTT_name');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'DTT_description' );
+		return $this->get('DTT_description');
 	}
 
 
@@ -242,7 +242,7 @@ 
 	 * @return boolean          TRUE if is primary, FALSE if not.
 	 */
 	public function is_primary() {
-		return $this->get( 'DTT_is_primary' );
+		return $this->get('DTT_is_primary');
 	}
 
 
@@ -252,7 +252,7 @@ 
 	 * @return int         The order of the datetime for this event.
 	 */
 	public function order() {
-		return $this->get( 'DTT_order' );
+		return $this->get('DTT_order');
 	}
 
 
@@ -262,7 +262,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'DTT_parent' );
+		return $this->get('DTT_parent');
 	}
 
 
@@ -278,10 +278,10 @@ 
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
 	 * @return    string|bool|void  string on success, FALSE on fail
 	 */
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
 		$field_name = "DTT_EVT_{$start_or_end}";
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
-		if ( ! $echo ) {
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
+		if ( ! $echo) {
 			return $dtt;
 		}
 		return '';
@@ -297,8 +297,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
+	public function start_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'start', $dt_frmt);
 	}
 
 
@@ -307,8 +307,8 @@ 
 	 * Echoes start_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_start_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
+	public function e_start_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -321,8 +321,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
+	public function end_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'end', $dt_frmt);
 	}
 
 
@@ -331,8 +331,8 @@ 
 	 * Echoes the end date. See end_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_end_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
+	public function e_end_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -345,11 +345,11 @@ 
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -358,8 +358,8 @@ 
 	 * @param null   $dt_frmt
 	 * @param string $conjunction
 	 */
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		echo $this->date_range( $dt_frmt, $conjunction );
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		echo $this->date_range($dt_frmt, $conjunction);
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
+	public function start_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
 	}
 
 
@@ -380,8 +380,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_start_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
+	public function e_start_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
 	}
 
 
@@ -393,8 +393,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
+	public function end_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
 	}
 
 
@@ -402,8 +402,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_end_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
+	public function e_end_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
 	}
 
 
@@ -416,12 +416,12 @@ 
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
 
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
-		return $start != $end ? $start . $conjunction . $end : $start;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
+		return $start != $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -430,8 +430,8 @@ 
 	 * @param null   $tm_format
 	 * @param string $conjunction
 	 */
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		echo $this->time_range( $tm_format, $conjunction );
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
+		echo $this->time_range($tm_format, $conjunction);
 	}
 
 
@@ -444,8 +444,8 @@ 
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed 	string on success, FALSE on fail
 	 */
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
 	}
 
 
@@ -454,8 +454,8 @@ 
 	 * @param null $dt_frmt
 	 * @param null $tm_format
 	 */
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -469,11 +469,11 @@ 
 	 * @param bool   $round_up
 	 * @return float|int|mixed
 	 */
-	public function length( $units = 'seconds', $round_up = FALSE ) {
-		$start = $this->get_raw( 'DTT_EVT_start' );
-		$end = $this->get_raw( 'DTT_EVT_end' );
+	public function length($units = 'seconds', $round_up = FALSE) {
+		$start = $this->get_raw('DTT_EVT_start');
+		$end = $this->get_raw('DTT_EVT_end');
 		$length_in_units = $end - $start;
-		switch ( $units ) {
+		switch ($units) {
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 'days':
@@ -486,10 +486,10 @@ 
 				$length_in_units /= 60;
 			case 'seconds':
 			default:
-				$length_in_units = ceil( $length_in_units );
+				$length_in_units = ceil($length_in_units);
 		}
-		if ( $round_up ) {
-			$length_in_units = max( $length_in_units, 1 );
+		if ($round_up) {
+			$length_in_units = max($length_in_units, 1);
 		}
 		return $length_in_units;
 	}
@@ -504,8 +504,8 @@ 
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed        		string on success, FALSE on fail
 	 */
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
 	}
 
 
@@ -514,8 +514,8 @@ 
 	 * @param bool $dt_frmt
 	 * @param bool $tm_format
 	 */
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -527,7 +527,7 @@ 
 	 * @return        int
 	 */
 	public function start() {
-		return $this->get_raw( 'DTT_EVT_start' );
+		return $this->get_raw('DTT_EVT_start');
 	}
 
 
@@ -539,7 +539,7 @@ 
 	 * @return        int
 	 */
 	public function end() {
-		return $this->get_raw( 'DTT_EVT_end' );
+		return $this->get_raw('DTT_EVT_end');
 	}
 
 
@@ -551,7 +551,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function reg_limit() {
-		return $this->get_raw( 'DTT_reg_limit' );
+		return $this->get_raw('DTT_reg_limit');
 	}
 
 
@@ -563,7 +563,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function sold() {
-		return $this->get_raw( 'DTT_sold' );
+		return $this->get_raw('DTT_sold');
 	}
 
 
@@ -592,15 +592,15 @@ 
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
 	 * @return 	int
 	 */
-	public function spaces_remaining( $consider_tickets = FALSE ) {
+	public function spaces_remaining($consider_tickets = FALSE) {
 		// tickets remaining available for purchase
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
 		$dtt_remaining = $this->reg_limit() - $this->sold();
-		if ( ! $consider_tickets ) {
+		if ( ! $consider_tickets) {
 			return $dtt_remaining;
 		}
 		$tickets_remaining = $this->tickets_remaining();
-		return min( $dtt_remaining, $tickets_remaining );
+		return min($dtt_remaining, $tickets_remaining);
 	}
 
 
@@ -611,19 +611,19 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function tickets_remaining( $query_params = array() ) {
+	public function tickets_remaining($query_params = array()) {
 		$sum = 0;
-		$tickets = $this->tickets( $query_params );
-		if ( ! empty( $tickets ) ) {
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
+		$tickets = $this->tickets($query_params);
+		if ( ! empty($tickets)) {
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
 					// get the actual amount of tickets that can be sold
-					$qty = $ticket->qty( 'saleable' );
-					if ( $qty === EE_INF ) {
+					$qty = $ticket->qty('saleable');
+					if ($qty === EE_INF) {
 						return EE_INF;
 					}
 					// no negative ticket quantities plz
-					if ( $qty > 0 ) {
+					if ($qty > 0) {
 						$sum += $qty;
 					}
 				}
@@ -640,8 +640,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function sum_tickets_initially_available( $query_params = array() ) {
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
+	public function sum_tickets_initially_available($query_params = array()) {
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
 	}
 
 
@@ -653,7 +653,7 @@ 
 	 * @return int
 	 */
 	public function total_tickets_available_at_this_datetime() {
-		return $this->spaces_remaining( true );
+		return $this->spaces_remaining(true);
 	}
 
 
@@ -664,7 +664,7 @@ 
 	 * @return boolean
 	 */
 	public function is_upcoming() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') > time());
 	}
 
 
@@ -674,7 +674,7 @@ 
 	 * @return boolean
 	 */
 	public function is_active() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
 	}
 
 
@@ -684,7 +684,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
+		return ($this->get_raw('DTT_EVT_end') < time());
 	}
 
 
@@ -695,16 +695,16 @@ 
 	 */
 	public function get_active_status() {
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
 			return EE_Datetime::sold_out;
 		}
-		if ( $this->is_expired() ) {
+		if ($this->is_expired()) {
 			return EE_Datetime::expired;
 		}
-		if ( $this->is_upcoming() ) {
+		if ($this->is_upcoming()) {
 			return EE_Datetime::upcoming;
 		}
-		if ( $this->is_active() ) {
+		if ($this->is_active()) {
 			return EE_Datetime::active;
 		}
 		return NULL;
@@ -718,24 +718,24 @@ 
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
 	 * @return string
 	 */
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
-		if ( $use_dtt_name ) {
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
+		if ($use_dtt_name) {
 			$dtt_name = $this->name();
-			if ( !empty( $dtt_name ) ) {
+			if ( ! empty($dtt_name)) {
 				return $dtt_name;
 			}
 		}
 		//first condition is to see if the months are different
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
 			//next condition is if its the same month but different day
 		}
 		else {
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
 			}
 			else {
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
 			}
 		}
 		return $display_date;
@@ -749,8 +749,8 @@ 
 *@param array $query_params see EEM_Base::get_all()
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Ticket', $query_params );
+	public function tickets($query_params = array()) {
+		return $this->get_many_related('Ticket', $query_params);
 	}
 
 
@@ -760,21 +760,21 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Ticket[]
 	 */
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
+	public function ticket_types_available_for_purchase($query_params = array()) {
 		// first check if datetime is valid
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
 			return array();
 		}
-		if ( empty( $query_params ) ) {
+		if (empty($query_params)) {
 			$query_params = array(
 				array(
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 					'TKT_deleted'    => false
 				)
 			);
 		}
-		return $this->tickets( $query_params );
+		return $this->tickets($query_params);
 	}
 
 
@@ -784,7 +784,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -796,13 +796,13 @@ 
 	 */
 	public function update_sold() {
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
-			array( array(
+			array(array(
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
 				'REG_deleted' 				=> 0,
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
-			) )
+			))
 		);
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
 		$this->save();
 		return $count_regs_for_this_datetime;
 	}